diff --git a/libs/cairomm/ChangeLog b/libs/cairomm/ChangeLog index c78ed89c0a..baaa1449e3 100644 --- a/libs/cairomm/ChangeLog +++ b/libs/cairomm/ChangeLog @@ -1,3 +1,243 @@ +== 1.4.6 == + +2007-11-10 Jonathon Jongsma + + * docs/reference/Doxyfile.in: update doxygen config file since my version of + doxygen now complains that there are obsolete config keys + +2007-11-10 Jonathon Jongsma + + * NEWS: update news for 1.4.6 release + * configure.in: bumped version + +2007-08-13 Murray Cumming + + * cairomm/context.cc: Add #include + to fix the build on MacOS. Thanks to Elias N (Bug #11972). + +== 1.4.4 == + +2007-07-21 Murray Cumming + + * m4/reduced.m4: Added, containing CAIROMM_ARG_ENABLE_API_EXCEPTIONS(). + * configure.in: Use CAIROMM_ARG_ENABLE_API_EXCEPTIONS() to add a + --enable-api-exceptions=yes/no option. + Used to generate a cairomm/cairommconfig.h config file, which + defines (or not) CAIROMM_EXCEPTIONS_ENABLED. + * cairomm/cairommconfig.h.in: Added, used to generate cairommconfig.h + * cairomm/private.cc: + * cairomm/private.h: Use ifdef to replace throw_exception() with an empty + implementation when exceptions are disabled. + This allows cairomm to be built when using CXXFLAGS=-fno-exceptions. + +2007-07-14 Jonathon Jongsma + + * configure.in: post-release version number bump + +=== 1.4.2 === + +2007-07-14 Jonathon Jongsma + + * NEWS: updated for 1.4.2 release + * configure.in: bumped version to 1.4.2 + +2007-06-14 Dave Beckett + + * configure.in: Update the GENERIC_LIBRARY_VERSION correctly + Was: 1:0:0 in 1.2.4 + current: interfaces were added, increment to 2 + revision: set to zero since current was incremented + age: increment since interfaces were added + Changed to: 2:0:1 + +2007-06-14 Murray Cumming + + * cairomm/refptr.h: Added RefPtr(object, refcount) constructor + for use in cast_*(), so that the casted RefPtr shares the same + refcount, avoiding an early deletion. I do not like making + this constructor public, but I do not see another way. + +=== 1.4.0 === + +2007-07-12 Jonathon Jongsma + + * Makefile.am: add doc-publish target and make release-publish depend on + this. This automatically uploads the new API documentation on release + * docs/reference/Makefile.am: upload the html documentation and a tarball of + the documentation to the cairographics.org site + +2007-07-12 Jonathon Jongsma + + * docs/reference/Makefile.am: hacky workaround to get distcheck to pass + +2007-07-10 Jonathon Jongsma + + * NEWS: Update NEWS for release + * configure.in: bump version for release + +2007-07-10 Jonathon Jongsma + + * cairomm/context.cc: add ability to use dynamic casting with the return + values from more functions, including: + Context::get_target() + Context::get_target() const + Context::get_source() + Context::get_source() const + Context::get_group_target() + Context::get_group_target() const + Context::pop_group() + * tests/test-context.cc: a few additional tests to verify the const / + non-const versions both work with dynamic casting. + +2007-07-10 Jonathon Jongsma + + * docs/reference/cairomm.css: Improve the documentation style a little bit + to make it more readable + * docs/reference/Doxyfile.in: build the reference doc for the new + QuartzSurface class + +2007-07-10 Jonathon Jongsma + + * cairomm/context.cc: + * cairomm/context.h: add alternate API for set_dash() which takes a + std::vector argument instead of the slightly unexpected std::valarray + argument + * tests/test-context.cc: test that both API work correctly and compile + correctly without any problems + +2007-07-04 Jonathon Jongsma + + * tests/test-context.cc: add some tests for matrix transformations and + user-to-device coordinate mappings. The matrix transformation 'test' does + nothing more than call the functions to excercise them a bit, but it's + causing an unexpected exception to be triggered when calling + Context::set_matrix(). The odd thing is that exception.what() results in + 'success' being printed. This requires further investigation + Also used BOOST_CHECK_EQUAL in most places instead of BOOST_CHECK to get + more meaningful failure messages. + +2007-07-04 Jonathon Jongsma + + * cairomm/private.cc: add missing 'break;' on the I/O error case statement + +2007-07-04 Jonathon Jongsma + + * cairomm/context.cc: when getting the source pattern of a Cairo::Context, + check which type of Pattern it is so that we create the correct C++ wrapper. + Without this, RefPtr<>::cast_dynamic() doesn't seem to work as we would + expect it to. + * tests/test-context.cc: improve the Context::get_source() / + Context::set_source () tests now that dynamic casting works correctly + +2007-07-04 Jonathon Jongsma + + * examples/pdf-surface/main.cc: + * examples/png_file/main.cc: + * examples/ps-surface/main.cc: + * examples/svg-surface/main.cc: + * examples/text-rotate/text-rotate.cc: + * tests/test-context.cc: fix a bunch of minor compile errors when compiling + with -Werror + +2007-07-04 Jonathon Jongsma + + * configure.in: enable extra compiler warnings and -Werror if the + CAIROMM_DEVEL environment variable is set to 'on'. This caught the + following mistake. + * cairomm/pattern.cc: forgot to return the ColorStop vector + +2007-07-04 Jonathon Jongsma + + * cairomm/context.cc: fix a FIXME to match the style of + ScaledFont::glyph_extents since MSVC (and possibly other compilers) complain + when allocating an array on the stack and the size of the array is not a + compile-time constante + +2007-04-16 Hugo Vincent + + * Added QuartzSurface for MacOS X (when cairo is built with Quartz support), + similar to the existing Win32Surface and XlibSurface. These allow use of + platform-specific features and data structures. + +2007-03-23 Jonathon Jongsma + + * Makefile.am: + * autogen.sh: + * configure.in: + * m4/ax_boost_base.m4: + * m4/ax_boost_unit_test_framework.m4: Add some basic test infrastructure. + It's disabled by default, and must be explicitly enabled by passing + --enable-tests to configure (or by setting the CAIROMM_DEVEL environment + variable to "on"). It uses the boost unit test framework, but this should + not be required unless you've explicitly enabled tests. If tests are + enabled, you can easily run them with 'make check' + * tests/Makefile.am: + * tests/test-context.cc: added the beginning of a test for Cairo::Context. + Most of these tests are really very interesting. Basically what I'm trying + to do is a) test some basic behaviors, and b) excercise the functionality a + little bit. One of the tests currently fails due to a RefPtr::cast_dynamic + failure, so I have to see what's going on there. + +2007-03-22 Murray Cumming + + * cairomm/enums.h: Restored FORMAT_RGB16_565 and marked it as deprecated. + Note that CAIRO_FORMAT_RGB16_565 has not really been removed from cairo. + It has just moved from the enum to a #define in cairo-deprecated. + * cairomm/context.cc: + * cairomm/context.h: Made get_dash() const. + Renamed clip_extents() to get_clip_extents(), to match the other get_*_extents() methods + (in Context, if not in other classes), and made it const. + Made copy_clip_rectangle_list() const. + * cairomm/pattern.cc: + * cairomm/pattern.h: Make the RadialGradient::get_radial_circles(), LinearGradient::get_linear_points(), + and Gradient::get_color_stops() methods const. + Added a non-const method overload of get_surface(). + Correc the get_color_stops() implementation to match the declaration. + +2007-03-22 Jonathon Jongsma + + * cairomm/context.cc: Minor comment cleanups + * cairomm/pattern.cc: get the gradient stops by reference parameter instead + of returning by value. This saves an extra copy of the vector. + +2007-03-21 Jonathon Jongsma + + * cairomm/context.cc: + * cairomm/context.h: + * cairomm/enums.h: + * cairomm/pattern.cc: + * cairomm/pattern.h: + * configure.in: Add initial support for new cairo 1.4.x API. It will + probably still need quite a bit of work, but I wanted to commit what I have + now so that it doesn't keep sitting in my working directory. + (Extra note from Murray: + This was: + - Pattern::create_rgba() - a new method overload with 4 args, including alpha. + - SurfacePattern::get_surface() + - Gradient::get_color_stops() (with a new ColorStop struct) + - LinearGradient::get_linear_points() + - RadialGradient::get_radial_circles() + - Context::clip_extents() + - Context::copy_clip_rectangle_list() + - Context::get_dash() + - SURFACE_TYPE_OS2 was added + - FORMAT_RGB16_565 was removed (but that is not allowed, so I'll fix that.) + +2007-02-01 Jonathon Jongsma + + * configure.in: Fixes for building on Cygwin from + yselkowitz@users.sourceforge.net. Closes bug #9726 + +2007-01-28 Jonathon Jongsma + + * configure.in: bump rev to 1.2.5 + +2007-01-28 Jonathon Jongsma + + * docs/reference/Doxyfile.in: fixes building the cairomm documentation where + builddir != srcdir. Patch from yselkowitz@users.sourceforge.net for bug + #9727 + 1.2.4: 2007-01-17 Jonathon Jongsma diff --git a/libs/cairomm/MSVC/Makefile.am b/libs/cairomm/MSVC/Makefile.am new file mode 100644 index 0000000000..976d5a51aa --- /dev/null +++ b/libs/cairomm/MSVC/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = gendef cairomm examples + +EXTRA_DIST = blank.cpp cairomm.sln README diff --git a/libs/glibmm2/MSVC_Net2003/Makefile.in b/libs/cairomm/MSVC/Makefile.in similarity index 88% rename from libs/glibmm2/MSVC_Net2003/Makefile.in rename to libs/cairomm/MSVC/Makefile.in index 89e7e1cf87..0176016440 100644 --- a/libs/glibmm2/MSVC_Net2003/Makefile.in +++ b/libs/cairomm/MSVC/Makefile.in @@ -35,21 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003 +subdir = MSVC DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -72,7 +67,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -85,9 +87,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -96,34 +99,22 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -136,25 +127,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -171,33 +155,40 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = gendef glibmm examples tests -EXTRA_DIST = blank.cpp glibmm.sln README +SUBDIRS = gendef cairomm examples +EXTRA_DIST = blank.cpp cairomm.sln README all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -206,9 +197,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/Makefile + $(AUTOMAKE) --gnu MSVC/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -222,9 +213,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: diff --git a/libs/cairomm/MSVC/README b/libs/cairomm/MSVC/README new file mode 100644 index 0000000000..81886cdb70 --- /dev/null +++ b/libs/cairomm/MSVC/README @@ -0,0 +1,12 @@ +Building cairomm-1.0 with Visual Studio .NET 2005 + +* You will need Visual Studio .NET 2005 (MSVC 8.0). Earlier versions of the compiler, including 6.0 and 7.0 might also work but have not been tested. +* Install the latest Win32 GTK+ Development Environment from the Glade for Windows project, http://gladewin32.sourceforge.net. +* Add libsigc++ to the include and lib paths in Visual Studio. +* Load the cairomm/MSVC3/cairomm.sln solution. +* Build the entire solution. +* Run the tests. + +Cedric Gustin +08/18/2006 + diff --git a/libs/glibmm2/MSVC_Net2003/blank.cpp b/libs/cairomm/MSVC/blank.cpp similarity index 100% rename from libs/glibmm2/MSVC_Net2003/blank.cpp rename to libs/cairomm/MSVC/blank.cpp diff --git a/libs/cairomm/MSVC/cairomm.sln b/libs/cairomm/MSVC/cairomm.sln new file mode 100644 index 0000000000..ebedfae590 --- /dev/null +++ b/libs/cairomm/MSVC/cairomm.sln @@ -0,0 +1,73 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cairomm-1.0", "cairomm\cairomm.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}" + ProjectSection(ProjectDependencies) = postProject + {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_pdf-surface", "examples\pdf-surface\pdf-surface.vcproj", "{129ECC08-6D30-4884-B824-4AF96EF0A45C}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_png_file", "examples\png_file\png_file.vcproj", "{45EEED29-0231-45C6-9682-CAB2E042C51E}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_ps-surface", "examples\ps-surface\ps-surface.vcproj", "{CAE46373-7375-4607-AAB7-0EBA8F0E5B55}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_svg-surface", "examples\svg-surface\svg-surface.vcproj", "{BCA44D2B-1832-41F5-9EE9-FE1F709EE584}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_text-rotate", "examples\text-rotate\text-rotate.vcproj", "{F4D455E4-464D-49CC-A120-DB9B8AE0207E}" + ProjectSection(ProjectDependencies) = postProject + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.ActiveCfg = Debug|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.Build.0 = Debug|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.ActiveCfg = Release|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.Build.0 = Release|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.ActiveCfg = Debug|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.Build.0 = Debug|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.ActiveCfg = Release|Win32 + {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.Build.0 = Release|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.ActiveCfg = Debug|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.Build.0 = Debug|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.ActiveCfg = Release|Win32 + {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.Build.0 = Release|Win32 + {45EEED29-0231-45C6-9682-CAB2E042C51E}.Debug|Win32.ActiveCfg = Debug|Win32 + {45EEED29-0231-45C6-9682-CAB2E042C51E}.Debug|Win32.Build.0 = Debug|Win32 + {45EEED29-0231-45C6-9682-CAB2E042C51E}.Release|Win32.ActiveCfg = Release|Win32 + {45EEED29-0231-45C6-9682-CAB2E042C51E}.Release|Win32.Build.0 = Release|Win32 + {CAE46373-7375-4607-AAB7-0EBA8F0E5B55}.Debug|Win32.ActiveCfg = Debug|Win32 + {CAE46373-7375-4607-AAB7-0EBA8F0E5B55}.Debug|Win32.Build.0 = Debug|Win32 + {CAE46373-7375-4607-AAB7-0EBA8F0E5B55}.Release|Win32.ActiveCfg = Release|Win32 + {CAE46373-7375-4607-AAB7-0EBA8F0E5B55}.Release|Win32.Build.0 = Release|Win32 + {BCA44D2B-1832-41F5-9EE9-FE1F709EE584}.Debug|Win32.ActiveCfg = Debug|Win32 + {BCA44D2B-1832-41F5-9EE9-FE1F709EE584}.Debug|Win32.Build.0 = Debug|Win32 + {BCA44D2B-1832-41F5-9EE9-FE1F709EE584}.Release|Win32.ActiveCfg = Release|Win32 + {BCA44D2B-1832-41F5-9EE9-FE1F709EE584}.Release|Win32.Build.0 = Release|Win32 + {F4D455E4-464D-49CC-A120-DB9B8AE0207E}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4D455E4-464D-49CC-A120-DB9B8AE0207E}.Debug|Win32.Build.0 = Debug|Win32 + {F4D455E4-464D-49CC-A120-DB9B8AE0207E}.Release|Win32.ActiveCfg = Release|Win32 + {F4D455E4-464D-49CC-A120-DB9B8AE0207E}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libs/cairomm/MSVC/cairomm/Makefile.am b/libs/cairomm/MSVC/cairomm/Makefile.am new file mode 100644 index 0000000000..b0c0ced3ed --- /dev/null +++ b/libs/cairomm/MSVC/cairomm/Makefile.am @@ -0,0 +1,5 @@ +BUILT_SOURCES = cairomm.rc + +MAINTAINERCLEANFILES = $(built_sources) + +EXTRA_DIST = cairomm.vcproj cairomm.rc diff --git a/libs/cairomm/MSVC/cairomm/Makefile.in b/libs/cairomm/MSVC/cairomm/Makefile.in new file mode 100644 index 0000000000..a30d8d2a98 --- /dev/null +++ b/libs/cairomm/MSVC/cairomm/Makefile.in @@ -0,0 +1,350 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC/cairomm +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/cairomm.rc.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h +CONFIG_CLEAN_FILES = cairomm.rc +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +BUILT_SOURCES = cairomm.rc +MAINTAINERCLEANFILES = $(built_sources) +EXTRA_DIST = cairomm.vcproj cairomm.rc +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/cairomm/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC/cairomm/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +cairomm.rc: $(top_builddir)/config.status $(srcdir)/cairomm.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile +installdirs: +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.rc b/libs/cairomm/MSVC/cairomm/cairomm.rc similarity index 73% rename from libs/glibmm2/MSVC_Net2003/glibmm/glibmm.rc rename to libs/cairomm/MSVC/cairomm/cairomm.rc index 0b0fd41a3e..925e3109f9 100644 --- a/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.rc +++ b/libs/cairomm/MSVC/cairomm/cairomm.rc @@ -1,72 +1,72 @@ -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS - -#include "afxres.h" - -#undef APSTUDIO_READONLY_SYMBOLS - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,13,3,1 - PRODUCTVERSION 2,13,3,1 - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "The glibmm development team (see AUTHORS)" - VALUE "FileDescription", "The official C++ wrapper for glib" - VALUE "FileVersion", "2.13.3" - VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" - VALUE "OriginalFilename", "glibmm-2.4" - VALUE "ProductName", "glibmm" - VALUE "ProductVersion", "2.13.3" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // English (U.S.) resources - -#ifndef APSTUDIO_INVOKED - -#endif // not APSTUDIO_INVOKED +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,4,6,1 + PRODUCTVERSION 1,4,6,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The cairomm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for cairo" + VALUE "FileVersion", "1.4.6" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "cairomm-1.0" + VALUE "ProductName", "cairomm" + VALUE "ProductVersion", "1.4.6" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/cairomm/MSVC/cairomm/cairomm.rc.in b/libs/cairomm/MSVC/cairomm/cairomm.rc.in new file mode 100644 index 0000000000..8c968cf05d --- /dev/null +++ b/libs/cairomm/MSVC/cairomm/cairomm.rc.in @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1 + PRODUCTVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The cairomm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for cairo" + VALUE "FileVersion", "@VERSION@" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "cairomm-1.0" + VALUE "ProductName", "cairomm" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/cairomm/MSVC/cairomm/cairomm.vcproj b/libs/cairomm/MSVC/cairomm/cairomm.vcproj new file mode 100644 index 0000000000..ff0136d63b --- /dev/null +++ b/libs/cairomm/MSVC/cairomm/cairomm.vcproj @@ -0,0 +1,310 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/cairomm/MSVC/examples/Makefile.am b/libs/cairomm/MSVC/examples/Makefile.am new file mode 100644 index 0000000000..a436d388b3 --- /dev/null +++ b/libs/cairomm/MSVC/examples/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = pdf-surface png_file ps-surface svg-surface text-rotate diff --git a/libs/glibmm2/MSVC_Net2003/tests/Makefile.in b/libs/cairomm/MSVC/examples/Makefile.in similarity index 88% rename from libs/glibmm2/MSVC_Net2003/tests/Makefile.in rename to libs/cairomm/MSVC/examples/Makefile.in index 127f00901c..0035f00efb 100644 --- a/libs/glibmm2/MSVC_Net2003/tests/Makefile.in +++ b/libs/cairomm/MSVC/examples/Makefile.in @@ -35,21 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/tests +subdir = MSVC/examples DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -72,7 +67,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -85,9 +87,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -96,34 +99,22 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -136,25 +127,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -171,32 +155,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = glibmm_value +SUBDIRS = pdf-surface png_file ps-surface svg-surface text-rotate all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -205,9 +196,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/examples/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/tests/Makefile + $(AUTOMAKE) --gnu MSVC/examples/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -221,9 +212,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: diff --git a/libs/cairomm/MSVC/examples/pdf-surface/Makefile.am b/libs/cairomm/MSVC/examples/pdf-surface/Makefile.am new file mode 100644 index 0000000000..e94dba186c --- /dev/null +++ b/libs/cairomm/MSVC/examples/pdf-surface/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = pdf-surface.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile.in b/libs/cairomm/MSVC/examples/pdf-surface/Makefile.in similarity index 81% rename from libs/glibmm2/MSVC_Net2003/examples/thread/Makefile.in rename to libs/cairomm/MSVC/examples/pdf-surface/Makefile.in index 80f04d6b25..2e03ccee59 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile.in +++ b/libs/cairomm/MSVC/examples/pdf-surface/Makefile.in @@ -35,21 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/examples/thread +subdir = MSVC/examples/pdf-surface DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -63,7 +58,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -76,9 +78,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -87,34 +90,22 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -127,25 +118,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -162,32 +146,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = thread.vcproj +EXTRA_DIST = pdf-surface.vcproj all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -196,9 +187,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/examples/pdf-surface/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread/Makefile + $(AUTOMAKE) --gnu MSVC/examples/pdf-surface/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -212,9 +203,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj b/libs/cairomm/MSVC/examples/pdf-surface/pdf-surface.vcproj old mode 100755 new mode 100644 similarity index 85% rename from libs/glibmm2/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj rename to libs/cairomm/MSVC/examples/pdf-surface/pdf-surface.vcproj index 16006f62bf..4b33ff71da --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/dispatcher.vcproj +++ b/libs/cairomm/MSVC/examples/pdf-surface/pdf-surface.vcproj @@ -1,213 +1,213 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/cairomm/MSVC/examples/png_file/Makefile.am b/libs/cairomm/MSVC/examples/png_file/Makefile.am new file mode 100644 index 0000000000..41f7722c22 --- /dev/null +++ b/libs/cairomm/MSVC/examples/png_file/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = png_file.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile.in b/libs/cairomm/MSVC/examples/png_file/Makefile.in similarity index 81% rename from libs/glibmm2/MSVC_Net2003/examples/markup/Makefile.in rename to libs/cairomm/MSVC/examples/png_file/Makefile.in index 16304801c6..595d6525ce 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile.in +++ b/libs/cairomm/MSVC/examples/png_file/Makefile.in @@ -35,21 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/examples/markup +subdir = MSVC/examples/png_file DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -63,7 +58,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -76,9 +78,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -87,34 +90,22 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -127,25 +118,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -162,32 +146,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = markup.vcproj +EXTRA_DIST = png_file.vcproj all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -196,9 +187,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/markup/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/examples/png_file/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/markup/Makefile + $(AUTOMAKE) --gnu MSVC/examples/png_file/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -212,9 +203,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: diff --git a/libs/glibmm2/MSVC_Net2003/examples/markup/markup.vcproj b/libs/cairomm/MSVC/examples/png_file/png_file.vcproj old mode 100755 new mode 100644 similarity index 85% rename from libs/glibmm2/MSVC_Net2003/examples/markup/markup.vcproj rename to libs/cairomm/MSVC/examples/png_file/png_file.vcproj index 4d2bdc5d9a..364ddc377f --- a/libs/glibmm2/MSVC_Net2003/examples/markup/markup.vcproj +++ b/libs/cairomm/MSVC/examples/png_file/png_file.vcproj @@ -1,212 +1,213 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/cairomm/MSVC/examples/ps-surface/Makefile.am b/libs/cairomm/MSVC/examples/ps-surface/Makefile.am new file mode 100644 index 0000000000..d827e579d9 --- /dev/null +++ b/libs/cairomm/MSVC/examples/ps-surface/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = ps-surface.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/options/Makefile.in b/libs/cairomm/MSVC/examples/ps-surface/Makefile.in similarity index 81% rename from libs/glibmm2/MSVC_Net2003/examples/options/Makefile.in rename to libs/cairomm/MSVC/examples/ps-surface/Makefile.in index fa7a7d7420..07beebac98 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/options/Makefile.in +++ b/libs/cairomm/MSVC/examples/ps-surface/Makefile.in @@ -35,21 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/examples/options +subdir = MSVC/examples/ps-surface DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -63,7 +58,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -76,9 +78,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -87,34 +90,22 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -127,25 +118,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -162,32 +146,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = options.vcproj +EXTRA_DIST = ps-surface.vcproj all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -196,9 +187,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/options/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/examples/ps-surface/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/options/Makefile + $(AUTOMAKE) --gnu MSVC/examples/ps-surface/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -212,9 +203,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: diff --git a/libs/glibmm2/MSVC_Net2003/examples/options/options.vcproj b/libs/cairomm/MSVC/examples/ps-surface/ps-surface.vcproj old mode 100755 new mode 100644 similarity index 84% rename from libs/glibmm2/MSVC_Net2003/examples/options/options.vcproj rename to libs/cairomm/MSVC/examples/ps-surface/ps-surface.vcproj index 8a9ff95935..5100f8f6f1 --- a/libs/glibmm2/MSVC_Net2003/examples/options/options.vcproj +++ b/libs/cairomm/MSVC/examples/ps-surface/ps-surface.vcproj @@ -1,213 +1,213 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/cairomm/MSVC/examples/svg-surface/Makefile.am b/libs/cairomm/MSVC/examples/svg-surface/Makefile.am new file mode 100644 index 0000000000..4ce523efe4 --- /dev/null +++ b/libs/cairomm/MSVC/examples/svg-surface/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = svg-surface.vcproj diff --git a/libs/cairomm/MSVC/examples/svg-surface/Makefile.in b/libs/cairomm/MSVC/examples/svg-surface/Makefile.in new file mode 100644 index 0000000000..0783ac304c --- /dev/null +++ b/libs/cairomm/MSVC/examples/svg-surface/Makefile.in @@ -0,0 +1,340 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC/examples/svg-surface +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +EXTRA_DIST = svg-surface.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/examples/svg-surface/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC/examples/svg-surface/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread/thread.vcproj b/libs/cairomm/MSVC/examples/svg-surface/svg-surface.vcproj old mode 100755 new mode 100644 similarity index 84% rename from libs/glibmm2/MSVC_Net2003/examples/thread/thread.vcproj rename to libs/cairomm/MSVC/examples/svg-surface/svg-surface.vcproj index bf48104080..439783303b --- a/libs/glibmm2/MSVC_Net2003/examples/thread/thread.vcproj +++ b/libs/cairomm/MSVC/examples/svg-surface/svg-surface.vcproj @@ -1,212 +1,213 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/cairomm/MSVC/examples/text-rotate/Makefile.am b/libs/cairomm/MSVC/examples/text-rotate/Makefile.am new file mode 100644 index 0000000000..6eb15e42cd --- /dev/null +++ b/libs/cairomm/MSVC/examples/text-rotate/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = text-rotate.vcproj diff --git a/libs/cairomm/MSVC/examples/text-rotate/Makefile.in b/libs/cairomm/MSVC/examples/text-rotate/Makefile.in new file mode 100644 index 0000000000..c3e98ba68f --- /dev/null +++ b/libs/cairomm/MSVC/examples/text-rotate/Makefile.in @@ -0,0 +1,340 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC/examples/text-rotate +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ +PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +EXTRA_DIST = text-rotate.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/examples/text-rotate/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC/examples/text-rotate/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/cairomm/MSVC/examples/text-rotate/text-rotate.vcproj b/libs/cairomm/MSVC/examples/text-rotate/text-rotate.vcproj new file mode 100644 index 0000000000..ec6bc5041a --- /dev/null +++ b/libs/cairomm/MSVC/examples/text-rotate/text-rotate.vcproj @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/glibmm2/MSVC_Net2003/gendef/Makefile.am b/libs/cairomm/MSVC/gendef/Makefile.am similarity index 100% rename from libs/glibmm2/MSVC_Net2003/gendef/Makefile.am rename to libs/cairomm/MSVC/gendef/Makefile.am diff --git a/libs/glibmm2/MSVC_Net2003/gendef/Makefile.in b/libs/cairomm/MSVC/gendef/Makefile.in similarity index 82% rename from libs/glibmm2/MSVC_Net2003/gendef/Makefile.in rename to libs/cairomm/MSVC/gendef/Makefile.in index 1fd363bf4f..7e2688b6dd 100644 --- a/libs/glibmm2/MSVC_Net2003/gendef/Makefile.in +++ b/libs/cairomm/MSVC/gendef/Makefile.in @@ -35,21 +35,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/gendef +subdir = MSVC/gendef DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -63,7 +58,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -76,9 +78,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -87,34 +90,22 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -127,25 +118,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -162,23 +146,30 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ @@ -187,7 +178,7 @@ EXTRA_DIST = gendef.vcproj gendef.cc all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -196,9 +187,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/gendef/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC/gendef/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/gendef/Makefile + $(AUTOMAKE) --gnu MSVC/gendef/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -212,9 +203,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh mostlyclean-libtool: diff --git a/libs/glibmm2/MSVC_Net2003/gendef/gendef.cc b/libs/cairomm/MSVC/gendef/gendef.cc old mode 100755 new mode 100644 similarity index 100% rename from libs/glibmm2/MSVC_Net2003/gendef/gendef.cc rename to libs/cairomm/MSVC/gendef/gendef.cc diff --git a/libs/glibmm2/MSVC_Net2003/gendef/gendef.vcproj b/libs/cairomm/MSVC/gendef/gendef.vcproj old mode 100755 new mode 100644 similarity index 94% rename from libs/glibmm2/MSVC_Net2003/gendef/gendef.vcproj rename to libs/cairomm/MSVC/gendef/gendef.vcproj index f1a1bf7ecb..fb05b48598 --- a/libs/glibmm2/MSVC_Net2003/gendef/gendef.vcproj +++ b/libs/cairomm/MSVC/gendef/gendef.vcproj @@ -1,206 +1,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/cairomm/Makefile.am b/libs/cairomm/Makefile.am index 9387b03b6f..8d5ce0ec61 100644 --- a/libs/cairomm/Makefile.am +++ b/libs/cairomm/Makefile.am @@ -1,7 +1,8 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) +SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) tests #docs examples +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = MAINTAINERS cairomm-1.0.pc.in @@ -23,7 +24,7 @@ RELEASE_UPLOAD_BASE = /srv/cairo.freedesktop.org/www RELEASE_UPLOAD_DIR = $(RELEASE_UPLOAD_BASE)/releases RELEASE_URL_BASE = http://cairographics.org/releases RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org (and CC gnome-announce-list@gnome.org) -CVS = cvs +GIT = $(top_srcdir)/missing --run git #MANUAL_DATED = cairo-manual-`date +%Y%m%d` #MANUAL_TAR_FILE = $(MANUAL_DATED).tar.gz @@ -52,7 +53,7 @@ release-verify-newer: @echo -n "Checking that no $(VERSION) release already exists..." @ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \ || (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \ - && echo "Are you sure you have an updated CVS checkout?" \ + && echo "Are you sure you have an updated git checkout?" \ && echo "This should never happen." \ && false) @echo "Good." @@ -74,9 +75,12 @@ release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file) scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR) mv $(tar_file) $(sha1_file) $(gpg_file) releases ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)" - $(CVS) tag RELEASE_$(GENERIC_MAJOR_VERSION)_$(GENERIC_MINOR_VERSION)_$(GENERIC_MICRO_VERSION) + $(GIT) tag -s -m "$(PACKAGE) release $(VERSION)" v$(VERSION) -release-publish: release-upload releases/$(sha1_file) +doc-publish: + (cd docs/reference && $(MAKE) $(AM_MAKEFLAGS) publish) + +release-publish: release-upload doc-publish releases/$(sha1_file) @echo "" @echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)" @echo "including the following:" diff --git a/libs/cairomm/Makefile.in b/libs/cairomm/Makefile.in index 92c7a4106b..e1361e3ad7 100644 --- a/libs/cairomm/Makefile.in +++ b/libs/cairomm/Makefile.in @@ -39,16 +39,18 @@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/cairomm-1.0.pc.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - config.guess config.sub depcomp install-sh ltmain.sh missing \ - mkinstalldirs + config.guess config.sub depcomp install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = cairomm-1.0.pc SOURCES = DIST_SOURCES = @@ -89,7 +91,12 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ @@ -121,6 +128,7 @@ GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -134,6 +142,8 @@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -145,20 +155,14 @@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -175,29 +179,37 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) +SUBDIRS = cairomm examples MSVC $(DOCS_SUBDIR) tests #docs examples +ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = MAINTAINERS cairomm-1.0.pc.in DIST_SUBDIRS = $(SUBDIRS) @@ -216,7 +228,7 @@ RELEASE_UPLOAD_BASE = /srv/cairo.freedesktop.org/www RELEASE_UPLOAD_DIR = $(RELEASE_UPLOAD_BASE)/releases RELEASE_URL_BASE = http://cairographics.org/releases RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org (and CC gnome-announce-list@gnome.org) -CVS = cvs +GIT = $(top_srcdir)/missing --run git #MANUAL_DATED = cairo-manual-`date +%Y%m%d` #MANUAL_TAR_FILE = $(MANUAL_DATED).tar.gz @@ -425,7 +437,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/MSVC/cairomm $(distdir)/docs/reference + $(mkdir_p) $(distdir)/. $(distdir)/MSVC/cairomm $(distdir)/docs/reference $(distdir)/m4 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -684,7 +696,7 @@ release-verify-newer: @echo -n "Checking that no $(VERSION) release already exists..." @ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \ || (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \ - && echo "Are you sure you have an updated CVS checkout?" \ + && echo "Are you sure you have an updated git checkout?" \ && echo "This should never happen." \ && false) @echo "Good." @@ -706,9 +718,12 @@ release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file) scp $(tar_file) $(sha1_file) $(gpg_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR) mv $(tar_file) $(sha1_file) $(gpg_file) releases ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)" - $(CVS) tag RELEASE_$(GENERIC_MAJOR_VERSION)_$(GENERIC_MINOR_VERSION)_$(GENERIC_MICRO_VERSION) + $(GIT) tag -s -m "$(PACKAGE) release $(VERSION)" v$(VERSION) -release-publish: release-upload releases/$(sha1_file) +doc-publish: + (cd docs/reference && $(MAKE) $(AM_MAKEFLAGS) publish) + +release-publish: release-upload doc-publish releases/$(sha1_file) @echo "" @echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)" @echo "including the following:" diff --git a/libs/cairomm/NEWS b/libs/cairomm/NEWS index f30a2c5a9e..a6cd00118f 100644 --- a/libs/cairomm/NEWS +++ b/libs/cairomm/NEWS @@ -1,3 +1,29 @@ +1.4.6: + + * Bugfixes: + - Bug #11972: Cannot build cairomm with Quartz enabled + +1.4.4: + + * Added the --enable-api-exceptions=yes/no configure option, to allow + cairomm to build when exceptions are disabled. For instance, when using + CXXFLAGS=-fno-exceptions with g++. + +1.4.2: + + * Bugfixes: + - Bug #11596: Fixed broken shared library versioning (Dave Beckett) + - Bug #8511: RefPtr: refcounting broken with cast_*() methods (Murray + Cumming) + +1.4.0: + + * Wrapped new API added in cairo 1.4 + * Added support for Quartz surfaces + * ability to use dynamic casting for surfaces and patterns returned from + Context::get_target(), Context::get_source(), etc. + * Various build and bug fixes + 1.2.4: * Fixed an error that prevented Cairo::RefPtr<>::cast_static() and diff --git a/libs/cairomm/aclocal.m4 b/libs/cairomm/aclocal.m4 index 115e43d89c..6753636ee0 100644 --- a/libs/cairomm/aclocal.m4 +++ b/libs/cairomm/aclocal.m4 @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL +# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -176,7 +176,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -263,8 +263,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* @@ -276,8 +277,9 @@ $rm conftest* # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -293,12 +295,20 @@ $rm conftest* # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -529,13 +539,17 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -552,6 +566,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -623,7 +640,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -664,11 +681,12 @@ fi # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -782,24 +800,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -1026,7 +1047,8 @@ fi # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -1034,7 +1056,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1174,6 +1196,7 @@ else darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1191,7 +1214,8 @@ fi # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1205,20 +1229,58 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1375,12 +1437,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1397,18 +1455,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-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='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -1446,7 +1492,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -1509,7 +1555,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[[3-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1564,7 +1610,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -1580,7 +1626,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -1605,18 +1651,6 @@ netbsdelf*-gnu) dynamic_linker='NetBSD ld.elf_so' ;; -knetbsd*-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='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -1698,6 +1732,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1803,7 +1841,8 @@ fi # _LT_AC_TAGCONFIG # ---------------- AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_ARG_WITH([tags], [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], [include additional configurations @<:@automatic@:>@])], [tagnames="$withval"]) @@ -2064,7 +2103,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], # AC_PATH_TOOL_PREFIX # ------------------- -# find a file program which can recognise shared library +# find a file program which can recognize shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_MSG_CHECKING([for $1]) @@ -2127,7 +2166,7 @@ fi # AC_PATH_MAGIC # ------------- -# find a file program which can recognise a shared library +# find a file program which can recognize a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -2274,7 +2313,7 @@ esac # how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependent libraries], +[AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -2313,16 +2352,22 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -2360,7 +2405,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[[3-9]]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ;; @@ -2376,11 +2421,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) +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 @@ -2410,6 +2455,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -2462,7 +2511,7 @@ AC_DEFUN([AC_PROG_NM], lt_cv_path_NM="$NM" else lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do @@ -2678,10 +2727,10 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' _LT_AC_SYS_COMPILER @@ -2783,10 +2832,10 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2932,7 +2981,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -3091,10 +3140,10 @@ case $host_os in case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -3128,7 +3177,7 @@ case $host_os in freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -3177,9 +3226,7 @@ case $host_os in _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; @@ -3247,7 +3294,7 @@ case $host_os in ;; esac ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -3287,7 +3334,7 @@ case $host_os in _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -3367,6 +3414,29 @@ case $host_os in # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -3389,7 +3459,7 @@ case $host_os in ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -3405,16 +3475,20 @@ case $host_os in _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -3576,15 +3650,10 @@ case $host_os in case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -3631,6 +3700,12 @@ case $host_os in fi _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -3874,7 +3949,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in -interix3*) +interix[[3-9]]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. _LT_AC_TAGVAR(predep_objects,$1)= @@ -3882,13 +3957,46 @@ interix3*) _LT_AC_TAGVAR(postdeps,$1)= ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -3937,10 +4045,17 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4019,10 +4134,10 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4075,7 +4190,7 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -4164,6 +4279,7 @@ if test -f "$ltmain"; then _LT_AC_TAGVAR(module_cmds, $1) \ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ _LT_AC_TAGVAR(exclude_expsyms, $1) \ _LT_AC_TAGVAR(include_expsyms, $1); do @@ -4210,7 +4326,7 @@ ifelse([$1], [], # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4535,7 +4651,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) @@ -4618,6 +4734,7 @@ fi # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([LT_AC_PROG_SED]) AC_REQUIRE([AC_PROG_NM]) AC_REQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -4654,7 +4771,7 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[[ABCDGIRSTW]]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -4844,12 +4961,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # like `-m68040'. _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -4861,7 +4980,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -4927,7 +5046,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4970,7 +5089,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4997,6 +5116,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac ;; esac ;; @@ -5013,7 +5140,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -5117,13 +5244,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; @@ -5133,7 +5262,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -5191,7 +5320,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' @@ -5224,7 +5353,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -5243,6 +5372,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # All Alpha code is PIC. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; esac ;; @@ -5252,6 +5397,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + rdos*) + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + solaris*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5346,7 +5495,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], # ------------------------------------ # See if the linker supports building shared libraries. AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -5363,12 +5513,9 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_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' + _LT_AC_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' ;; - kfreebsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - linux*) + linux* | k*bsd*-gnu) _LT_AC_TAGVAR(link_all_deplibs, $1)=no ;; *) @@ -5508,7 +5655,7 @@ EOF _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -5526,7 +5673,7 @@ EOF fi ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -5541,7 +5688,7 @@ EOF _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -5559,13 +5706,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi _LT_AC_TAGVAR(link_all_deplibs, $1)=no else @@ -5573,7 +5729,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5606,7 +5762,7 @@ EOF sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -5725,7 +5881,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5818,7 +5974,7 @@ _LT_EOF # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; @@ -5860,10 +6016,10 @@ _LT_EOF case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -5909,15 +6065,6 @@ _LT_EOF _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - - # GNU/kFreeBSD uses gcc -shared to do shared libraries. - kfreebsd*-gnu) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; hpux9*) if test "$GCC" = yes; then @@ -6014,7 +6161,7 @@ _LT_EOF _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6034,24 +6181,28 @@ _LT_EOF ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -6110,17 +6261,16 @@ _LT_EOF case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6177,7 +6327,7 @@ _LT_EOF fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6252,7 +6402,7 @@ x|xyes) # to ld, don't add -lc before -lgcc. AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest @@ -6355,6 +6505,30 @@ AC_DEFUN([LT_AC_PROG_RC], [AC_CHECK_TOOL(RC, windres, no) ]) + +# Cheap backport of AS_EXECUTABLE_P and required macros +# from Autoconf 2.59; we should not use $as_executable_p directly. + +# _AS_TEST_PREPARE +# ---------------- +m4_ifndef([_AS_TEST_PREPARE], +[m4_defun([_AS_TEST_PREPARE], +[if test -x / >/dev/null 2>&1; then + as_executable_p='test -x' +else + as_executable_p='test -f' +fi +])])# _AS_TEST_PREPARE + +# AS_EXECUTABLE_P +# --------------- +# Check whether a file is executable. +m4_ifndef([AS_EXECUTABLE_P], +[m4_defun([AS_EXECUTABLE_P], +[AS_REQUIRE([_AS_TEST_PREPARE])dnl +$as_executable_p $1[]dnl +])])# AS_EXECUTABLE_P + # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # # a released version of Autoconf we should remove this # @@ -6375,12 +6549,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6413,6 +6588,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) @@ -6554,7 +6730,8 @@ installed software in a non-standard prefix. _PKG_TEXT ])], - [$4]) + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it @@ -6563,7 +6740,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], +To get pkg-config, see .])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -6902,6 +7079,18 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 @@ -7410,3 +7599,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/ax_boost_base.m4]) +m4_include([m4/ax_boost_unit_test_framework.m4]) +m4_include([m4/reduced.m4]) diff --git a/libs/cairomm/cairomm/Makefile.am b/libs/cairomm/cairomm/Makefile.am index 35be9846a3..d4de9bdcbb 100644 --- a/libs/cairomm/cairomm/Makefile.am +++ b/libs/cairomm/cairomm/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ -h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h +h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h h_sources_private = private.h -cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc +cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc cc_sources_private = private.cc # Support for DLL on cygwin/mingw using libtool > 1.4 diff --git a/libs/cairomm/cairomm/Makefile.in b/libs/cairomm/cairomm/Makefile.in index 6f7466b01d..e1ef6c5f23 100644 --- a/libs/cairomm/cairomm/Makefile.in +++ b/libs/cairomm/cairomm/Makefile.in @@ -39,12 +39,15 @@ build_triplet = @build@ host_triplet = @host@ subdir = cairomm DIST_COMMON = $(library_include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(srcdir)/cairommconfig.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = cairommconfig.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -58,14 +61,14 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libcairomm_1_0_la_DEPENDENCIES = am__objects_1 = context.lo fontface.lo fontoptions.lo path.lo \ - pattern.lo surface.lo xlib_surface.lo win32_surface.lo \ - exception.lo scaledfont.lo + pattern.lo quartz_surface.lo surface.lo xlib_surface.lo \ + win32_surface.lo exception.lo scaledfont.lo am__objects_2 = am__objects_3 = private.lo am_libcairomm_1_0_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ $(am__objects_2) $(am__objects_3) libcairomm_1_0_la_OBJECTS = $(am_libcairomm_1_0_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -107,7 +110,12 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ @@ -139,6 +147,7 @@ GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -152,6 +161,8 @@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ +OS_WIN32_FALSE = @OS_WIN32_FALSE@ +OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -163,20 +174,14 @@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -193,32 +198,39 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ -h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h +h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h exception.h refptr.h scaledfont.h h_sources_private = private.h -cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc +cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc scaledfont.cc cc_sources_private = private.cc @PLATFORM_WIN32_FALSE@win32_dlls_ldflags = @@ -232,7 +244,8 @@ libcairomm_1_0_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_privat # Install the headers: library_includedir = $(includedir)/cairomm-1.0/cairomm library_include_HEADERS = $(h_sources_public) -all: all-recursive +all: cairommconfig.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .cc .lo .o .obj @@ -265,6 +278,23 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +cairommconfig.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/cairommconfig.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status cairomm/cairommconfig.h +$(srcdir)/cairommconfig.h.in: $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f cairommconfig.h stamp-h1 install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" @@ -308,6 +338,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pattern.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/private.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quartz_surface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scaledfont.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/surface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32_surface.Plo@am__quote@ @@ -442,7 +473,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) cairommconfig.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -459,7 +490,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) cairommconfig.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -471,11 +502,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) cairommconfig.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) cairommconfig.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -537,7 +568,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) cairommconfig.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(library_includedir)"; do \ @@ -576,7 +607,7 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-hdr distclean-libtool distclean-tags dvi: dvi-recursive @@ -624,11 +655,11 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ clean clean-generic clean-libLTLIBRARIES clean-libtool \ clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-recursive distclean-tags distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-libLTLIBRARIES \ install-library_includeHEADERS install-man install-strip \ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic \ diff --git a/libs/cairomm/cairomm/cairommconfig.h.in b/libs/cairomm/cairomm/cairommconfig.h.in new file mode 100644 index 0000000000..f1c7895bff --- /dev/null +++ b/libs/cairomm/cairomm/cairommconfig.h.in @@ -0,0 +1,73 @@ +/* cairomm/cairommconfig.h.in. Generated from configure.in by autoheader. */ + +/* Defined when the --enable-api-exceptions configure argument was given */ +#undef CAIROMM_EXCEPTIONS_ENABLED + +/* define if the Boost library is available */ +#undef HAVE_BOOST + +/* define if the Boost::Unit_Test_Framework library is available */ +#undef HAVE_BOOST_UNIT_TEST_FRAMEWORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIST + +/* Define to 1 if you have the header file. */ +#undef HAVE_MAP + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION diff --git a/libs/cairomm/cairomm/context.cc b/libs/cairomm/cairomm/context.cc index 5f502c5f57..a4b60e914d 100644 --- a/libs/cairomm/cairomm/context.cc +++ b/libs/cairomm/cairomm/context.cc @@ -18,6 +18,10 @@ #include #include +#include +#include +#include +#include /* M_PI is defined in math.h in the case of Microsoft Visual C++ */ #if defined(_MSC_VER) @@ -151,6 +155,12 @@ void Context::set_dash(std::valarray& dashes, double offset) check_object_status_and_throw_exception(*this); } +void Context::set_dash(std::vector& dashes, double offset) +{ + cairo_set_dash(m_cobject, &dashes[0], dashes.size(), offset); + check_object_status_and_throw_exception(*this); +} + void Context::unset_dash() { cairo_set_dash(m_cobject, NULL, 0, 0.0); @@ -405,9 +415,35 @@ void Context::clip_preserve() check_object_status_and_throw_exception(*this); } +void Context::get_clip_extents(double& x1, double& y1, double& x2, double& y2) const +{ + cairo_clip_extents(const_cast(m_cobject), &x1, &y1, &x2, &y2); + check_object_status_and_throw_exception(*this); +} + +void Context::copy_clip_rectangle_list(std::vector& rectangles) const +{ + cairo_rectangle_list_t* c_list = 0; + // It would be nice if the cairo interface didn't copy it into a C array first + // and just let us do the copying... + c_list = cairo_copy_clip_rectangle_list(const_cast(m_cobject)); + // the rectangle list contains a status field that we need to check and the + // cairo context also has a status that we need to check + // FIXME: do we want to throw an exception if the clip can't be represented by + // rectangles? or do we just want to return an empty list? + check_status_and_throw_exception(c_list->status); + check_object_status_and_throw_exception(*this); + // copy the C array into the passed C++ list + rectangles.assign(c_list->rectangles, + c_list->rectangles + c_list->num_rectangles); + // free the memory allocated to the C array since we've copied it into a + // standard C++ container + cairo_rectangle_list_destroy(c_list); +} + void Context::select_font_face(const std::string& family, FontSlant slant, FontWeight weight) { - cairo_select_font_face (m_cobject, family.c_str(), + cairo_select_font_face(m_cobject, family.c_str(), static_cast(slant), static_cast(weight)); check_object_status_and_throw_exception(*this); @@ -506,18 +542,40 @@ Operator Context::get_operator() const return result; } +static RefPtr get_pattern_wrapper (cairo_pattern_t* pattern) +{ + cairo_pattern_type_t pattern_type = cairo_pattern_get_type (pattern); + switch (pattern_type) + { + case CAIRO_PATTERN_TYPE_SOLID: + return RefPtr(new SolidPattern(pattern, false /* does not have reference */)); + break; + case CAIRO_PATTERN_TYPE_SURFACE: + return RefPtr(new SurfacePattern(pattern, false /* does not have reference */)); + break; + case CAIRO_PATTERN_TYPE_LINEAR: + return RefPtr(new LinearGradient(pattern, false /* does not have reference */)); + break; + case CAIRO_PATTERN_TYPE_RADIAL: + return RefPtr(new RadialGradient(pattern, false /* does not have reference */)); + break; + default: + return RefPtr(new Pattern(pattern, false /* does not have reference */)); + } +} + RefPtr Context::get_source() { cairo_pattern_t* pattern = cairo_get_source(m_cobject); check_object_status_and_throw_exception(*this); - return RefPtr(new Pattern(pattern, false /* does not have reference */)); + return get_pattern_wrapper (pattern); } RefPtr Context::get_source() const { cairo_pattern_t* pattern = cairo_get_source(m_cobject); check_object_status_and_throw_exception(*this); - return RefPtr(new Pattern(pattern, false /* does not have reference */)); + return RefPtr::cast_const (get_pattern_wrapper (pattern)); } double Context::get_tolerance() const @@ -575,24 +633,92 @@ double Context::get_miter_limit() const return result; } +void +Context::get_dash(std::vector& dashes, double& offset) const +{ + // Allocate this array dynamically because some compilers complain about + // allocating arrays on the stack when the array size isn't a compile-time + // constant... + const int cnt = cairo_get_dash_count(m_cobject); + double* dash_array = new double[cnt]; + cairo_get_dash(const_cast(m_cobject), dash_array, &offset); + check_object_status_and_throw_exception(*this); + dashes.assign(dash_array, dash_array + cnt); + delete[] dash_array; +} + void Context::get_matrix(Matrix& matrix) { cairo_get_matrix(m_cobject, &matrix); check_object_status_and_throw_exception(*this); } +static +RefPtr get_surface_wrapper (cairo_surface_t* surface) +{ + cairo_surface_type_t surface_type = cairo_surface_get_type (surface); + switch (surface_type) + { + case CAIRO_SURFACE_TYPE_IMAGE: + return RefPtr(new ImageSurface(surface, false /* does not have reference */)); + break; +#if CAIRO_HAS_PDF_SURFACE + case CAIRO_SURFACE_TYPE_PDF: + return RefPtr(new PdfSurface(surface, false /* does not have reference */)); + break; +#endif +#if CAIRO_HAS_PS_SURFACE + case CAIRO_SURFACE_TYPE_PS: + return RefPtr(new PsSurface(surface, false /* does not have reference */)); + break; +#endif +#if CAIRO_HAS_XLIB_SURFACE + case CAIRO_SURFACE_TYPE_XLIB: + return RefPtr(new XlibSurface(surface, false /* does not have reference */)); + break; +#endif +#if CAIRO_HAS_GLITZ_SURFACE + case CAIRO_SURFACE_TYPE_GLITZ: + return RefPtr(new GlitzSurface(surface, false /* does not have reference */)); + break; +#endif +#if CAIRO_HAS_QUARTZ_SURFACE + case CAIRO_SURFACE_TYPE_QUARTZ: + return RefPtr(new QuartzSurface(surface, false /* does not have reference */)); + break; +#endif +#if CAIRO_HAS_WIN32_SURFACE + case CAIRO_SURFACE_TYPE_WIN32: + return RefPtr(new Win32Surface(surface, false /* does not have reference */)); + break; +#endif +#if CAIRO_HAS_SVG_SURFACE + case CAIRO_SURFACE_TYPE_SVG: + return RefPtr(new SvgSurface(surface, false /* does not have reference */)); + break; +#endif + // the following surfaces are not directly supported in cairomm yet + case CAIRO_SURFACE_TYPE_DIRECTFB: + case CAIRO_SURFACE_TYPE_OS2: + case CAIRO_SURFACE_TYPE_BEOS: + case CAIRO_SURFACE_TYPE_XCB: + default: + return RefPtr(new Surface(surface, false /* does not have reference */)); + } +} + RefPtr Context::get_target() { cairo_surface_t* surface = cairo_get_target(const_cast(m_cobject)); check_object_status_and_throw_exception(*this); - return RefPtr(new Surface(surface, false /* does not have reference */)); + return get_surface_wrapper (surface); } RefPtr Context::get_target() const { cairo_surface_t* surface = cairo_get_target(const_cast(m_cobject)); check_object_status_and_throw_exception(*this); - return RefPtr(new Surface(surface, false /* does not have reference */)); + return RefPtr::cast_const (get_surface_wrapper (surface)); } Path* Context::copy_path() const @@ -631,7 +757,7 @@ RefPtr Context::pop_group() { cairo_pattern_t* pattern = cairo_pop_group(m_cobject); check_object_status_and_throw_exception(*this); - return RefPtr(new Pattern(pattern)); + return get_pattern_wrapper(pattern); } void Context::pop_group_to_source() @@ -644,24 +770,26 @@ RefPtr Context::get_group_target() { cairo_surface_t* surface = cairo_get_group_target(m_cobject); // surface can be NULL if you're not between push/pop group calls - if (surface == NULL) + if(!surface) { // FIXME: is this really the right way to handle this? throw_exception(CAIRO_STATUS_NULL_POINTER); } - return RefPtr(new Surface(surface, false)); + + return get_surface_wrapper(surface); } RefPtr Context::get_group_target() const { cairo_surface_t* surface = cairo_get_group_target(m_cobject); // surface can be NULL if you're not between push/pop group calls - if (surface == NULL) + if(!surface) { // FIXME: is this really the right way to handle this? throw_exception(CAIRO_STATUS_NULL_POINTER); } - return RefPtr(new Surface(surface, false)); + + return get_surface_wrapper(surface); } } //namespace Cairo diff --git a/libs/cairomm/cairomm/context.h b/libs/cairomm/cairomm/context.h index dcd3d833a6..6c47e3bd23 100644 --- a/libs/cairomm/cairomm/context.h +++ b/libs/cairomm/cairomm/context.h @@ -19,6 +19,8 @@ #ifndef __CAIROMM_CONTEXT_H #define __CAIROMM_CONTEXT_H +#include +#include #include #include #include @@ -35,6 +37,7 @@ typedef cairo_glyph_t Glyph; //A simple struct. typedef cairo_font_extents_t FontExtents; //A simple struct. typedef cairo_text_extents_t TextExtents; //A simple struct. typedef cairo_matrix_t Matrix; //A simple struct. //TODO: Derive and add operator[] and operator. matrix multiplication? +typedef cairo_rectangle_t Rectangle; /** Context is the main class used to draw in cairomm. * In the simplest case, create a Context with its target Surface, set its @@ -232,6 +235,11 @@ public: */ void set_line_join(LineJoin line_join); + /** + * Alternate version of set_dash(). You'll probably want to use the one that + * takes a std::vector argument instead. + */ + void set_dash(std::valarray& dashes, double offset); /** Sets the dash pattern to be used by stroke(). A dash pattern is specified * by dashes, an array of positive values. Each value provides the user-space * length of altenate "on" and "off" portions of the stroke. The offset @@ -249,7 +257,7 @@ public: * * @exception */ - void set_dash(std::valarray& dashes, double offset); + void set_dash(std::vector& dashes, double offset); /** This function disables a dash pattern that was set with set_dash() */ @@ -668,6 +676,30 @@ public: * @sa set_fill_rule() */ void clip_preserve(); + + /** + * Computes a bounding box in user coordinates covering the area inside the + * current clip. + * + * @param x1 left of the resulting extents + * @param y1 top of the resulting extents + * @param x2 right of the resulting extents + * @param y2 bottom of the resulting extents + * + * @since 1.4 + **/ + void get_clip_extents(double& x1, double& y1, double& x2, double& y2) const; + + /** + * Returns the current clip region as a list of rectangles in user coordinates. + * + * This function will throw an exception if the clip region cannot be + * represented as a list of user-space rectangles. + * + * @Since 1.4 + **/ + void copy_clip_rectangle_list(std::vector& rectangles) const; + void select_font_face(const std::string& family, FontSlant slant, FontWeight weight); void set_font_size(double size); void set_font_matrix(const Matrix& matrix); @@ -737,6 +769,17 @@ public: */ double get_miter_limit() const; + /** + * Gets the current dash array and offset. + * + * @param dashes return value for the dash array + * @param offset return value for the current dash offset + * + * Since: 1.4 + **/ + void get_dash(std::vector& dashes, double& offset) const; + + /** Stores the current transformation matrix (CTM) into matrix. * * @param matrix return value for the matrix @@ -754,7 +797,7 @@ public: * @exception */ RefPtr get_target() const; - + //TODO: Copy or reference-count a Path somethow instead of asking the caller to delete it? /** Creates a copy of the current path and returns it to the user. * diff --git a/libs/cairomm/cairomm/enums.h b/libs/cairomm/cairomm/enums.h index e2023ed265..349d9781b3 100644 --- a/libs/cairomm/cairomm/enums.h +++ b/libs/cairomm/cairomm/enums.h @@ -111,7 +111,7 @@ typedef enum FORMAT_RGB24 = CAIRO_FORMAT_RGB24, FORMAT_A8 = CAIRO_FORMAT_A8, FORMAT_A1 = CAIRO_FORMAT_A1, - FORMAT_RGB16_565 = CAIRO_FORMAT_RGB16_565 + FORMAT_RGB16_565 = CAIRO_FORMAT_RGB16_565 /* @< @deprecated This format value is deprecated. It has never been properly implemented in cairo and is unnecessary. */ } Format; @@ -175,7 +175,8 @@ typedef enum SURFACE_TYPE_WIN32 = CAIRO_SURFACE_TYPE_WIN32, SURFACE_TYPE_BEOS = CAIRO_SURFACE_TYPE_BEOS, SURFACE_TYPE_DIRECTFB = CAIRO_SURFACE_TYPE_DIRECTFB, - SURFACE_TYPE_SVG = CAIRO_SURFACE_TYPE_SVG + SURFACE_TYPE_SVG = CAIRO_SURFACE_TYPE_SVG, + SURFACE_TYPE_OS2 = CAIRO_SURFACE_TYPE_OS2 } SurfaceType; typedef enum diff --git a/libs/cairomm/cairomm/pattern.cc b/libs/cairomm/cairomm/pattern.cc index 27638cd400..420ed824d1 100644 --- a/libs/cairomm/cairomm/pattern.cc +++ b/libs/cairomm/cairomm/pattern.cc @@ -77,6 +77,14 @@ SolidPattern::SolidPattern(cairo_pattern_t* cobject, bool has_reference) : Pattern(cobject, has_reference) { } +void +SolidPattern::get_rgba(double& red, double& green, + double& blue, double& alpha) const +{ + // ignore the return value since we know that this is a solid color pattern + cairo_pattern_get_rgba(m_cobject, &red, &green, &blue, &alpha); + check_object_status_and_throw_exception(*this); +} SolidPattern::~SolidPattern() { @@ -103,6 +111,22 @@ SurfacePattern::SurfacePattern(const RefPtr& surface) check_object_status_and_throw_exception(*this); } +RefPtr +SurfacePattern::get_surface() +{ + cairo_surface_t* surface = 0; + // we can ignore the return value since we know this is a surface pattern + cairo_pattern_get_surface(const_cast(m_cobject), &surface); + check_object_status_and_throw_exception(*this); + return RefPtr(new Surface(surface, false /* does not have reference */)); +} + +RefPtr +SurfacePattern::get_surface() const +{ + return const_cast(this)->get_surface(); +} + RefPtr SurfacePattern::create(const RefPtr& surface) { return RefPtr(new SurfacePattern(surface)); @@ -170,6 +194,26 @@ void Gradient::add_color_stop_rgba(double offset, double red, double green, doub check_object_status_and_throw_exception(*this); } +std::vector +Gradient::get_color_stops() const +{ + std::vector stops; + + int num_stops = 0; + // we can ignore the return value since we know this is a gradient pattern + cairo_pattern_get_color_stop_count(m_cobject, &num_stops); + // since we know the total number of stops, we can avoid re-allocation with + // each addition to the vector by pre-allocating the required number + stops.reserve(num_stops); + for(int i = 0; i < num_stops; ++i) + { + ColorStop stop; + cairo_pattern_get_color_stop_rgba(m_cobject, i, &stop.offset, &stop.red, + &stop.green, &stop.blue, &stop.alpha); + stops.push_back(stop); + } + return stops; +} LinearGradient::LinearGradient(double x0, double y0, double x1, double y1) @@ -178,6 +222,17 @@ LinearGradient::LinearGradient(double x0, double y0, double x1, double y1) check_object_status_and_throw_exception(*this); } +void +LinearGradient::get_linear_points(double &x0, double &y0, + double &x1, double &y1) const +{ + // ignore the return value since we know that this is a linear gradient + // pattern + cairo_pattern_get_linear_points(m_cobject, &x0, &y0, &x1, &y1); + check_object_status_and_throw_exception(*this); +} + + RefPtr LinearGradient::create(double x0, double y0, double x1, double y1) { return RefPtr(new LinearGradient(x0, y0, x1, y1)); @@ -199,6 +254,18 @@ RadialGradient::RadialGradient(double cx0, double cy0, double radius0, double cx check_object_status_and_throw_exception(*this); } +void +RadialGradient::get_radial_circles(double& x0, double& y0, double& r0, + double& x1, double& y1, double& r1) const +{ + // ignore the return value since we know that this is a radial gradient + // pattern + cairo_pattern_get_radial_circles(const_cast(m_cobject), + &x0, &y0, &r0, &x1, &y1, &r1); + check_object_status_and_throw_exception(*this); +} + + RefPtr RadialGradient::create(double cx0, double cy0, double radius0, double cx1, double cy1, double radius1) { return RefPtr(new RadialGradient(cx0, cy0, radius0, cx1, cy1, radius1)); diff --git a/libs/cairomm/cairomm/pattern.h b/libs/cairomm/cairomm/pattern.h index 2624d7a5d9..e56d38339e 100644 --- a/libs/cairomm/cairomm/pattern.h +++ b/libs/cairomm/cairomm/pattern.h @@ -26,6 +26,11 @@ namespace Cairo { +struct ColorStop +{ + double offset; + double red, green, blue, alpha; +}; /** * This is a reference-counted object that should be used via Cairo::RefPtr. @@ -83,8 +88,25 @@ public: */ explicit SolidPattern(cairo_pattern_t* cobject, bool has_reference = false); + /** + * Gets the solid color for a solid color pattern. + * + * @param red return value for red component of color + * @param green return value for green component of color + * @param blue return value for blue component of color + * @param alpha return value for alpha component of color + * + * @since 1.4 + **/ + void get_rgba (double& red, double& green, + double& blue, double& alpha) const; + + //TODO: Documentation static RefPtr create_rgb(double red, double green, double blue); - static RefPtr create_rgba(double red, double green, double blue, double alpha); + + //TODO: Documentation + static RefPtr create_rgba(double red, double green, + double blue, double alpha); //TODO?: SolidPattern(cairo_pattern_t *target); virtual ~SolidPattern(); @@ -106,6 +128,19 @@ public: */ explicit SurfacePattern(cairo_pattern_t* cobject, bool has_reference = false); + /** + * Gets the surface associated with this pattern + * + * @since 1.4 + **/ + RefPtr get_surface () const; + + /** + * Gets the surface associated with this pattern + * + * @since 1.4 + **/ + RefPtr get_surface (); virtual ~SurfacePattern(); @@ -134,9 +169,47 @@ public: virtual ~Gradient(); + /** + * Adds an opaque color stop to a gradient pattern. The offset + * specifies the location along the gradient's control vector. For + * example, a linear gradient's control vector is from (x0,y0) to + * (x1,y1) while a radial gradient's control vector is from any point + * on the start circle to the corresponding point on the end circle. + * + * The color is specified in the same way as in Context::set_source_rgb(). + * + * @param offset an offset in the range [0.0 .. 1.0] + * @param red red component of color + * @param green green component of color + * @param blue blue component of color + **/ void add_color_stop_rgb(double offset, double red, double green, double blue); + + /** + * Adds a translucent color stop to a gradient pattern. The offset + * specifies the location along the gradient's control vector. For + * example, a linear gradient's control vector is from (x0,y0) to + * (x1,y1) while a radial gradient's control vector is from any point + * on the start circle to the corresponding point on the end circle. + * + * The color is specified in the same way as in Context::set_source_rgba(). + * + * @param offset an offset in the range [0.0 .. 1.0] + * @param red red component of color + * @param green green component of color + * @param blue blue component of color + * @param alpha alpha component of color + */ void add_color_stop_rgba(double offset, double red, double green, double blue, double alpha); + /* + * Gets the color stops and offsets for this Gradient + * + * @since 1.4 + */ + std::vector get_color_stops() const; + + protected: Gradient(); }; @@ -155,6 +228,19 @@ public: */ explicit LinearGradient(cairo_pattern_t* cobject, bool has_reference = false); + /** + * @param x0 return value for the x coordinate of the first point + * @param y0 return value for the y coordinate of the first point + * @param x1 return value for the x coordinate of the second point + * @param y1 return value for the y coordinate of the second point + * + * Gets the gradient endpoints for a linear gradient. + * + * @since 1.4 + **/ + void get_linear_points(double &x0, double &y0, + double &x1, double &y1) const; + //TODO?: LinearGradient(cairo_pattern_t *target); virtual ~LinearGradient(); @@ -175,6 +261,21 @@ public: */ explicit RadialGradient(cairo_pattern_t* cobject, bool has_reference = false); + /** + * @param x0 return value for the x coordinate of the center of the first (inner) circle + * @param y0 return value for the y coordinate of the center of the first (inner) circle + * @param r0 return value for the radius of the first (inner) circle + * @param x1 return value for the x coordinate of the center of the second (outer) circle + * @param y1 return value for the y coordinate of the center of the second (outer) circle + * @param r1 return value for the radius of the second (outer) circle + * + * Gets the gradient endpoint circles for a radial gradient, each + * specified as a center coordinate and a radius. + * + * @since 1.4 + **/ + void get_radial_circles(double& x0, double& y0, double& r0, + double& x1, double& y1, double& r1) const; //TODO?: RadialGradient(cairo_pattern_t *target); virtual ~RadialGradient(); diff --git a/libs/cairomm/cairomm/private.cc b/libs/cairomm/cairomm/private.cc index 68d09f9562..d71f0dfa2c 100644 --- a/libs/cairomm/cairomm/private.cc +++ b/libs/cairomm/cairomm/private.cc @@ -16,6 +16,7 @@ * 02110-1301, USA. */ +//#include //For CAIROMM_EXCEPTIONS_ENABLED #include #include #include @@ -24,6 +25,7 @@ namespace Cairo { +#ifdef CAIROMM_EXCEPTIONS_ENABLED void throw_exception(ErrorStatus status) { switch(status) @@ -55,21 +57,28 @@ void throw_exception(ErrorStatus status) throw Cairo::logic_error(status); break; - // Other + // Other case CAIRO_STATUS_READ_ERROR: case CAIRO_STATUS_WRITE_ERROR: - { - //The Cairo language binding advice suggests that these are stream errors - //that should be mapped to their C++ equivalents. - const char* error_message = cairo_status_to_string(status); - throw std::ios_base::failure( error_message ? error_message : std::string() ); - } - + { + //The Cairo language binding advice suggests that these are stream errors + //that should be mapped to their C++ equivalents. + const char* error_message = cairo_status_to_string(status); + throw std::ios_base::failure( error_message ? error_message : std::string() ); + } + break; + default: throw Cairo::logic_error(status); break; } } +#else +void throw_exception(ErrorStatus /* status */) +{ + //Do nothing. The application should call get_status() instead. +} +#endif //CAIROMM_EXCEPTIONS_ENABLED } //namespace Cairo diff --git a/libs/cairomm/cairomm/private.h b/libs/cairomm/cairomm/private.h index 7b18c5bc21..6b911b558a 100644 --- a/libs/cairomm/cairomm/private.h +++ b/libs/cairomm/cairomm/private.h @@ -23,10 +23,11 @@ #include #include - +#ifndef DOXYGEN_IGNORE_THIS namespace Cairo { +/// Throws the appropriate exception, if exceptions are enabled. void throw_exception(ErrorStatus status); //We inline this because it is called so often. @@ -44,6 +45,7 @@ void check_object_status_and_throw_exception(const T& object) } } // namespace Cairo +#endif //DOXYGEN_IGNORE_THIS #endif //__CAIROMM_PRIVATE_H diff --git a/libs/cairomm/cairomm/quartz_surface.cc b/libs/cairomm/cairomm/quartz_surface.cc new file mode 100644 index 0000000000..b5000c6f1b --- /dev/null +++ b/libs/cairomm/cairomm/quartz_surface.cc @@ -0,0 +1,60 @@ +/* Copyright (C) 2007 The cairomm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#include +#include + +namespace Cairo +{ + +#ifdef CAIRO_HAS_QUARTZ_SURFACE + +QuartzSurface::QuartzSurface(cairo_surface_t* cobject, bool has_reference) : + Surface(cobject, has_reference) +{} + +QuartzSurface::~QuartzSurface() +{ + // surface is destroyed in base class +} + +CGContextRef QuartzSurface::get_cg_context() const +{ + return cairo_quartz_surface_get_cg_context(m_cobject); +} + +RefPtr QuartzSurface::create(CGContextRef cg_context, int width, int height) +{ + cairo_surface_t* cobject = cairo_quartz_surface_create_for_cg_context(cg_context, + width, height); + check_status_and_throw_exception(cairo_surface_status(cobject)); + return RefPtr(new QuartzSurface(cobject, true /* has reference */)); +} + +RefPtr QuartzSurface::create(Format format, int width, int height) +{ + cairo_surface_t* cobject = cairo_quartz_surface_create((cairo_format_t)format, width, height); + check_status_and_throw_exception(cairo_surface_status(cobject)); + return RefPtr(new QuartzSurface(cobject, true /* has reference */)); +} + +#endif // CAIRO_HAS_QUARTZ_SURFACE + +} //namespace Cairo + +// vim: ts=2 sw=2 et diff --git a/libs/cairomm/cairomm/quartz_surface.h b/libs/cairomm/cairomm/quartz_surface.h new file mode 100644 index 0000000000..246a45a1b8 --- /dev/null +++ b/libs/cairomm/cairomm/quartz_surface.h @@ -0,0 +1,88 @@ +/* Copyright (C) 2007 The cairomm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +#ifndef __CAIROMM_QUARTZ_SURFACE_H +#define __CAIROMM_QUARTZ_SURFACE_H + +#include + +#ifdef CAIRO_HAS_QUARTZ_SURFACE +#include +#endif + +namespace Cairo +{ + +#ifdef CAIRO_HAS_QUARTZ_SURFACE + +/** A QuartzSurface provides a way to render within Apple Mac OS X. If you + * want to draw to the screen within a Mac OS X application, you + * should use this Surface type. + * + * @note For this Surface to be available, cairo must have been compiled with + * (native) Quartz support (requires Cairo > 1.4.0) + */ +class QuartzSurface : public Surface +{ +public: + + /** Create a C++ wrapper for the C instance. This C++ instance should then be + * given to a RefPtr. + * + * @param cobject The C instance. + * @param has_reference whether we already have a reference. Otherwise, the + * constructor will take an extra reference. + */ + explicit QuartzSurface(cairo_surface_t* cobject, bool has_reference = false); + virtual ~QuartzSurface(); + + /** Returns the CGContextRef associated with this surface, or NULL if none. Also + * returns NULL if the surface is not a Quartz surface. + * + * @return CGContextRef or NULL if no CGContextRef available. + */ + CGContextRef get_cg_context() const; + + /** Creates a cairo surface that targets the given CGContext. + * + * @param cg_context the CGContext to create a surface for + * @return the newly created surface + */ + static RefPtr create(CGContextRef cg_context, int width, int height); + + /** Creates a device-independent-bitmap surface not associated with any + * particular existing surface or device context. The created bitmap will be + * unititialized. + * + * @param format format of pixels in the surface to create + * @param width width of the surface, in pixels + * @param height height of the surface, in pixels + * @return the newly created surface + */ + static RefPtr create(Format format, int width, int height); + +}; + +#endif // CAIRO_HAS_QUARTZ_SURFACE + + +} // namespace Cairo + +#endif //__CAIROMM_QUARTZ_SURFACE_H + +// vim: ts=2 sw=2 et diff --git a/libs/cairomm/cairomm/refptr.h b/libs/cairomm/cairomm/refptr.h index c346fe0001..90b8240192 100644 --- a/libs/cairomm/cairomm/refptr.h +++ b/libs/cairomm/cairomm/refptr.h @@ -2,7 +2,7 @@ #ifndef _cairo_REFPTR_H #define _cairo_REFPTR_H -/* $Id: refptr.h,v 1.6 2006/09/27 18:38:57 murrayc Exp $ */ +/* $Id: refptr.h,v 1.6 2006-09-27 18:38:57 murrayc Exp $ */ /* Copyright 2005 The cairomm Development Team * @@ -64,6 +64,9 @@ public: */ explicit inline RefPtr(T_CppObject* pCppObject); + /// For use only in the internal implementation of sharedptr. + explicit inline RefPtr(T_CppObject* pCppObject, int* refcount); + /** Copy constructor * * This increments the shared reference count. @@ -227,6 +230,17 @@ RefPtr::RefPtr(T_CppObject* pCppObject) } } +//Used by cast_*() implementations: +template inline +RefPtr::RefPtr(T_CppObject* pCppObject, int* refcount) +: + pCppObject_(pCppObject), + pCppRefcount_(refcount) +{ + if(pCppObject_ && pCppRefcount_) + ++(*pCppRefcount_); +} + template inline RefPtr::RefPtr(const RefPtr& src) : @@ -342,10 +356,10 @@ RefPtr RefPtr::cast_dynamic(const RefPtr& { T_CppObject *const pCppObject = dynamic_cast(src.operator->()); - if(pCppObject && src.refcount_()) - ++(*(src.refcount_())); - - return RefPtr(pCppObject); //TODO: Does an unnecessary extra reference() on the C object. + if(pCppObject) //Check whether dynamic_cast<> succeeded so we don't pass a null object with a used refcount: + return RefPtr(pCppObject, src.refcount_()); + else + return RefPtr(); } template @@ -355,10 +369,7 @@ RefPtr RefPtr::cast_static(const RefPtr& s { T_CppObject *const pCppObject = static_cast(src.operator->()); - if(pCppObject && src.refcount_()) - ++(*(src.refcount_())); - - return RefPtr(pCppObject); //TODO: Does an unnecessary extra reference() on the C object. + return RefPtr(pCppObject, src.refcount_()); } template @@ -368,10 +379,7 @@ RefPtr RefPtr::cast_const(const RefPtr& sr { T_CppObject *const pCppObject = const_cast(src.operator->()); - if(pCppObject && src.refcount_()) - ++(*(src.refcount_())); - - return RefPtr(pCppObject); //TODO: Does an unnecessary extra reference() on the C object. + return RefPtr(pCppObject, src.refcount_()); } #endif /* DOXYGEN_IGNORE_THIS */ diff --git a/libs/cairomm/cairomm/scaledfont.h b/libs/cairomm/cairomm/scaledfont.h index 9ad077c7d5..2648054605 100644 --- a/libs/cairomm/cairomm/scaledfont.h +++ b/libs/cairomm/cairomm/scaledfont.h @@ -77,9 +77,11 @@ public: static RefPtr create(FontFace& font_face, const Matrix& font_matrix, const Matrix& ctm, const FontOptions& options); + //TODO: This should really be get_extents(). /** Gets the metrics for a ScaledFont */ void extents(FontExtents& extents) const; + //TODO: This should really be get_text_extents(). /** Gets the extents for a string of text. The extents describe a user-space * rectangle that encloses the "inked" portion of the text drawn at the origin * (0,0) (as it would be drawn by Context::show_text() if the cairo graphics @@ -102,6 +104,7 @@ public: */ void text_extents(const std::string& utf8, TextExtents& extents) const; + //TODO: This should really be get_glyph_extents(). /** Gets the extents for an array of glyphs. The extents describe a user-space * rectangle that encloses the "inked" portion of the glyphs, (as they would * be drawn by Context::show_glyphs() if the cairo graphics state were set to the diff --git a/libs/cairomm/cairomm/surface.h b/libs/cairomm/cairomm/surface.h index 001f754a79..15f0f9b092 100644 --- a/libs/cairomm/cairomm/surface.h +++ b/libs/cairomm/cairomm/surface.h @@ -28,6 +28,7 @@ //See xlib_surface.h for XlibSurface. //See win32_surface.h for Win32Surface. +//See quartz_surface.h for QuartzSurface (Mac OS X). #ifdef CAIRO_HAS_PDF_SURFACE #include diff --git a/libs/cairomm/config.guess b/libs/cairomm/config.guess old mode 100644 new mode 100755 index ad5281e66e..0f0fe712ae --- a/libs/cairomm/config.guess +++ b/libs/cairomm/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-08-03' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,12 +769,19 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -779,9 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -817,6 +835,9 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +872,11 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +895,11 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -919,9 +948,15 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -964,7 +999,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -974,7 +1009,11 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1176,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1185,7 +1233,6 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1264,6 +1311,9 @@ EOF i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/libs/cairomm/config.sub b/libs/cairomm/config.sub old mode 100644 new mode 100755 index 1c366dfde9..5defff65a6 --- a/libs/cairomm/config.sub +++ b/libs/cairomm/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +120,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +173,10 @@ case $os in -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,15 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,28 +268,27 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -286,6 +296,9 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -305,18 +318,18 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,31 +349,30 @@ case $basic_machine in | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -696,6 +708,9 @@ case $basic_machine in basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +818,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +880,10 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -885,6 +910,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -896,6 +925,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1101,7 +1133,7 @@ case $basic_machine in sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1206,23 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1340,6 +1374,12 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1349,9 +1389,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1377,6 +1417,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff --git a/libs/cairomm/configure b/libs/cairomm/configure old mode 100644 new mode 100755 index 46e0fc25db..421eb11d58 --- a/libs/cairomm/configure +++ b/libs/cairomm/configure @@ -1,81 +1,35 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.61. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset + setopt NO_GLOB_SUBST else - as_unset=false + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. +# PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -96,124 +50,466 @@ if test "${PATH_SEPARATOR+set}" != set; then rm -f conf$$.sh fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done +IFS=$as_save_IFS - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +518,28 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,15 +548,6 @@ 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'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -395,29 +703,26 @@ tagnames=${tagnames+${tagnames},}CXX tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 &1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -429,42 +734,185 @@ ac_unique_file="cairomm/cairomm.h" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GENERIC_MAJOR_VERSION GENERIC_MINOR_VERSION GENERIC_MICRO_VERSION GENERIC_VERSION GENERIC_LIBRARY_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP F77 FFLAGS ac_ct_F77 LIBTOOL PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE PKG_CONFIG ac_pt_PKG_CONFIG CAIROMM_CFLAGS CAIROMM_LIBS DOXYGEN DOT DOCS_SUBDIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +GENERIC_MAJOR_VERSION +GENERIC_MINOR_VERSION +GENERIC_MICRO_VERSION +GENERIC_VERSION +GENERIC_LIBRARY_VERSION +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +CXX +CXXFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CXX +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CXXCPP +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +CC +CFLAGS +ac_ct_CC +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +SED +GREP +EGREP +LN_S +ECHO +AR +RANLIB +DLLTOOL +AS +OBJDUMP +CPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +PLATFORM_WIN32_TRUE +PLATFORM_WIN32_FALSE +OS_WIN32_TRUE +OS_WIN32_FALSE +PKG_CONFIG +CAIROMM_CFLAGS +CAIROMM_LIBS +BOOST_CPPFLAGS +BOOST_LDFLAGS +BOOST_UNIT_TEST_FRAMEWORK_LIB +AUTOTESTS_TRUE +AUTOTESTS_FALSE +DOXYGEN +DOT +DOCS_SUBDIR +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CXX +CXXFLAGS +LDFLAGS +LIBS +CPPFLAGS +CCC +CXXCPP +CC +CFLAGS +CPP +F77 +FFLAGS +PKG_CONFIG +CAIROMM_CFLAGS +CAIROMM_LIBS' + # Initialize some variables set by options. ac_init_help= @@ -491,34 +939,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -540,33 +1002,45 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -593,6 +1067,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -617,13 +1097,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -688,6 +1171,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -740,24 +1233,20 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -788,8 +1277,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -809,27 +1297,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -856,106 +1336,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_env_PKG_CONFIG_value=$PKG_CONFIG -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG -ac_env_CAIROMM_CFLAGS_set=${CAIROMM_CFLAGS+set} -ac_env_CAIROMM_CFLAGS_value=$CAIROMM_CFLAGS -ac_cv_env_CAIROMM_CFLAGS_set=${CAIROMM_CFLAGS+set} -ac_cv_env_CAIROMM_CFLAGS_value=$CAIROMM_CFLAGS -ac_env_CAIROMM_LIBS_set=${CAIROMM_LIBS+set} -ac_env_CAIROMM_LIBS_value=$CAIROMM_LIBS -ac_cv_env_CAIROMM_LIBS_set=${CAIROMM_LIBS+set} -ac_cv_env_CAIROMM_LIBS_value=$CAIROMM_LIBS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -984,9 +1434,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -1004,15 +1451,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1037,13 +1491,14 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=yes] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-tests=yes|no enable automated tests (default is no) + --enable-api-exceptions Build exceptions API. + [default=yes] --enable-docs build the included docs [default=yes] Optional Packages: @@ -1052,16 +1507,23 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] + --with-boost[=DIR] use boost (default is No) - it is possible to + specify the root directory for boost (optional) + --with-boost-unit-test-framework[=special-lib] + use the Unit_Test_Framework library from boost - it + is possible to specify a certain library for the + linker e.g. + --with-boost-unit-test-framework=boost_unit_test_framework-gcc Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CXXCPP C++ preprocessor CC C compiler command CFLAGS C compiler flags @@ -1078,118 +1540,86 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd "$ac_popdir" + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +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 $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1208,7 +1638,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1222,6 +1652,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1243,7 +1674,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1254,7 +1684,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1276,9 +1706,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1289,8 +1717,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1303,20 +1731,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1327,22 +1769,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1354,26 +1802,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1404,14 +1850,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1427,8 +1876,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1440,12 +1889,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1470,8 +1918,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1488,6 +1935,22 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi + + + + + + + + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1496,27 +1959,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - #release versioning GENERIC_MAJOR_VERSION=1 -GENERIC_MINOR_VERSION=2 -GENERIC_MICRO_VERSION=4 +GENERIC_MINOR_VERSION=4 +GENERIC_MICRO_VERSION=6 GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION @@ -1524,7 +1970,7 @@ GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VER #shared library versioning -GENERIC_LIBRARY_VERSION=1:0:0 +GENERIC_LIBRARY_VERSION=2:0:1 # | | | # +------+ | +---+ # | | | @@ -1541,32 +1987,37 @@ GENERIC_LIBRARY_VERSION=1:0:0 VERSION=$GENERIC_VERSION - am__api_version="1.9" ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -1581,8 +2032,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1604,7 +2055,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1623,21 +2074,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1647,8 +2099,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1690,20 +2142,20 @@ echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1755,8 +2207,8 @@ for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1769,54 +2221,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1887,8 +2342,8 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1901,32 +2356,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1939,27 +2396,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -1980,18 +2451,25 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' -ac_ext=cc +ac_config_headers="$ac_config_headers cairomm/cairommconfig.h" + + +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2004,36 +2482,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2046,49 +2526,79 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2113,47 +2623,77 @@ ac_clean_files="$ac_clean_files a.out 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. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 +echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2165,19 +2705,21 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 +echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2196,22 +2738,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2222,9 +2769,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2238,14 +2784,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2265,14 +2811,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2290,12 +2842,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2318,49 +2870,49 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2376,37 +2928,118 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -2422,110 +3055,6 @@ else CXXFLAGS= fi fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2533,7 +3062,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -2543,8 +3072,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -2571,15 +3100,15 @@ if test "$am__include" = "#"; then fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -2599,8 +3128,8 @@ fi depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2689,8 +3218,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type @@ -2706,13 +3235,13 @@ else fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2742,24 +3271,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -2768,9 +3295,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2780,24 +3308,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -2808,6 +3334,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -2825,8 +3352,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -2849,24 +3376,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -2875,9 +3400,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2887,24 +3413,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -2915,6 +3439,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -2936,7 +3461,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -2955,8 +3480,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2978,7 +3503,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2997,21 +3522,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3023,10 +3549,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Check whether --enable-shared or --disable-shared was given. +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -3045,12 +3570,12 @@ if test "${enable_shared+set}" = set; then esac else enable_shared=yes -fi; +fi -# Check whether --enable-static or --disable-static was given. + +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -3069,12 +3594,12 @@ if test "${enable_static+set}" = set; then esac else enable_static=yes -fi; +fi -# Check whether --enable-fast-install or --disable-fast-install was given. + +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -3093,60 +3618,90 @@ if test "${enable_fast_install+set}" = set; then esac else enable_fast_install=yes -fi; +fi + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac ac_ext=c @@ -3157,8 +3712,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3171,32 +3726,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3209,36 +3766,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3251,74 +3823,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3332,7 +3864,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3343,6 +3875,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -3360,22 +3893,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3388,36 +3922,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3430,29 +3966,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -3465,27 +4017,41 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3508,49 +4074,49 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3566,37 +4132,118 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3612,12 +4259,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3651,12 +4298,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3671,202 +4323,58 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -3874,8 +4382,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3964,8 +4472,8 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3981,8 +4489,8 @@ else fi -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3995,12 +4503,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -4035,37 +4544,185 @@ done fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4094,11 +4751,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4131,17 +4788,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4155,20 +4812,20 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4185,8 +4842,8 @@ case $host_os in ;; esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4234,23 +4891,23 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4291,16 +4948,22 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu | dragonfly*) +freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -4338,7 +5001,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[3-9]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -4354,11 +5017,11 @@ irix5* | irix6* | nonstopux*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) +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 @@ -4388,6 +5051,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -4425,8 +5092,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4444,11 +5111,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -4475,7 +5142,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4478 "configure"' > conftest.$ac_ext + echo '#line 5145 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4510,7 +5177,8 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -4521,6 +5189,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -4537,6 +5208,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -4560,8 +5234,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4587,34 +5261,32 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4623,8 +5295,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -4654,8 +5326,8 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4668,32 +5340,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4706,27 +5380,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - DLLTOOL=$ac_ct_DLLTOOL + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi else DLLTOOL="$ac_cv_prog_DLLTOOL" fi @@ -4734,8 +5422,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4748,32 +5436,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4786,27 +5476,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AS=$ac_ct_AS + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi else AS="$ac_cv_prog_AS" fi @@ -4814,8 +5518,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4828,32 +5532,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4866,27 +5572,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - OBJDUMP=$ac_ct_OBJDUMP + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi else OBJDUMP="$ac_cv_prog_OBJDUMP" fi @@ -4903,8 +5623,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4938,24 +5658,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4964,9 +5682,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4976,24 +5695,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5004,6 +5721,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5021,8 +5739,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -5045,24 +5763,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5071,9 +5787,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5083,24 +5800,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5111,6 +5826,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5133,8 +5849,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5158,34 +5874,31 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -5241,6 +5954,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -5260,18 +5974,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5284,12 +6007,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + fi fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -5312,9 +6037,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -5328,37 +6053,35 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -5373,18 +6096,19 @@ done for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5395,40 +6119,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5437,24 +6158,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5462,9 +6181,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5488,25 +6208,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5523,13 +6237,13 @@ done if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5559,24 +6273,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5585,9 +6297,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5597,24 +6310,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5625,6 +6336,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5642,8 +6354,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -5666,24 +6378,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -5692,9 +6402,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5704,24 +6415,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -5732,6 +6441,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5747,7 +6457,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5761,12 +6471,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5779,36 +6489,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5821,48 +6533,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:5851:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -5872,8 +6614,8 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5886,45 +6628,42 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5935,38 +6674,35 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -5984,7 +6720,7 @@ else fi G77=`test $ac_compiler_gnu = yes && echo yes` -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5995,8 +6731,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6080,43 +6816,47 @@ else fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi + # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6151,7 +6891,7 @@ hpux*) # Its linker distinguishes data from code symbols lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; -linux*) +linux* | k*bsd*-gnu) if test "$host_cpu" = ia64; then symcode='[ABCDGIRSTW]' lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" @@ -6320,15 +7060,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6342,8 +7082,8 @@ else fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -6394,8 +7134,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6408,32 +7148,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6446,27 +7188,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -6474,8 +7230,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6488,32 +7244,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6526,27 +7284,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -6554,8 +7326,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6568,32 +7340,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6606,27 +7380,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -6654,7 +7442,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -6685,8 +7473,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6738,17 +7526,17 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6800,11 +7588,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -6819,21 +7607,21 @@ esac enable_dlopen=no enable_win32_dll=yes -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -6854,10 +7642,10 @@ objext=o objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' # If no C compiler was specified, use CC. @@ -6872,13 +7660,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -6891,14 +7679,14 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -6909,11 +7697,11 @@ else -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:6912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7700: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6916: \$? = $ac_status" >&5 + echo "$as_me:7704: \$? = $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. @@ -6926,8 +7714,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -6941,8 +7729,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -6964,13 +7752,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' ;; @@ -6980,7 +7770,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -7038,7 +7828,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' @@ -7071,7 +7861,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' @@ -7090,6 +7880,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; esac ;; @@ -7099,6 +7905,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static='-non_shared' ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + solaris*) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -7151,22 +7961,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7177,11 +7987,11 @@ else -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:7180: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7990: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7184: \$? = $ac_status" >&5 + echo "$as_me:7994: \$? = $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. @@ -7194,8 +8004,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7222,15 +8032,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -7250,8 +8060,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } if test x"$lt_prog_compiler_static_works" = xyes; then : @@ -7260,8 +8070,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7270,7 +8080,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -7281,11 +8091,11 @@ else -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:7284: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8094: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7288: \$? = $ac_status" >&5 + echo "$as_me:8098: \$? = $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 @@ -7307,23 +8117,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -7333,8 +8143,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -7477,7 +8287,7 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -7495,7 +8305,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -7510,7 +8320,7 @@ EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -7528,13 +8338,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi link_all_deplibs=no else @@ -7542,7 +8361,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -7694,7 +8513,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -7750,38 +8569,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7810,38 +8635,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7887,7 +8718,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes=yes ;; @@ -7929,10 +8760,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -7979,15 +8810,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var=no ;; - # GNU/kFreeBSD uses gcc -shared to do shared libraries. - kfreebsd*-gnu) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - link_all_deplibs=no - ;; - hpux9*) if test "$GCC" = yes; then archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -8083,7 +8905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + 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 @@ -8103,24 +8925,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; @@ -8179,17 +9005,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs=yes ;; @@ -8246,7 +9071,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag='${wl}-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no @@ -8299,8 +9124,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -8320,10 +9145,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -8358,16 +9183,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -8381,17 +9206,55 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" + if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -8551,12 +9414,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -8573,18 +9432,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-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='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -8622,7 +9469,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -8685,7 +9532,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -8740,7 +9587,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -8756,7 +9603,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -8781,18 +9628,6 @@ netbsdelf*-gnu) dynamic_linker='NetBSD ld.elf_so' ;; -knetbsd*-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='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -8874,6 +9709,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -8966,8 +9805,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -8975,8 +9814,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -9000,8 +9839,8 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -9014,29 +9853,30 @@ fi striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + old_striplib="$STRIP -S" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -9068,8 +9908,8 @@ else darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9082,55 +9922,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -9144,8 +9982,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9172,72 +10010,64 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9250,60 +10080,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9330,72 +10158,64 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9408,60 +10228,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9474,60 +10292,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9540,55 +10356,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -9628,8 +10442,8 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9639,7 +10453,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9739,7 +10553,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -9846,13 +10660,13 @@ fi # Report which library types will actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -9872,15 +10686,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -9937,6 +10751,7 @@ if test -f "$ltmain"; then module_cmds \ module_expsym_cmds \ lt_cv_prog_compiler_c_o \ + fix_srcfile_path \ exclude_expsyms \ include_expsyms; do @@ -9981,7 +10796,7 @@ echo "$as_me: creating $ofile" >&6;} # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -10305,7 +11120,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols @@ -10363,7 +11178,7 @@ else fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10372,11 +11187,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -10430,7 +11245,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10474,10 +11289,10 @@ objext=o objext_CXX=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -10493,13 +11308,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -10549,18 +11364,18 @@ if test "$GXX" = yes; then # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -10589,11 +11404,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10626,17 +11441,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10650,8 +11465,8 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -10701,8 +11516,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -10758,7 +11573,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_CXX=yes + : else # We have old collect2 hardcode_direct_CXX=unsupported @@ -10814,38 +11629,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10875,38 +11696,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11017,10 +11844,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -11054,7 +11881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi freebsd-elf*) archive_cmds_need_lc_CXX=no ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -11103,9 +11930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_CXX=: case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) export_dynamic_flag_spec_CXX='${wl}-E' ;; @@ -11173,7 +11998,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - interix3*) + interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' @@ -11213,7 +12038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -11293,6 +12118,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -11315,7 +12163,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -11331,16 +12179,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + ld_shlibs_CXX=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -11502,15 +12354,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_CXX=yes @@ -11557,6 +12404,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -11637,8 +12490,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -11748,7 +12601,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in -interix3*) +interix[3-9]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. predep_objects_CXX= @@ -11756,13 +12609,46 @@ interix3*) postdeps_CXX= ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -11777,8 +12663,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -11799,12 +12685,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # like `-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -11816,7 +12704,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -11882,7 +12770,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -11925,7 +12813,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -11952,6 +12840,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_CXX='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac ;; esac ;; @@ -11968,7 +12864,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; esac ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -12051,22 +12947,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -12077,11 +12973,11 @@ else -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:12080: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12976: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12084: \$? = $ac_status" >&5 + echo "$as_me:12980: \$? = $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. @@ -12094,8 +12990,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -12122,15 +13018,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12150,8 +13046,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } if test x"$lt_prog_compiler_static_works_CXX" = xyes; then : @@ -12160,8 +13056,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12170,7 +13066,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -12181,11 +13077,11 @@ else -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:12184: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13080: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12188: \$? = $ac_status" >&5 + echo "$as_me:13084: \$? = $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 @@ -12207,23 +13103,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -12233,8 +13129,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -12251,12 +13147,9 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - 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' + 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' ;; - kfreebsd*-gnu) - link_all_deplibs_CXX=no - ;; - linux*) + linux* | k*bsd*-gnu) link_all_deplibs_CXX=no ;; *) @@ -12264,8 +13157,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -12285,10 +13178,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -12323,16 +13216,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -12346,20 +13239,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -12516,12 +13396,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -12538,18 +13413,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-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='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -12587,7 +13450,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -12650,7 +13513,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -12705,7 +13568,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -12721,7 +13584,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -12746,18 +13609,6 @@ netbsdelf*-gnu) dynamic_linker='NetBSD ld.elf_so' ;; -knetbsd*-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='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -12839,6 +13690,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -12931,8 +13786,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -12940,8 +13795,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -12965,8 +13820,8 @@ else # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -13033,6 +13888,7 @@ if test -f "$ltmain"; then module_cmds_CXX \ module_expsym_cmds_CXX \ lt_cv_prog_compiler_c_o_CXX \ + fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX; do @@ -13353,7 +14209,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_CXX" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -13386,7 +14242,7 @@ else fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -13444,10 +14300,17 @@ objext=o objext_F77=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -13463,13 +14326,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -13491,13 +14354,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -13516,15 +14379,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -13533,8 +14396,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -13556,13 +14419,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_F77='-DDLL_EXPORT' ;; @@ -13572,7 +14437,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -13630,7 +14495,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic_F77='-DDLL_EXPORT' @@ -13663,7 +14528,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' @@ -13682,6 +14547,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # All Alpha code is PIC. lt_prog_compiler_static_F77='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='' + ;; + esac + ;; esac ;; @@ -13691,6 +14572,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_F77='-non_shared' ;; + rdos*) + lt_prog_compiler_static_F77='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -13743,22 +14628,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -13769,11 +14654,11 @@ else -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:13772: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14657: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13776: \$? = $ac_status" >&5 + echo "$as_me:14661: \$? = $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. @@ -13786,8 +14671,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -13814,15 +14699,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13842,8 +14727,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } if test x"$lt_prog_compiler_static_works_F77" = xyes; then : @@ -13852,8 +14737,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13862,7 +14747,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -13873,11 +14758,11 @@ else -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:13876: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14761: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13880: \$? = $ac_status" >&5 + echo "$as_me:14765: \$? = $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 @@ -13899,23 +14784,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -13925,8 +14810,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -14069,7 +14954,7 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -14087,7 +14972,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_F77=no hardcode_shlibpath_var_F77=no hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' @@ -14102,7 +14987,7 @@ EOF archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -14120,13 +15005,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi link_all_deplibs_F77=no else @@ -14134,7 +15028,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -14286,7 +15180,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_F77=yes + : else # We have old collect2 hardcode_direct_F77=unsupported @@ -14332,38 +15226,44 @@ _LT_EOF end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14382,38 +15282,44 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14459,7 +15365,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; @@ -14501,10 +15407,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -14551,15 +15457,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_F77=no ;; - # GNU/kFreeBSD uses gcc -shared to do shared libraries. - kfreebsd*-gnu) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - link_all_deplibs_F77=no - ;; - hpux9*) if test "$GCC" = yes; then archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -14655,7 +15552,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_F77=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -14675,24 +15572,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_F77=no fi ;; @@ -14751,17 +15652,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_F77=yes ;; @@ -14818,7 +15718,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_F77='${wl}-z,text' archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no @@ -14871,8 +15771,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no # @@ -14892,10 +15792,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -14930,16 +15830,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -14953,20 +15853,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -15123,12 +16010,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -15145,18 +16027,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-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='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -15194,7 +16064,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -15257,7 +16127,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15312,7 +16182,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -15328,7 +16198,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -15353,18 +16223,6 @@ netbsdelf*-gnu) dynamic_linker='NetBSD ld.elf_so' ;; -knetbsd*-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='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -15446,6 +16304,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -15538,8 +16400,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -15547,8 +16409,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -15572,8 +16434,8 @@ else # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -15640,6 +16502,7 @@ if test -f "$ltmain"; then module_cmds_F77 \ module_expsym_cmds_F77 \ lt_cv_prog_compiler_c_o_F77 \ + fix_srcfile_path_F77 \ exclude_expsyms_F77 \ include_expsyms_F77; do @@ -15960,7 +16823,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_F77" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_F77 @@ -15993,7 +16856,7 @@ else fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -16010,7 +16873,6 @@ CC="$lt_save_CC" if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -16019,10 +16881,10 @@ objext=o objext_GCJ=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -16038,13 +16900,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -16078,14 +16940,14 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -16096,11 +16958,11 @@ else -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:16099: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16961: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16103: \$? = $ac_status" >&5 + echo "$as_me:16965: \$? = $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. @@ -16113,8 +16975,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -16128,8 +16990,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -16151,13 +17013,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ;; @@ -16167,7 +17031,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -16225,7 +17089,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' @@ -16258,7 +17122,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-Bstatic' ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' @@ -16277,6 +17141,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl_GCJ='' + ;; + esac + ;; esac ;; @@ -16286,6 +17166,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_static_GCJ='-non_shared' ;; + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -16338,22 +17222,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -16364,11 +17248,11 @@ else -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:16367: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17251: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16371: \$? = $ac_status" >&5 + echo "$as_me:17255: \$? = $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. @@ -16381,8 +17265,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -16409,15 +17293,15 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16437,8 +17321,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then : @@ -16447,8 +17331,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16457,7 +17341,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -16468,11 +17352,11 @@ else -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:16471: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17355: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16475: \$? = $ac_status" >&5 + echo "$as_me:17359: \$? = $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 @@ -16494,23 +17378,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16520,8 +17404,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -16664,7 +17548,7 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -16682,7 +17566,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' @@ -16697,7 +17581,7 @@ EOF archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -16715,13 +17599,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi link_all_deplibs_GCJ=no else @@ -16729,7 +17622,7 @@ EOF fi ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -16881,7 +17774,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_GCJ=yes + : else # We have old collect2 hardcode_direct_GCJ=unsupported @@ -16937,38 +17830,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16997,38 +17896,44 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17074,7 +17979,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; @@ -17116,10 +18021,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -17166,15 +18071,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_shlibpath_var_GCJ=no ;; - # GNU/kFreeBSD uses gcc -shared to do shared libraries. - kfreebsd*-gnu) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - link_all_deplibs_GCJ=no - ;; - hpux9*) if test "$GCC" = yes; then archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' @@ -17270,7 +18166,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_GCJ=yes ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -17290,24 +18186,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -17366,17 +18266,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_GCJ=yes ;; @@ -17433,7 +18332,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_GCJ='${wl}-z,text' archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no @@ -17486,8 +18385,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no # @@ -17507,10 +18406,10 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -17545,16 +18444,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -17568,20 +18467,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -17738,12 +18624,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -17760,18 +18641,6 @@ freebsd1*) dynamic_linker=no ;; -kfreebsd*-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='GNU ld.so' - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -17809,7 +18678,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -17872,7 +18741,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -17927,7 +18796,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be Linux ELF. -linux*) +linux* | k*bsd*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -17943,7 +18812,7 @@ linux*) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -17968,18 +18837,6 @@ netbsdelf*-gnu) dynamic_linker='NetBSD ld.elf_so' ;; -knetbsd*-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='GNU ld.so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -18061,6 +18918,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -18153,8 +19014,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -18162,8 +19023,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -18187,8 +19048,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported @@ -18255,6 +19116,7 @@ if test -f "$ltmain"; then module_cmds_GCJ \ module_expsym_cmds_GCJ \ lt_cv_prog_compiler_c_o_GCJ \ + fix_srcfile_path_GCJ \ exclude_expsyms_GCJ \ include_expsyms_GCJ; do @@ -18575,7 +19437,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_GCJ @@ -18608,7 +19470,7 @@ else fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -18624,7 +19486,6 @@ CC="$lt_save_CC" RC) - # Source file extension for RC test sources. ac_ext=rc @@ -18633,7 +19494,7 @@ objext=o objext_RC=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -18652,13 +19513,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -18736,6 +19597,7 @@ if test -f "$ltmain"; then module_cmds_RC \ module_expsym_cmds_RC \ lt_cv_prog_compiler_c_o_RC \ + fix_srcfile_path_RC \ exclude_expsyms_RC \ include_expsyms_RC; do @@ -19056,7 +19918,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_RC @@ -19089,7 +19951,7 @@ else fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -19156,8 +20018,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' -echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes @@ -19166,8 +20028,8 @@ case "$host" in platform_win32=no ;; esac -echo "$as_me:$LINENO: result: $platform_win32" >&5 -echo "${ECHO_T}$platform_win32" >&6 +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } if test "$platform_win32" = "yes"; then @@ -19179,15 +20041,38 @@ else fi +{ echo "$as_me:$LINENO: checking for native Win32" >&5 +echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +{ echo "$as_me:$LINENO: result: $os_win32" >&5 +echo "${ECHO_T}$os_win32" >&6; } + + +if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' +else + OS_WIN32_TRUE='#' + OS_WIN32_FALSE= +fi + + # Ensure MSVC-compatible struct packing convention is used when # compiling for Win32 with gcc. # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while # gcc2 uses "-fnative-struct". -if test x"$platform_win32" = xyes; then +if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' - echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 -echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" else @@ -19206,14 +20091,14 @@ echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 ;; esac if test x"$msnative_struct" = x ; then - echo "$as_me:$LINENO: result: no way" >&5 -echo "${ECHO_T}no way" >&6 + { echo "$as_me:$LINENO: result: no way" >&5 +echo "${ECHO_T}no way" >&6; } { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} else CXXFLAGS="$CXXFLAGS $msnative_struct" - echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 -echo "${ECHO_T}${msnative_struct}" >&6 + { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +echo "${ECHO_T}${msnative_struct}" >&6; } fi fi fi @@ -19225,18 +20110,19 @@ fi for ac_header in string list map do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19247,40 +20133,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19289,24 +20172,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -19314,9 +20195,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -19340,25 +20222,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -19379,8 +20255,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19395,34 +20271,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19437,28 +20314,42 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - PKG_CONFIG=$ac_pt_PKG_CONFIG + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi @@ -19466,34 +20357,34 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } PKG_CONFIG="" fi fi pkg_failed=no -echo "$as_me:$LINENO: checking for CAIROMM" >&5 -echo $ECHO_N "checking for CAIROMM... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for CAIROMM" >&5 +echo $ECHO_N "checking for CAIROMM... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$CAIROMM_CFLAGS"; then pkg_cv_CAIROMM_CFLAGS="$CAIROMM_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "cairo >= 1.2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= 1.4") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_CAIROMM_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.2.0" 2>/dev/null` + pkg_cv_CAIROMM_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.4" 2>/dev/null` else pkg_failed=yes fi @@ -19506,12 +20397,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_CAIROMM_LIBS="$CAIROMM_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "cairo >= 1.2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "cairo >= 1.4") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_CAIROMM_LIBS=`$PKG_CONFIG --libs "cairo >= 1.2.0" 2>/dev/null` + pkg_cv_CAIROMM_LIBS=`$PKG_CONFIG --libs "cairo >= 1.4" 2>/dev/null` else pkg_failed=yes fi @@ -19530,14 +20421,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CAIROMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= 1.2.0"` + CAIROMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= 1.4"` else - CAIROMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.2.0"` + CAIROMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.4"` fi # Put the nasty error message in config.log where it belongs echo "$CAIROMM_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (cairo >= 1.2.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (cairo >= 1.4) were not met: $CAIROMM_PKG_ERRORS @@ -19548,7 +20439,7 @@ Alternatively, you may set the environment variables CAIROMM_CFLAGS and CAIROMM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (cairo >= 1.2.0) were not met: +echo "$as_me: error: Package requirements (cairo >= 1.4) were not met: $CAIROMM_PKG_ERRORS @@ -19569,7 +20460,7 @@ Alternatively, you may set the environment variables CAIROMM_CFLAGS and CAIROMM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see . +To get pkg-config, see . See \`config.log' for more details." >&5 echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -19579,32 +20470,634 @@ Alternatively, you may set the environment variables CAIROMM_CFLAGS and CAIROMM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -To get pkg-config, see . +To get pkg-config, see . See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else CAIROMM_CFLAGS=$pkg_cv_CAIROMM_CFLAGS CAIROMM_LIBS=$pkg_cv_CAIROMM_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then + enableval=$enable_tests; ENABLE_TESTS=$enableval +else + ENABLE_TESTS=no +fi -DOCS_SUBDIR="" # Check whether --enable-docs or --disable-docs was given. -if test "${enable_docs+set}" = set; then - enableval="$enable_docs" +if test x$CAIROMM_DEVEL = xon ; then + ENABLE_TESTS=yes +fi + +if test x$ENABLE_TESTS = xyes ; then + + +# Check whether --with-boost was given. +if test "${with_boost+set}" = set; then + withval=$with_boost; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" + else + want_boost="yes" + ac_boost_path="$withval" + fi +else + want_boost="yes" +fi + + +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=1.33.1 + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + { echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5 +echo $ECHO_N "checking for boostlib >= $boost_lib_version_req... $ECHO_C" >&6; } + succeeded=no + + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + BOOST_CPPFLAGS="-I$ac_boost_path/include" + else + for ac_boost_path_tmp in /usr /usr/local /opt ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done + fi + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + found_system=yes + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + + if test "x$succeeded" != "xyes"; then + _version=0 + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" + done + fi + else + for ac_boost_path in /usr /usr/local /opt ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done + + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + BOOST_LDFLAGS="-L$best_path/lib" + + if test "x$BOOST_ROOT" != "x"; then + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "$V_CHECK" = "1" ; then + { echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5 +echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;} + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" + fi + fi + fi + fi + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + succeeded=yes + found_system=yes + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + fi + + if test "$succeeded" != "yes" ; then + if test "$_version" = "0" ; then + { { echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&5 +echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation." >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5 +echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;} + fi + else + + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BOOST +_ACEOF + + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" +fi + + + + +# Check whether --with-boost-unit-test-framework was given. +if test "${with_boost_unit_test_framework+set}" = set; then + withval=$with_boost_unit_test_framework; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_unit_test_framework_lib="" + else + want_boost="yes" + ax_boost_user_unit_test_framework_lib="$withval" + fi + +else + want_boost="yes" + +fi + + + if test "x$want_boost" = "xyes"; then + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + { echo "$as_me:$LINENO: checking whether the Boost::Unit_Test_Framework library is available" >&5 +echo $ECHO_N "checking whether the Boost::Unit_Test_Framework library is available... $ECHO_C" >&6; } +if test "${ax_cv_boost_unit_test_framework+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +using boost::unit_test::test_suite; + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ax_cv_boost_unit_test_framework=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ax_cv_boost_unit_test_framework=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +fi +{ echo "$as_me:$LINENO: result: $ax_cv_boost_unit_test_framework" >&5 +echo "${ECHO_T}$ax_cv_boost_unit_test_framework" >&6; } + if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BOOST_UNIT_TEST_FRAMEWORK +_ACEOF + + BN=boost_unit_test_framework + if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then + saved_ldflags="${LDFLAGS}" + for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ + lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \ + $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do + LDFLAGS="${LDFLAGS} -l$ax_lib" + { echo "$as_me:$LINENO: checking Boost::UnitTestFramework library linkage" >&5 +echo $ECHO_N "checking Boost::UnitTestFramework library linkage... $ECHO_C" >&6; } +if test "${ax_cv_boost_unit_test_framework_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + using boost::unit_test::test_suite; + test_suite* init_unit_test_suite( int argc, char * argv[] ) { + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); + return test; + } + +int +main () +{ + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + link_unit_test_framework="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + link_unit_test_framework="no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +fi +{ echo "$as_me:$LINENO: result: $ax_cv_boost_unit_test_framework_link" >&5 +echo "${ECHO_T}$ax_cv_boost_unit_test_framework_link" >&6; } + LDFLAGS="${saved_ldflags}" + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + + break + fi + done + else + saved_ldflags="${LDFLAGS}" + for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do + LDFLAGS="${LDFLAGS} -l$ax_lib" + { echo "$as_me:$LINENO: checking Boost::UnitTestFramework library linkage" >&5 +echo $ECHO_N "checking Boost::UnitTestFramework library linkage... $ECHO_C" >&6; } +if test "${ax_cv_boost_unit_test_framework_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + using boost::unit_test::test_suite; + test_suite* init_unit_test_suite( int argc, char * argv[] ) { + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); + return test; + } + +int +main () +{ + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + link_unit_test_framework="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + link_unit_test_framework="no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +fi +{ echo "$as_me:$LINENO: result: $ax_cv_boost_unit_test_framework_link" >&5 +echo "${ECHO_T}$ax_cv_boost_unit_test_framework_link" >&6; } + LDFLAGS="${saved_ldflags}" + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + + break + fi + done + fi + if test "x$link_unit_test_framework" = "xno"; then + { { echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5 +echo "$as_me: error: Could not link against $ax_lib !" >&2;} + { (exit 1); exit 1; }; } + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi + +{ echo "$as_me:$LINENO: support of automated tests enabled" >&5 +echo "$as_me: support of automated tests enabled" >&6;} +else + { echo "$as_me:$LINENO: disabled support of automated tests" >&5 +echo "$as_me: disabled support of automated tests" >&6;} +fi + + +if test x$ENABLE_TESTS = xyes; then + AUTOTESTS_TRUE= + AUTOTESTS_FALSE='#' +else + AUTOTESTS_TRUE='#' + AUTOTESTS_FALSE= +fi + + +if test "x$CAIROMM_DEVEL" = "xon" ; then + CXXFLAGS="$CXXFLAGS -Wall -g -Werror -Wextra" +fi + + + # Check whether --enable-api-exceptions was given. +if test "${enable_api_exceptions+set}" = set; then + enableval=$enable_api_exceptions; cairomm_enable_api_exceptions="$enableval" +else + cairomm_enable_api_exceptions='yes' +fi + + + if test "x$cairomm_enable_api_exceptions" = "xyes"; then + { + +cat >>confdefs.h <<\_ACEOF +#define CAIROMM_EXCEPTIONS_ENABLED 1 +_ACEOF + + } + fi + + +DOCS_SUBDIR="" # Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then + enableval=$enable_docs; else enable_docs=yes -fi; +fi + if test "x$enable_docs" = "xyes"; then for ac_prog in doxygen do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DOXYGEN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19617,25 +21110,27 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DOXYGEN="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi DOXYGEN=$ac_cv_prog_DOXYGEN if test -n "$DOXYGEN"; then - echo "$as_me:$LINENO: result: $DOXYGEN" >&5 -echo "${ECHO_T}$DOXYGEN" >&6 + { echo "$as_me:$LINENO: result: $DOXYGEN" >&5 +echo "${ECHO_T}$DOXYGEN" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$DOXYGEN" && break done test -n "$DOXYGEN" || DOXYGEN="no" @@ -19648,8 +21143,8 @@ echo "$as_me: WARNING: Doxygen not found, documentation will not be rebuilt" >&2 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DOT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19662,25 +21157,27 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DOT="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi DOT=$ac_cv_prog_DOT if test -n "$DOT"; then - echo "$as_me:$LINENO: result: $DOT" >&5 -echo "${ECHO_T}$DOT" >&6 + { echo "$as_me:$LINENO: result: $DOT" >&5 +echo "${ECHO_T}$DOT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$DOT" && break done test -n "$DOT" || DOT="no" @@ -19692,16 +21189,16 @@ echo "$as_me: WARNING: graphviz / dot not found, documentation graphs will not b fi DOCS_SUBDIR="docs" - ac_config_files="$ac_config_files docs/Makefile docs/reference/Makefile docs/reference/Doxyfile" + ac_config_files="$ac_config_files docs/Makefile docs/reference/Makefile docs/reference/Doxyfile" fi - ac_config_files="$ac_config_files Makefile cairomm/Makefile examples/Makefile examples/png_file/Makefile examples/pdf-surface/Makefile examples/ps-surface/Makefile examples/svg-surface/Makefile examples/text-rotate/Makefile cairomm-1.0.pc" +ac_config_files="$ac_config_files Makefile cairomm/Makefile examples/Makefile examples/png_file/Makefile examples/pdf-surface/Makefile examples/ps-surface/Makefile examples/svg-surface/Makefile examples/text-rotate/Makefile tests/Makefile cairomm-1.0.pc" - ac_config_files="$ac_config_files MSVC/Makefile MSVC/gendef/Makefile MSVC/cairomm/Makefile MSVC/cairomm/cairomm.rc MSVC/examples/Makefile MSVC/examples/pdf-surface/Makefile MSVC/examples/png_file/Makefile MSVC/examples/ps-surface/Makefile MSVC/examples/svg-surface/Makefile MSVC/examples/text-rotate/Makefile" +ac_config_files="$ac_config_files MSVC/Makefile MSVC/gendef/Makefile MSVC/cairomm/Makefile MSVC/cairomm/cairomm.rc MSVC/examples/Makefile MSVC/examples/pdf-surface/Makefile MSVC/examples/png_file/Makefile MSVC/examples/ps-surface/Makefile MSVC/examples/svg-surface/Makefile MSVC/examples/text-rotate/Makefile" cat >confcache <<\_ACEOF @@ -19722,39 +21219,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -19763,63 +21279,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - +DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -19854,6 +21325,20 @@ echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"OS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${AUTOTESTS_TRUE}" && test -z "${AUTOTESTS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AUTOTESTS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AUTOTESTS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -19878,73 +21363,26 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset + setopt NO_GLOB_SUBST else - as_unset=false + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. +# PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -19965,126 +21403,198 @@ if test "${PATH_SEPARATOR+set}" != set; then rm -f conf$$.sh fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done +IFS=$as_save_IFS - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + + as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -20093,7 +21603,28 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -20102,31 +21633,14 @@ 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'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -20134,30 +21648,20 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -20165,33 +21669,40 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Configuration commands: $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -20202,39 +21713,24 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -20244,18 +21740,24 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -20271,433 +21773,557 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; - "docs/reference/Doxyfile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "cairomm/Makefile" ) CONFIG_FILES="$CONFIG_FILES cairomm/Makefile" ;; - "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/png_file/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/png_file/Makefile" ;; - "examples/pdf-surface/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/pdf-surface/Makefile" ;; - "examples/ps-surface/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/ps-surface/Makefile" ;; - "examples/svg-surface/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/svg-surface/Makefile" ;; - "examples/text-rotate/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/text-rotate/Makefile" ;; - "cairomm-1.0.pc" ) CONFIG_FILES="$CONFIG_FILES cairomm-1.0.pc" ;; - "MSVC/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/Makefile" ;; - "MSVC/gendef/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/gendef/Makefile" ;; - "MSVC/cairomm/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/cairomm/Makefile" ;; - "MSVC/cairomm/cairomm.rc" ) CONFIG_FILES="$CONFIG_FILES MSVC/cairomm/cairomm.rc" ;; - "MSVC/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/examples/Makefile" ;; - "MSVC/examples/pdf-surface/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/examples/pdf-surface/Makefile" ;; - "MSVC/examples/png_file/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/examples/png_file/Makefile" ;; - "MSVC/examples/ps-surface/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/examples/ps-surface/Makefile" ;; - "MSVC/examples/svg-surface/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/examples/svg-surface/Makefile" ;; - "MSVC/examples/text-rotate/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC/examples/text-rotate/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + case $ac_config_target in + "cairomm/cairommconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS cairomm/cairommconfig.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; + "docs/reference/Doxyfile") CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "cairomm/Makefile") CONFIG_FILES="$CONFIG_FILES cairomm/Makefile" ;; + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "examples/png_file/Makefile") CONFIG_FILES="$CONFIG_FILES examples/png_file/Makefile" ;; + "examples/pdf-surface/Makefile") CONFIG_FILES="$CONFIG_FILES examples/pdf-surface/Makefile" ;; + "examples/ps-surface/Makefile") CONFIG_FILES="$CONFIG_FILES examples/ps-surface/Makefile" ;; + "examples/svg-surface/Makefile") CONFIG_FILES="$CONFIG_FILES examples/svg-surface/Makefile" ;; + "examples/text-rotate/Makefile") CONFIG_FILES="$CONFIG_FILES examples/text-rotate/Makefile" ;; + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "cairomm-1.0.pc") CONFIG_FILES="$CONFIG_FILES cairomm-1.0.pc" ;; + "MSVC/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/Makefile" ;; + "MSVC/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/gendef/Makefile" ;; + "MSVC/cairomm/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/cairomm/Makefile" ;; + "MSVC/cairomm/cairomm.rc") CONFIG_FILES="$CONFIG_FILES MSVC/cairomm/cairomm.rc" ;; + "MSVC/examples/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/examples/Makefile" ;; + "MSVC/examples/pdf-surface/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/examples/pdf-surface/Makefile" ;; + "MSVC/examples/png_file/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/examples/png_file/Makefile" ;; + "MSVC/examples/ps-surface/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/examples/ps-surface/Makefile" ;; + "MSVC/examples/svg-surface/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/examples/svg-surface/Makefile" ;; + "MSVC/examples/text-rotate/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC/examples/text-rotate/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@GENERIC_MAJOR_VERSION@,$GENERIC_MAJOR_VERSION,;t t -s,@GENERIC_MINOR_VERSION@,$GENERIC_MINOR_VERSION,;t t -s,@GENERIC_MICRO_VERSION@,$GENERIC_MICRO_VERSION,;t t -s,@GENERIC_VERSION@,$GENERIC_VERSION,;t t -s,@GENERIC_LIBRARY_VERSION@,$GENERIC_LIBRARY_VERSION,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t -s,@CPP@,$CPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t -s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t -s,@CAIROMM_CFLAGS@,$CAIROMM_CFLAGS,;t t -s,@CAIROMM_LIBS@,$CAIROMM_LIBS,;t t -s,@DOXYGEN@,$DOXYGEN,;t t -s,@DOT@,$DOT,;t t -s,@DOCS_SUBDIR@,$DOCS_SUBDIR,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF +if test -n "$CONFIG_FILES"; then _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +GENERIC_MAJOR_VERSION!$GENERIC_MAJOR_VERSION$ac_delim +GENERIC_MINOR_VERSION!$GENERIC_MINOR_VERSION$ac_delim +GENERIC_MICRO_VERSION!$GENERIC_MICRO_VERSION$ac_delim +GENERIC_VERSION!$GENERIC_VERSION$ac_delim +GENERIC_LIBRARY_VERSION!$GENERIC_LIBRARY_VERSION$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +SED!$SED$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +DLLTOOL!$DLLTOOL$ac_delim +AS!$AS$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +CPP!$CPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim +PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim +OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim +OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +CAIROMM_CFLAGS!$CAIROMM_CFLAGS$ac_delim +CAIROMM_LIBS!$CAIROMM_LIBS$ac_delim +BOOST_CPPFLAGS!$BOOST_CPPFLAGS$ac_delim +BOOST_LDFLAGS!$BOOST_LDFLAGS$ac_delim +BOOST_UNIT_TEST_FRAMEWORK_LIB!$BOOST_UNIT_TEST_FRAMEWORK_LIB$ac_delim +AUTOTESTS_TRUE!$AUTOTESTS_TRUE$ac_delim +AUTOTESTS_FALSE!$AUTOTESTS_FALSE$ac_delim +DOXYGEN!$DOXYGEN$ac_delim +DOT!$DOT$ac_delim +DOCS_SUBDIR!$DOCS_SUBDIR$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF fi # test -n "$CONFIG_FILES" -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -20705,142 +22331,173 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out -done +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; + :H) + # + # CONFIG_HEADER + # _ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines conftest.tail + +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. + if test x"$ac_file" != x-; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac + rm -f $ac_file + mv "$tmp/config.h" $ac_file + fi + else + echo "/* $configure_input */" + cat "$ac_result" + fi + rm -f "$tmp/out12" +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. @@ -20850,18 +22507,29 @@ echo "$as_me: executing $ac_dest commands" >&6;} # each Makefile.in and add a new line on top of each file to say so. # So let's grep whole file. if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -20883,53 +22551,79 @@ echo X"$mf" | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - esac -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF + esac +done # for ac_tag + { (exit 0); exit 0; } _ACEOF diff --git a/libs/cairomm/configure.in b/libs/cairomm/configure.in index 0c985ea89a..46f9785ee3 100644 --- a/libs/cairomm/configure.in +++ b/libs/cairomm/configure.in @@ -2,8 +2,8 @@ AC_INIT(cairomm/cairomm.h) #release versioning GENERIC_MAJOR_VERSION=1 -GENERIC_MINOR_VERSION=2 -GENERIC_MICRO_VERSION=4 +GENERIC_MINOR_VERSION=4 +GENERIC_MICRO_VERSION=6 GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION AC_SUBST(GENERIC_MAJOR_VERSION) AC_SUBST(GENERIC_MINOR_VERSION) @@ -11,7 +11,7 @@ AC_SUBST(GENERIC_MICRO_VERSION) AC_SUBST(GENERIC_VERSION) #shared library versioning -GENERIC_LIBRARY_VERSION=1:0:0 +GENERIC_LIBRARY_VERSION=2:0:1 # | | | # +------+ | +---+ # | | | @@ -28,9 +28,10 @@ AC_SUBST(GENERIC_LIBRARY_VERSION) VERSION=$GENERIC_VERSION - AM_INIT_AUTOMAKE(cairomm, $GENERIC_VERSION) +AM_CONFIG_HEADER(cairomm/cairommconfig.h) + AC_PROG_CXX AC_PROG_CXXCPP AC_LANG_CPLUSPLUS @@ -52,11 +53,23 @@ esac AC_MSG_RESULT([$platform_win32]) AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) +AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") + # Ensure MSVC-compatible struct packing convention is used when # compiling for Win32 with gcc. # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while # gcc2 uses "-fnative-struct". -if test x"$platform_win32" = xyes; then +if test x"$os_win32" = xyes; then if test x"$GCC" = xyes; then msnative_struct='' AC_MSG_CHECKING([how to get MSVC-compatible struct packing]) @@ -89,8 +102,32 @@ fi AC_CHECK_HEADERS(string list map, , exit) -PKG_CHECK_MODULES(CAIROMM, cairo >= 1.2.0) +PKG_CHECK_MODULES(CAIROMM, cairo >= 1.4) +AC_ARG_ENABLE(tests, + AC_HELP_STRING([--enable-tests=yes|no], + [enable automated tests (default is no)]), + ENABLE_TESTS=$enableval, + ENABLE_TESTS=no) +if test x$CAIROMM_DEVEL = xon ; then + ENABLE_TESTS=yes +fi + +if test x$ENABLE_TESTS = xyes ; then +AX_BOOST_BASE([1.33.1]) +AX_BOOST_UNIT_TEST_FRAMEWORK +AC_MSG_NOTICE(support of automated tests enabled) +else + AC_MSG_NOTICE(disabled support of automated tests) +fi +AM_CONDITIONAL(AUTOTESTS, test x$ENABLE_TESTS = xyes) + +dnl enable compiler warnings when the CAIROMM_DEVEL environment variable is set to 'on' +if test "x$CAIROMM_DEVEL" = "xon" ; then + CXXFLAGS="$CXXFLAGS -Wall -g -Werror -Wextra" +fi + +CAIROMM_ARG_ENABLE_API_EXCEPTIONS() dnl Check whether to build the documentation directory DOCS_SUBDIR="" dnl set DOCS_SUBDIR initially blank @@ -131,6 +168,8 @@ AC_CONFIG_FILES( examples/svg-surface/Makefile examples/text-rotate/Makefile + tests/Makefile + cairomm-1.0.pc ) diff --git a/libs/cairomm/depcomp b/libs/cairomm/depcomp old mode 100644 new mode 100755 diff --git a/libs/cairomm/install-sh b/libs/cairomm/install-sh old mode 100644 new mode 100755 index d4744f0c70..4d4a9519ea --- a/libs/cairomm/install-sh +++ b/libs/cairomm/install-sh @@ -1,7 +1,8 @@ #!/bin/sh -# # install - install a program, script, or datafile -# + +scriptversion=2005-05-14.22 + # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the # following copyright and license. @@ -41,13 +42,11 @@ # from scratch. It can only install one file at a time, a restriction # shared with many OS's install programs. - # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. doit="${DOITPROG-}" - # put in absolute paths if you don't have them in your path; or use env. vars. mvprog="${MVPROG-mv}" @@ -59,211 +58,266 @@ stripprog="${STRIPPROG-strip}" rmprog="${RMPROG-rm}" mkdirprog="${MKDIRPROG-mkdir}" -transformbasename="" -transform_arg="" -instcmd="$mvprog" chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" +chowncmd= +chgrpcmd= +stripcmd= rmcmd="$rmprog -f" mvcmd="$mvprog" -src="" -dst="" -dir_arg="" +src= +dst= +dir_arg= +dstarg= +no_target_directory= -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... - -d) dir_arg=true - shift - continue;; +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. - -o) chowncmd="$chownprog $2" - shift - shift - continue;; +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; +while test -n "$1"; do + case $1 in + -c) shift + continue;; - -s) stripcmd="$stripprog" - shift - continue;; + -d) dir_arg=true + shift + continue;; - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; + --help) echo "$usage"; exit $?;; - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi + -o) chowncmd="$chownprog $2" + shift + shift + continue;; -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else + -s) stripcmd=$stripprog + shift + continue;; -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + -t) dstarg=$2 shift + shift + continue;; - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi + -T) no_target_directory=true + shift + continue;; - pathcomp="${pathcomp}/" + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 fi -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else + if test -n "$dir_arg"; then + dst=$src + src= -# If we're going to rename the final executable, determine the name now. + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi -# don't allow the sed command to completely eliminate the filename + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi -# Make a temp file name in the proper directory. + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - dsttmp=$dstdir/#inst.$$# + # Make sure that the destination directory exists. -# Move or copy the file name to the temp name + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" - $doit $instcmd $src $dsttmp && + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS - trap "rm -f ${dsttmp}" 0 && + pathcomp= -# and set any options; do chmod last to preserve setuid bits + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + else + dstfile=`basename "$dst"` -# Now rename the file to the real destination. + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 -fi && + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && -exit 0 + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/libs/cairomm/ltmain.sh b/libs/cairomm/ltmain.sh index 8fc56db8fc..2160ef7b98 100644 --- a/libs/cairomm/ltmain.sh +++ b/libs/cairomm/ltmain.sh @@ -1,8 +1,8 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,14 +43,22 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.22 Debian 1.5.22-2" -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" +VERSION="1.5.24 Debian 1.5.24-1ubuntu1" +TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -105,12 +113,14 @@ esac # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -if test "${LC_ALL+set}" = set; then - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -fi -if test "${LANG+set}" = set; then - save_LANG="$LANG"; LANG=C; export LANG -fi +for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" +done # Make sure IFS has a sensible default lt_nl=' @@ -136,6 +146,8 @@ duplicate_deps=no preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 ##################################### # Shell function definitions: @@ -196,7 +208,13 @@ func_win32_libid () if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + $SED -n -e '1,100{ + / I /{ + s,.*,import, + p + q + } + }'` case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -327,7 +345,17 @@ func_extract_archives () *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -454,11 +482,12 @@ do ;; --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + echo "\ +$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +Copyright (C) 2007 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? ;; @@ -755,9 +784,10 @@ if test -z "$show_help"; then *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; + *.[fF][09]?) xform=[fF][09]. ;; *.for) xform=for ;; *.java) xform=java ;; + *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1138,8 +1168,9 @@ EOF for arg do case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1147,12 +1178,20 @@ EOF dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - else + ;; + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - fi + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1600,7 +1639,7 @@ EOF continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -1620,10 +1659,11 @@ EOF # -m* pass through architecture-specific compiler args for GCC # -m*, -t[45]*, -txscale* pass through architecture-specific # compiler args for GCC - # -pg pass through profiling flag for GCC + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1651,9 +1691,9 @@ EOF -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. + # and Darwin in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -1712,7 +1752,7 @@ EOF continue ;; - -static) + -static | -static-libtool-libs) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2097,7 +2137,7 @@ EOF lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -2493,7 +2533,9 @@ EOF if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3189,7 +3231,7 @@ EOF # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows) + darwin|linux|osf|windows|none) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3200,9 +3242,10 @@ EOF age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 @@ -3266,7 +3309,8 @@ EOF versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3280,8 +3324,11 @@ EOF ;; irix | nonstopux) - major=`expr $current - $age + 1` - + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; @@ -3418,11 +3465,11 @@ EOF fi # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done + #for path in $notinst_path; do + # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3523,13 +3570,12 @@ EOF int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" -ne "0"; then + if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3568,9 +3614,7 @@ EOF # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3602,7 +3646,7 @@ EOF droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -3888,7 +3932,10 @@ EOF test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + case $archive_cmds in + *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; + *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; + esac else eval dep_rpath=\"$hardcode_libdir_flag_spec\" fi @@ -4247,12 +4294,14 @@ EOF reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4700,16 +4749,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` fi ;; * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ;; esac ;; @@ -4724,13 +4773,13 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4817,7 +4866,7 @@ static const void *lt_preloaded_setup() { if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` else # fast_install is set to needless relink_command= @@ -4854,7 +4903,7 @@ static const void *lt_preloaded_setup() { fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` fi # Quote $echo for shipping. @@ -5261,6 +5310,20 @@ EOF Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5403,7 +5466,7 @@ else ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" + \$echo \"\$0: cannot exec \$program \$*\" exit $EXIT_FAILURE fi else @@ -5589,7 +5652,7 @@ fi\ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5934,9 +5997,9 @@ relink_command=\"$relink_command\"" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6145,7 +6208,7 @@ relink_command=\"$relink_command\"" file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6356,8 +6419,10 @@ relink_command=\"$relink_command\"" if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE + if test ! -f "$dir/$dlname"; then + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit $EXIT_FAILURE + fi fi ;; @@ -6421,12 +6486,12 @@ relink_command=\"$relink_command\"" fi # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi + for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + fi" + done # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6783,9 +6848,9 @@ The following components of LINK-COMMAND are treated specially: -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6799,9 +6864,11 @@ The following components of LINK-COMMAND are treated specially: -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored. diff --git a/libs/cairomm/m4/ax_boost_base.m4 b/libs/cairomm/m4/ax_boost_base.m4 new file mode 100644 index 0000000000..575a51ef6b --- /dev/null +++ b/libs/cairomm/m4/ax_boost_base.m4 @@ -0,0 +1,198 @@ +##### http://autoconf-archive.cryp.to/ax_boost_base.html +# +# SYNOPSIS +# +# AX_BOOST_BASE([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# Test for the Boost C++ libraries of a particular version (or newer) +# +# If no path to the installed boost library is given the macro +# searchs under /usr, /usr/local, and /opt, and evaluates the +# $BOOST_ROOT environment variable. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) +# +# And sets: +# +# HAVE_BOOST +# +# LAST MODIFICATION +# +# 2006-12-28 +# +# COPYLEFT +# +# Copyright (c) 2006 Thomas Porschberg +# +# Copying and distribution of this file, with or without +# modification, are permitted in any medium without royalty provided +# the copyright notice and this notice are preserved. + +AC_DEFUN([AX_BOOST_BASE], +[ +AC_ARG_WITH([boost], + AS_HELP_STRING([--with-boost@<:@=DIR@:>@], [use boost (default is No) - it is possible to specify the root directory for boost (optional)]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ac_boost_path="" + else + want_boost="yes" + ac_boost_path="$withval" + fi + ], + [want_boost="yes"]) + +if test "x$want_boost" = "xyes"; then + boost_lib_version_req=ifelse([$1], ,1.20.0,$1) + boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'` + boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'` + boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$boost_lib_version_req_sub_minor" = "x" ; then + boost_lib_version_req_sub_minor="0" + fi + WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` + AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) + succeeded=no + + dnl first we check the system location for boost libraries + dnl this location ist chosen if boost libraries are installed with the --layout=system option + dnl or if you install boost with RPM + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + BOOST_CPPFLAGS="-I$ac_boost_path/include" + else + for ac_boost_path_tmp in /usr /usr/local /opt ; do + if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then + BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" + BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" + break; + fi + done + fi + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ]])],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + + + + dnl if we found no boost with system layout we search for boost libraries + dnl built and installed without the --layout=system option or for a staged(not installed) version + if test "x$succeeded" != "xyes"; then + _version=0 + if test "$ac_boost_path" != ""; then + BOOST_LDFLAGS="-L$ac_boost_path/lib" + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE" + done + fi + else + for ac_boost_path in /usr /usr/local /opt ; do + if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then + for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "$V_CHECK" = "1" ; then + _version=$_version_tmp + best_path=$ac_boost_path + fi + done + fi + done + + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + BOOST_LDFLAGS="-L$best_path/lib" + + if test "x$BOOST_ROOT" != "x"; then + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "$V_CHECK" = "1" ; then + AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" + fi + fi + fi + fi + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #if BOOST_VERSION >= $WANT_BOOST_VERSION + // Everything is okay + #else + # error Boost version is too old + #endif + ]])],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + fi + + if test "$succeeded" != "yes" ; then + if test "$_version" = "0" ; then + AC_MSG_ERROR([[We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation.]]) + else + AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) + fi + else + AC_SUBST(BOOST_CPPFLAGS) + AC_SUBST(BOOST_LDFLAGS) + AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" +fi + +]) diff --git a/libs/cairomm/m4/ax_boost_unit_test_framework.m4 b/libs/cairomm/m4/ax_boost_unit_test_framework.m4 new file mode 100644 index 0000000000..11e5d8d5a3 --- /dev/null +++ b/libs/cairomm/m4/ax_boost_unit_test_framework.m4 @@ -0,0 +1,138 @@ +##### http://autoconf-archive.cryp.to/ax_boost_unit_test_framework.html +# +# SYNOPSIS +# +# AX_BOOST_UNIT_TEST_FRAMEWORK +# +# DESCRIPTION +# +# Test for Unit_Test_Framework library from the Boost C++ libraries. +# The macro requires a preceding call to AX_BOOST_BASE. Further +# documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) +# +# And sets: +# +# HAVE_BOOST_UNIT_TEST_FRAMEWORK +# +# LAST MODIFICATION +# +# 2006-12-28 +# +# COPYLEFT +# +# Copyright (c) 2006 Thomas Porschberg +# +# Copying and distribution of this file, with or without +# modification, are permitted in any medium without royalty provided +# the copyright notice and this notice are preserved. + +AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], +[ + AC_ARG_WITH([boost-unit-test-framework], + AS_HELP_STRING([--with-boost-unit-test-framework@<:@=special-lib@:>@], + [use the Unit_Test_Framework library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-unit-test-framework=boost_unit_test_framework-gcc ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_unit_test_framework_lib="" + else + want_boost="yes" + ax_boost_user_unit_test_framework_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available, + ax_cv_boost_unit_test_framework, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[@%:@include ]], + [[using boost::unit_test::test_suite; + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]), + ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then + AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available]) + BN=boost_unit_test_framework + if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then + saved_ldflags="${LDFLAGS}" + for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \ + lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \ + $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do + LDFLAGS="${LDFLAGS} -l$ax_lib" + AC_CACHE_CHECK(Boost::UnitTestFramework library linkage, + ax_cv_boost_unit_test_framework_link, + [AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include + using boost::unit_test::test_suite; + test_suite* init_unit_test_suite( int argc, char * argv[] ) { + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); + return test; + } + ]], + [[ return 0;]])], + link_unit_test_framework="yes",link_unit_test_framework="no") + AC_LANG_POP([C++]) + ]) + LDFLAGS="${saved_ldflags}" + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) + break + fi + done + else + saved_ldflags="${LDFLAGS}" + for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do + LDFLAGS="${LDFLAGS} -l$ax_lib" + AC_CACHE_CHECK(Boost::UnitTestFramework library linkage, + ax_cv_boost_unit_test_framework_link, + [AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include + using boost::unit_test::test_suite; + test_suite* init_unit_test_suite( int argc, char * argv[] ) { + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); + return test; + } + ]], + [[ return 0;]])], + link_unit_test_framework="yes",link_unit_test_framework="no") + AC_LANG_POP([C++]) + ]) + LDFLAGS="${saved_ldflags}" + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) + break + fi + done + fi + if test "x$link_unit_test_framework" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff --git a/libs/cairomm/m4/reduced.m4 b/libs/cairomm/m4/reduced.m4 new file mode 100644 index 0000000000..5a941fc148 --- /dev/null +++ b/libs/cairomm/m4/reduced.m4 @@ -0,0 +1,20 @@ +## CAIROMM_ARG_ENABLE_API_EXCEPTIONS() +## +## Provide the --enable-api-exceptions configure argument, enabled +## by default. +## +AC_DEFUN([CAIROMM_ARG_ENABLE_API_EXCEPTIONS], +[ + AC_ARG_ENABLE([api-exceptions], + [ --enable-api-exceptions Build exceptions API. + [[default=yes]]], + [cairomm_enable_api_exceptions="$enableval"], + [cairomm_enable_api_exceptions='yes']) + + if test "x$cairomm_enable_api_exceptions" = "xyes"; then + { + AC_DEFINE([CAIROMM_EXCEPTIONS_ENABLED],[1], [Defined when the --enable-api-exceptions configure argument was given]) + } + fi +]) + diff --git a/libs/cairomm/missing b/libs/cairomm/missing old mode 100644 new mode 100755 index 22e101ab1b..894e786e16 --- a/libs/cairomm/missing +++ b/libs/cairomm/missing @@ -1,7 +1,11 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,23 +19,47 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + # In the cases where this matters, `missing' is being run in the # srcdir already. -if test -f configure.in; then +if test -f configure.ac; then configure_ac=configure.ac else configure_ac=configure.in fi +msg="missing on your system" + case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; -h|--h|--he|--hel|--help) echo "\ @@ -43,6 +71,7 @@ error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -51,13 +80,19 @@ Supported PROGRAM values: automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing $scriptversion (GNU Automake)" + exit $? ;; -*) @@ -66,10 +101,45 @@ Supported PROGRAM values: exit 1 ;; +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`$configure_ac'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -77,8 +147,8 @@ WARNING: \`$1' is missing on your system. You should only need it if autoconf) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`$configure_ac'. You might want to install the +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -86,11 +156,11 @@ WARNING: \`$1' is missing on your system. You should only need it if autoheader) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`$configure_ac'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -105,8 +175,8 @@ WARNING: \`$1' is missing on your system. You should only need it if automake*) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | @@ -114,9 +184,32 @@ WARNING: \`$1' is missing on your system. You should only need it if while read f; do touch "$f"; done ;; + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -146,7 +239,7 @@ WARNING: \`$1' is missing on your system. You should only need it if lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -167,28 +260,90 @@ WARNING: \`$1' is missing on your system. You should only need it if fi ;; + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -196,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/libs/cairomm/mkinstalldirs b/libs/cairomm/mkinstalldirs deleted file mode 100644 index 4f58503ea4..0000000000 --- a/libs/cairomm/mkinstalldirs +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ - -errstatus=0 - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/libs/cairomm/tests/Makefile.am b/libs/cairomm/tests/Makefile.am new file mode 100644 index 0000000000..366ccfee51 --- /dev/null +++ b/libs/cairomm/tests/Makefile.am @@ -0,0 +1,19 @@ +if AUTOTESTS + +# build automated 'tests' +noinst_PROGRAMS = test-context +test_context_SOURCES=test-context.cc +TESTS=test-context + +else + +#don't build anything +TESTS= + +endif + +#Where to find the header files needed by the source files: +INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ + +#The libraries that the executable needs to link against: +LIBS = $(top_builddir)/cairomm/libcairomm-1.0.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ diff --git a/libs/glibmm2/examples/child_watch/Makefile.in b/libs/cairomm/tests/Makefile.in similarity index 69% rename from libs/glibmm2/examples/child_watch/Makefile.in rename to libs/cairomm/tests/Makefile.in index 234736252f..0d386a5960 100644 --- a/libs/glibmm2/examples/child_watch/Makefile.in +++ b/libs/cairomm/tests/Makefile.in @@ -20,7 +20,7 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. +top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -36,30 +36,25 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/examples/Makefile.am_fragment -@OS_WIN32_FALSE@noinst_PROGRAMS = child_watch$(EXEEXT) -subdir = examples/child_watch +@AUTOTESTS_TRUE@noinst_PROGRAMS = test-context$(EXEEXT) +subdir = tests +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_unit_test_framework.m4 \ + $(top_srcdir)/m4/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h +CONFIG_HEADER = $(top_builddir)/cairomm/cairommconfig.h CONFIG_CLEAN_FILES = PROGRAMS = $(noinst_PROGRAMS) -am__child_watch_SOURCES_DIST = main.cc -@OS_WIN32_FALSE@am_child_watch_OBJECTS = main.$(OBJEXT) -child_watch_OBJECTS = $(am_child_watch_OBJECTS) -child_watch_LDADD = $(LDADD) -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp +am__test_context_SOURCES_DIST = test-context.cc +@AUTOTESTS_TRUE@am_test_context_OBJECTS = test-context.$(OBJEXT) +test_context_OBJECTS = $(am_test_context_OBJECTS) +test_context_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/cairomm +depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -69,8 +64,8 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(child_watch_SOURCES) -DIST_SOURCES = $(am__child_watch_SOURCES_DIST) +SOURCES = $(test_context_SOURCES) +DIST_SOURCES = $(am__test_context_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -83,7 +78,14 @@ AS = @AS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AUTOTESTS_FALSE = @AUTOTESTS_FALSE@ +AUTOTESTS_TRUE = @AUTOTESTS_TRUE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_UNIT_TEST_FRAMEWORK_LIB = @BOOST_UNIT_TEST_FRAMEWORK_LIB@ +CAIROMM_CFLAGS = @CAIROMM_CFLAGS@ +CAIROMM_LIBS = @CAIROMM_LIBS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -96,9 +98,10 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -107,34 +110,24 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GENERIC_LIBRARY_VERSION = @GENERIC_LIBRARY_VERSION@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ -LIBS = $(local_glibmm_lib) $(GLIBMM_LIBS) + +#The libraries that the executable needs to link against: +LIBS = $(top_builddir)/cairomm/libcairomm-1.0.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ @@ -147,25 +140,18 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -182,40 +168,47 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -local_glibmm_lib = $(top_builddir)/glib/glibmm/libglibmm-2.4.la -all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \ - $(GLIBMM_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) +@AUTOTESTS_TRUE@test_context_SOURCES = test-context.cc -DEFAULT_INCLUDES = -INCLUDES = -I. -I$(srcdir) $(strip $(all_includes)) -glibmm_docdir = $(datadir)/doc/glibmm-2.4 -@OS_WIN32_FALSE@child_watch_SOURCES = main.cc +#don't build anything +@AUTOTESTS_FALSE@TESTS = +@AUTOTESTS_TRUE@TESTS = test-context + +#Where to find the header files needed by the source files: +INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ all: all-am .SUFFIXES: .SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/examples/Makefile.am_fragment $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -224,9 +217,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/child_watch/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/child_watch/Makefile + $(AUTOMAKE) --gnu tests/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -240,9 +233,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh clean-noinstPROGRAMS: @@ -251,9 +244,9 @@ clean-noinstPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -child_watch$(EXEEXT): $(child_watch_OBJECTS) $(child_watch_DEPENDENCIES) - @rm -f child_watch$(EXEEXT) - $(CXXLINK) $(child_watch_LDFLAGS) $(child_watch_OBJECTS) $(child_watch_LDADD) $(LIBS) +test-context$(EXEEXT): $(test_context_OBJECTS) $(test_context_DEPENDENCIES) + @rm -f test-context$(EXEEXT) + $(CXXLINK) $(test_context_LDFLAGS) $(test_context_OBJECTS) $(test_context_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -261,7 +254,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-context.Po@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -342,8 +335,80 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../examples @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -371,6 +436,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(PROGRAMS) installdirs: @@ -419,7 +485,7 @@ info: info-am info-am: -install-data-am: install-data-local +install-data-am: install-exec-am: @@ -447,47 +513,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-info-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am uninstall-local + tags uninstall uninstall-am uninstall-info-am - -install-example-src: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(glibmm_docdir)/$(subdir) - for p in $(srcdir)/*.cc $(srcdir)/*.h; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f; \ - fi; \ - done - -uninstall-example-src: - @$(NORMAL_UNINSTALL) - for p in $(srcdir)/*.cc $(srcdir)/*.h; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f"; \ - rm -f $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f; \ - fi; \ - done - -install-data-local: install-example-src - -uninstall-local: uninstall-example-src - -.PHONY: install-example-src uninstall-example-src # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libs/cairomm/tests/test-context.cc b/libs/cairomm/tests/test-context.cc new file mode 100644 index 0000000000..9cfaec2f01 --- /dev/null +++ b/libs/cairomm/tests/test-context.cc @@ -0,0 +1,349 @@ +// vim: ts=2 sw=2 et +/* + * These tests are of limited usefulness. In fact, you might even say that + * they're not really tests at all. But I felt that it would be useful to have + * some basic usage of most functions just to verify that things compile and + * work generally + */ + +#include +#include +#include +#include +using namespace boost::unit_test; +#include + +#define CREATE_CONTEXT(varname) \ + Cairo::RefPtr surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 10, 10); \ + Cairo::RefPtr cr = Cairo::Context::create(surf); + +void +test_dashes () +{ + CREATE_CONTEXT(cr); + std::valarray dash_array(4); + dash_array[0] = 0.1; + dash_array[1] = 0.2; + dash_array[2] = 0.04; + dash_array[3] = 0.31; + cr->set_dash(dash_array, 0.54); + + std::vector get_array; + double get_offset; + cr->get_dash (get_array, get_offset); + BOOST_CHECK_EQUAL (dash_array[0], get_array[0]); + BOOST_CHECK_EQUAL (dash_array[1], get_array[1]); + BOOST_CHECK_EQUAL (dash_array[2], get_array[2]); + BOOST_CHECK_EQUAL (dash_array[3], get_array[3]); + BOOST_CHECK_EQUAL (0.54, get_offset); + + std::vector dash_vect(4); + dash_vect[0] = 0.5; + dash_vect[1] = 0.25; + dash_vect[2] = 0.93; + dash_vect[3] = 1.31; + cr->set_dash(dash_vect, 0.4); + + cr->get_dash (get_array, get_offset); + BOOST_CHECK_EQUAL (dash_vect[0], get_array[0]); + BOOST_CHECK_EQUAL (dash_vect[1], get_array[1]); + BOOST_CHECK_EQUAL (dash_vect[2], get_array[2]); + BOOST_CHECK_EQUAL (dash_vect[3], get_array[3]); + BOOST_CHECK_EQUAL (0.4, get_offset); + + cr->unset_dash (); + cr->get_dash (get_array, get_offset); + BOOST_CHECK (get_array.empty ()); +} + +void +test_save_restore () +{ + CREATE_CONTEXT(cr); + cr->set_line_width (2.3); + cr->save (); + cr->set_line_width (4.0); + BOOST_CHECK_EQUAL (4.0, cr->get_line_width ()); + cr->restore (); + BOOST_CHECK_EQUAL (2.3, cr->get_line_width ()); +} + +void +test_operator () +{ + CREATE_CONTEXT(cr); + cr->set_operator (Cairo::OPERATOR_ATOP); + BOOST_CHECK_EQUAL (Cairo::OPERATOR_ATOP, cr->get_operator ()); + cr->set_operator (Cairo::OPERATOR_CLEAR); + BOOST_CHECK_EQUAL (Cairo::OPERATOR_CLEAR, cr->get_operator ()); +} + +void +test_source () +{ + CREATE_CONTEXT(cr); + Cairo::RefPtr solid_pattern = + Cairo::SolidPattern::create_rgb (1.0, 0.5, 0.25); + Cairo::RefPtr gradient_pattern = + Cairo::LinearGradient::create (0.0, 0.0, 1.0, 1.0); + + cr->set_source (solid_pattern); + { + Cairo::RefPtr retrieved_solid = + Cairo::RefPtr::cast_dynamic(cr->get_source ()); + BOOST_REQUIRE (retrieved_solid); + double r, g, b, a; + retrieved_solid->get_rgba (r, g, b, a); + BOOST_CHECK_EQUAL (1.0, r); + BOOST_CHECK_EQUAL (0.5, g); + BOOST_CHECK_EQUAL (0.25, b); + + // now try for const objects.. + Cairo::RefPtr cr2 = cr; + Cairo::RefPtr retrieved_solid2 = + Cairo::RefPtr::cast_dynamic(cr2->get_source ()); + BOOST_REQUIRE (retrieved_solid2); + } + + cr->set_source (gradient_pattern); + { + Cairo::RefPtr retrieved_linear = + Cairo::RefPtr::cast_dynamic(cr->get_source ()); + BOOST_REQUIRE (retrieved_linear); + double x0, x1, y0, y1; + retrieved_linear->get_linear_points (x0, y0, x1, y1); + BOOST_CHECK_EQUAL (0.0, x0); + BOOST_CHECK_EQUAL (0.0, y0); + BOOST_CHECK_EQUAL (1.0, x1); + BOOST_CHECK_EQUAL (1.0, y1); + } + + cr->set_source_rgb (1.0, 0.5, 0.25); + { + Cairo::RefPtr solid = + Cairo::RefPtr::cast_dynamic(cr->get_source ()); + BOOST_REQUIRE (solid); + double rx, gx, bx, ax; + solid->get_rgba (rx, gx, bx, ax); + BOOST_CHECK_EQUAL (1.0, rx); + BOOST_CHECK_EQUAL (0.5, gx); + BOOST_CHECK_EQUAL (0.25, bx); + } + cr->set_source_rgba (0.1, 0.3, 0.5, 0.7); + { + Cairo::RefPtr solid = + Cairo::RefPtr::cast_dynamic(cr->get_source ()); + BOOST_REQUIRE (solid); + double rx, gx, bx, ax; + solid->get_rgba (rx, gx, bx, ax); + BOOST_CHECK_EQUAL (0.1, rx); + BOOST_CHECK_EQUAL (0.3, gx); + BOOST_CHECK_EQUAL (0.5, bx); + BOOST_CHECK_EQUAL (0.7, ax); + } +} + +void +test_tolerance () +{ + CREATE_CONTEXT(cr); + cr->set_tolerance (3.0); + BOOST_CHECK_EQUAL (3.0, cr->get_tolerance ()); +} + +void +test_antialias () +{ + CREATE_CONTEXT(cr); + cr->set_antialias (Cairo::ANTIALIAS_GRAY); + BOOST_CHECK_EQUAL (Cairo::ANTIALIAS_GRAY, cr->get_antialias ()); + + cr->set_antialias (Cairo::ANTIALIAS_SUBPIXEL); + BOOST_CHECK_EQUAL (Cairo::ANTIALIAS_SUBPIXEL, cr->get_antialias ()); +} + +void +test_fill_rule () +{ + CREATE_CONTEXT(cr); + cr->set_fill_rule (Cairo::FILL_RULE_EVEN_ODD); + BOOST_CHECK_EQUAL (Cairo::FILL_RULE_EVEN_ODD, cr->get_fill_rule ()); + cr->set_fill_rule (Cairo::FILL_RULE_WINDING); + BOOST_CHECK_EQUAL (Cairo::FILL_RULE_WINDING, cr->get_fill_rule ()); +} + +void +test_line_width () +{ + CREATE_CONTEXT(cr); + cr->set_line_width (1.0); + BOOST_CHECK_EQUAL (1.0, cr->get_line_width ()); + cr->set_line_width (4.0); + BOOST_CHECK_EQUAL (4.0, cr->get_line_width ()); +} + +void +test_line_cap () +{ + CREATE_CONTEXT(cr); + cr->set_line_cap (Cairo::LINE_CAP_BUTT); + BOOST_CHECK_EQUAL (Cairo::LINE_CAP_BUTT, cr->get_line_cap ()); + cr->set_line_cap (Cairo::LINE_CAP_ROUND); + BOOST_CHECK_EQUAL (Cairo::LINE_CAP_ROUND, cr->get_line_cap ()); +} + +void +test_line_join () +{ + CREATE_CONTEXT(cr); + cr->set_line_join (Cairo::LINE_JOIN_BEVEL); + BOOST_CHECK_EQUAL (Cairo::LINE_JOIN_BEVEL, cr->get_line_join ()); + cr->set_line_join (Cairo::LINE_JOIN_MITER); + BOOST_CHECK_EQUAL (Cairo::LINE_JOIN_MITER, cr->get_line_join ()); +} + +void +test_miter_limit () +{ + CREATE_CONTEXT (cr); + cr->set_miter_limit (1.3); + BOOST_CHECK_EQUAL (1.3, cr->get_miter_limit ()); + cr->set_miter_limit (4.12); + BOOST_CHECK_EQUAL (4.12, cr->get_miter_limit ()); +} + +void +test_matrix () +{ + // just excercise the functionality + CREATE_CONTEXT (cr); + Cairo::Matrix matrix; + cairo_matrix_init (&matrix, 1.0, 0.1, 0.1, 1.0, 1.5, 1.5); + cr->transform(matrix); + cairo_matrix_init (&matrix, 1.0, -0.1, -0.1, 1.0, 1.5, 1.5); + cr->set_matrix(matrix); + cr->set_identity_matrix (); + cr->get_matrix (matrix); +} + +void +test_user_device () +{ + // scale / transform a context, and then verify that user-to-device and + // device-to-user things work. + CREATE_CONTEXT (cr); + cr->scale (2.3, 2.3); + double x = 1.8, y = 1.8; + cr->user_to_device (x, y); + // x = (0.0 + x) * 2.3 => 1.8 * 2.3 = 5.29 + BOOST_CHECK_EQUAL (4.14, x); + BOOST_CHECK_EQUAL (4.14, y); + cr->device_to_user (x, y); + BOOST_CHECK_EQUAL (1.8, x); + BOOST_CHECK_EQUAL (1.8, y); + cr->translate (0.5, 0.5); + cr->user_to_device (x, y); + // x = (0.5 + x) * 2.3 => 2.3 * 2.3 = 5.29 + BOOST_CHECK_CLOSE (5.29, x, FLT_EPSILON); + BOOST_CHECK_CLOSE (5.29, y, FLT_EPSILON); +} + +void +test_draw () +{ + CREATE_CONTEXT (cr); + // just call a bunch of drawing functions to excercise them a bit. There's no + // rhyme or reason to this, don't expect it to draw anything interesting. + cr->begin_new_path (); + cr->move_to (1.0, 1.0); + cr->line_to (2.0, 2.0); + cr->curve_to (0.5, 0.5, 0.5, 0.5, 1.0, 1.0); + cr->arc (1.5, 0.5, 0.5, 0, 2 * M_PI); + cr->stroke (); + cr->arc_negative (1.5, 0.5, 0.5, 0, 2 * M_PI); + cr->rel_move_to (0.1, 0.1); + cr->rel_line_to (0.5, -0.5); + cr->rel_curve_to (0.5, 0.5, 0.5, 0.5, 1.0, 1.0); + cr->rectangle (0.0, 0.0, 1.0, 1.0); + cr->close_path (); + cr->paint (); +} + +void +test_clip () +{ + CREATE_CONTEXT (cr); + cr->rectangle (0.0, 0.0, 1.0, 1.0); + cr->clip (); + double x1, y1, x2, y2; + cr->get_clip_extents (x1, y1, x2, y2); + BOOST_CHECK (x1 == 0.0); + BOOST_CHECK (y1 == 0.0); + BOOST_CHECK (x2 == 1.0); + BOOST_CHECK (y2 == 1.0); +} + +void +test_current_point () +{ + CREATE_CONTEXT (cr); + cr->move_to (2.0, 3.0); + double x, y; + cr->get_current_point (x, y); + BOOST_CHECK (x == 2.0); + BOOST_CHECK (y == 3.0); +} + +void +test_target () +{ + Cairo::RefPtr surf = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 10, 10); \ + Cairo::RefPtr cr = Cairo::Context::create(surf); + + Cairo::RefPtr target_surface = + Cairo::RefPtr::cast_dynamic(cr->get_target ()); + Cairo::RefPtr bad_surface = + Cairo::RefPtr::cast_dynamic(cr->get_target ()); + BOOST_CHECK (target_surface); + BOOST_CHECK (!bad_surface); + + // now check for const objects... + Cairo::RefPtr cr2 = Cairo::Context::create(surf); + + Cairo::RefPtr target_surface2 = + Cairo::RefPtr::cast_dynamic(cr2->get_target ()); + Cairo::RefPtr bad_surface2 = + Cairo::RefPtr::cast_dynamic(cr2->get_target ()); + BOOST_CHECK (target_surface2); + BOOST_CHECK (!bad_surface2); + +} + +test_suite* +init_unit_test_suite(int argc, char* argv[]) +{ + // compile even with -Werror + if (argc && argv) {} + + test_suite* test= BOOST_TEST_SUITE( "Cairo::Context Tests" ); + + test->add (BOOST_TEST_CASE (&test_dashes)); + test->add (BOOST_TEST_CASE (&test_save_restore)); + test->add (BOOST_TEST_CASE (&test_operator)); + test->add (BOOST_TEST_CASE (&test_source)); + test->add (BOOST_TEST_CASE (&test_tolerance)); + test->add (BOOST_TEST_CASE (&test_antialias)); + test->add (BOOST_TEST_CASE (&test_fill_rule)); + test->add (BOOST_TEST_CASE (&test_line_width)); + test->add (BOOST_TEST_CASE (&test_line_cap)); + test->add (BOOST_TEST_CASE (&test_line_join)); + test->add (BOOST_TEST_CASE (&test_miter_limit)); + test->add (BOOST_TEST_CASE (&test_matrix)); + test->add (BOOST_TEST_CASE (&test_user_device)); + test->add (BOOST_TEST_CASE (&test_draw)); + test->add (BOOST_TEST_CASE (&test_clip)); + test->add (BOOST_TEST_CASE (&test_current_point)); + test->add (BOOST_TEST_CASE (&test_target)); + + return test; +} diff --git a/libs/flowcanvas/AUTHORS b/libs/flowcanvas/AUTHORS deleted file mode 100644 index d4d803bdf4..0000000000 --- a/libs/flowcanvas/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -Author: - -Dave Robillard - diff --git a/libs/flowcanvas/ChangeLog b/libs/flowcanvas/ChangeLog deleted file mode 100644 index c37c459862..0000000000 --- a/libs/flowcanvas/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -Changes? What changes? diff --git a/libs/flowcanvas/Doxyfile b/libs/flowcanvas/Doxyfile deleted file mode 100644 index 1e6b267b9b..0000000000 --- a/libs/flowcanvas/Doxyfile +++ /dev/null @@ -1,1153 +0,0 @@ -# Doxyfile 1.3.8 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = FlowCanvas - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.0.1 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = doc - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of source -# files, where putting all generated files in the same directory would otherwise -# cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, -# Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is used -# as the annotated text. Otherwise, the brief description is used as-is. If left -# blank, the following values are used ("$name" is automatically replaced with the -# name of the entity): "The $name class" "The $name widget" "The $name file" -# "is" "provides" "specifies" "contains" "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited -# members of a class in the documentation of that class as if those members were -# ordinary class members. Constructors, destructors and assignment operators of -# the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. - -JAVADOC_AUTOBRIEF = YES - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = NO - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = YES - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = NO - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = src flowcanvas - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp -# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm - -FILE_PATTERNS = - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories -# that are symbolic links (a Unix filesystem feature) are excluded from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. - -EXCLUDE_PATTERNS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse the -# parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. Note that this -# option is superseded by the HAVE_DOT option below. This is only a fallback. It is -# recommended to install and use dot, since it yields more powerful graphs. - -CLASS_DIAGRAMS = YES - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes that -# lay further from the root node will be omitted. Note that setting this option to -# 1 or 2 may greatly reduce the computation time needed for large code bases. Also -# note that a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). -# If 0 is used for the depth value (the default), the graph is not depth-constrained. - -MAX_DOT_GRAPH_DEPTH = 0 - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/libs/flowcanvas/NEWS b/libs/flowcanvas/NEWS deleted file mode 100644 index bc0da0a6d4..0000000000 --- a/libs/flowcanvas/NEWS +++ /dev/null @@ -1,4 +0,0 @@ -LibFlowCanvas NEWS file - -0.0.1: - * Initial release, forked out of Om and Patchage codebases diff --git a/libs/flowcanvas/README b/libs/flowcanvas/README deleted file mode 100644 index 57cd0f2605..0000000000 --- a/libs/flowcanvas/README +++ /dev/null @@ -1 +0,0 @@ -A Gtkmm/Gnomecanvasmm widget for modular dataflow environments diff --git a/libs/flowcanvas/SConscript b/libs/flowcanvas/SConscript deleted file mode 100644 index 18b061ef82..0000000000 --- a/libs/flowcanvas/SConscript +++ /dev/null @@ -1,47 +0,0 @@ -# -*- python -*- - -import os -import os.path -import glob - -Import('env final_prefix install_prefix libraries') - -flowcanvas = env.Copy() -flowcanvas.Merge ([ - libraries['sigc2'], - libraries['gtk2'], - libraries['glibmm2'], - libraries['pangomm'], - libraries['atkmm'], - libraries['gdkmm2'], - libraries['gtkmm2'], - libraries['libgnomecanvas2'], - libraries['libgnomecanvasmm'] - ]) - -# -# this defines the version number of libflowcanvas -# - -domain = 'libflowcanvas' - -flowcanvas.Append(DOMAIN=domain,MAJOR=0,MINOR=0,MICRO=1) -flowcanvas.Append(CXXFLAGS="-DFLOWCANVAS_AA") - -flowcanvas_files = Split(""" -src/Connection.cpp -src/FlowCanvas.cpp -src/Module.cpp -src/Port.cpp -""") - -libflowcanvas = flowcanvas.SharedLibrary('flowcanvas', flowcanvas_files) - -Default(libflowcanvas) - -env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libflowcanvas)) - -env.Alias('tarball', env.Distribute (env['DISTTREE'], - ['SConscript'] + - flowcanvas_files + - glob.glob('flowcanvas/*.h'))) diff --git a/libs/flowcanvas/doc/port_offsets.dia b/libs/flowcanvas/doc/port_offsets.dia deleted file mode 100644 index d50cd45fb0..0000000000 Binary files a/libs/flowcanvas/doc/port_offsets.dia and /dev/null differ diff --git a/libs/flowcanvas/flowcanvas/Connection.h b/libs/flowcanvas/flowcanvas/Connection.h deleted file mode 100644 index 9d50288a98..0000000000 --- a/libs/flowcanvas/flowcanvas/Connection.h +++ /dev/null @@ -1,72 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef CONNECTION_H -#define CONNECTION_H - -#include -#include -#include -#include -#include "Port.h" - -using std::list; - -namespace LibFlowCanvas { - -class FlowCanvas; - - -/** A connection between two ports. - * - * \ingroup FlowCanvas - */ -class Connection : public Gnome::Canvas::Bpath -{ -public: - Connection(FlowCanvas* patch_bay, Port* source_port, Port* dest_port); - virtual ~Connection(); - - void update_location(); - void disconnect(); - void hilite(bool b); - - bool selected() { return m_selected; } - void selected(bool b); - - void source_port(Port* p) { m_source_port = p; } - const Port* source_port() const { return m_source_port; } - void dest_port(Port* p) { m_dest_port = p; } - const Port* dest_port() const { return m_dest_port; } - -private: - FlowCanvas* m_patch_bay; - Port* m_source_port; - Port* m_dest_port; - int m_colour; - bool m_selected; - - //Glib::RefPtr m_path; - GnomeCanvasPathDef* m_path; -}; - -typedef list ConnectionList; - - -} // namespace LibFlowCanvas - -#endif // CONNECTION_H diff --git a/libs/flowcanvas/flowcanvas/FlowCanvas.h b/libs/flowcanvas/flowcanvas/FlowCanvas.h deleted file mode 100644 index ab6c85f410..0000000000 --- a/libs/flowcanvas/flowcanvas/FlowCanvas.h +++ /dev/null @@ -1,152 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef FLOWCANVAS_H -#define FLOWCANVAS_H - -#include -#include -#include -#include "Connection.h" -#include "Module.h" - -using std::string; -using std::list; - - -/** FlowCanvas namespace, everything is defined under this. - * - * \ingroup FlowCanvas - */ -namespace LibFlowCanvas { - -class Port; -class Module; - - -/** \defgroup FlowCanvas Canvas widget for dataflow systems. - * - * A generic dataflow widget using libgnomecanvas. It's used by Om and - * Patchage, but could be used by anyone. - */ - - -/** The canvas widget. - * - * Applications must override some virtual methods to make the widget actually - * do anything (ie connect). - * - * \ingroup FlowCanvas - */ -#ifdef FLOWCANVAS_AA -class FlowCanvas : public Gnome::Canvas::CanvasAA -#else -class FlowCanvas : public Gnome::Canvas::Canvas -#endif // FLOWCANVAS_AA -{ -public: - FlowCanvas(double width, double height); - virtual ~FlowCanvas(); - - void destroy(); - - void add_module(Module* m); - void remove_module(const string& name); - - void add_connection(const string& mod1_name, const string& port1_name, const string& mod2_name, const string& port2_name); - bool remove_connection(const string& mod1_name, const string& port1_name, const string& mod2_name, const string& port2_name); - - void add_connection(Port* port1, Port* port2); - bool remove_connection(Port* port1, Port* port2); - - Module* find_module(const string& name); - Port* find_port(const string& module_name, const string& port_name); - - void rename_module(const string& old_name, const string& new_name); - - void set_default_placement(Module* m); - - float zoom() { return m_zoom; } - void zoom(float pix_per_unit); - - double width() const { return m_width; } - double height() const { return m_height; } - - void clear_selection(); - void select_module(Module* m); - void unselect_module(Module* m); - - ModuleMap& modules() { return m_modules; } - list& selected_modules() { return m_selected_modules; } - list& selected_connections() { return m_selected_connections; } - - /** Dash applied to selected items. - * Always animating, set a rect's property_dash() to this and it - * will automagically do the rubber band thing. */ - ArtVpathDash* const select_dash() { return m_select_dash; } - - virtual bool port_event(GdkEvent* event, Port* port); - - /** Make a connection. Should be overridden by an implementation to do something. */ - virtual void connect(const Port* const port1, const Port* const port2) = 0; - - /** Disconnect two ports. Should be overridden by an implementation to do something */ - virtual void disconnect(const Port* const port1, const Port* const port2) = 0; - -protected: - ModuleMap m_modules; ///< All modules on this canvas - ConnectionList m_connections; ///< All connections on this canvas - list m_selected_modules; ///< All currently selected modules - list m_selected_connections; ///< All currently selected connections - - virtual bool canvas_event(GdkEvent* event) { return false; } - -private: - Connection* get_connection(const Port* port1, const Port* port2); - void remove_connection(Connection* c); - void selected_port(Port* p); - Port* selected_port() { return m_selected_port; } - bool are_connected(const Port* port1, const Port* port2); - Port* get_port_at(double x, double y); - - //bool scroll_drag_handler(GdkEvent* event); - virtual bool select_drag_handler(GdkEvent* event); - virtual bool connection_drag_handler(GdkEvent* event); - - void ports_joined(Port* port1, Port* port2); - bool animate_selected(); - - Port* m_selected_port; ///< Selected port (hilited red from clicking once) - Port* m_connect_port; ///< Port for which a connection is being made (if applicable) - - float m_zoom; ///< Current zoom level - double m_width; - double m_height; - - enum DragState { NOT_DRAGGING, CONNECTION, SCROLL, SELECT }; - DragState m_drag_state; - - Gnome::Canvas::Rect m_base_rect; ///< Background - - Gnome::Canvas::Rect* m_select_rect; ///< Rectangle for drag selection - ArtVpathDash* m_select_dash; ///< Animated selection dash style -}; - - -} // namespace LibFlowCanvas - -#endif // FLOWCANVAS_H diff --git a/libs/flowcanvas/flowcanvas/Module.h b/libs/flowcanvas/flowcanvas/Module.h deleted file mode 100644 index 8f4d516610..0000000000 --- a/libs/flowcanvas/flowcanvas/Module.h +++ /dev/null @@ -1,128 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef MODULE_H -#define MODULE_H - -#include -#include -#include -#include "Port.h" - -using std::string; using std::multimap; - -namespace LibFlowCanvas { - -class FlowCanvas; - - -/** A module on the canvas. - * - * \ingroup FlowCanvas - */ -class Module : public Gnome::Canvas::Group -{ -public: - Module(FlowCanvas* patch_bay, const string& name, double x=0, double y=0); - virtual ~Module(); - - inline Port* const port(const string& port_name) const; - - void add_port(Port* port, bool resize=true); - void remove_port(const string& port_name, bool resize = true); - //virtual void add_port(const string& port_name, bool is_input, int colour, bool resize = true); - - void zoom(float z); - void resize(); - - void move(double dx, double dy); - virtual void move_to(double x, double y); - - bool is_within(const Gnome::Canvas::Rect* const rect); - - virtual void load_location() {} - virtual void store_location() {} - virtual void on_double_click() {} - virtual void show_menu(GdkEventButton*) {} - - // For connection drawing - double port_connection_point_offset(Port* port); - double port_connection_points_range(); - - double width() { return m_width; } - void width(double w); - double height() { return m_height; } - void height(double h); - - void hilite(bool b); - void selected(bool b); - bool selected() const { return m_selected; } - - virtual void name(const string& n); - const string& name() const { return m_name; } - - FlowCanvas* patch_bay() const { return m_patch_bay; } - int num_ports() const { return m_ports.size(); } - int base_colour() const { return 0x1F2A3CFF; } - PortList& ports() { return m_ports; } - double border_width() const { return m_border_width; } - void border_width(double w); - - Gnome::Canvas::Rect* rect() { return &m_module_box; } - Gnome::Canvas::Text* title() { return &m_canvas_title; } - -protected: - - bool module_event(GdkEvent* event); - - double m_border_width; - double m_width; - double m_height; - string m_name; - bool m_selected; - - FlowCanvas* m_patch_bay; - PortList m_ports; - - Gnome::Canvas::Rect m_module_box; - Gnome::Canvas::Text m_canvas_title; -}; - - -typedef multimap ModuleMap; - - - -/** Find a port on this module. - * - * Profiling has shown this to be performance critical, hence the inlining. - * Making this faster would be a very good idea - better data structure? - */ -inline Port* const -Module::port(const string& port_name) const -{ - for (PortList::const_iterator i = m_ports.begin(); i != m_ports.end(); ++i) - if ((*i)->name() == port_name) - return (*i); - return NULL; -} - - - -} // namespace LibFlowCanvas - -#endif // MODULE_H diff --git a/libs/flowcanvas/flowcanvas/Port.h b/libs/flowcanvas/flowcanvas/Port.h deleted file mode 100644 index 69f2c426c3..0000000000 --- a/libs/flowcanvas/flowcanvas/Port.h +++ /dev/null @@ -1,102 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef PORT_H -#define PORT_H - -#include -#include -#include - -using std::string; using std::list; - -namespace LibFlowCanvas { - -class Connection; -class Module; - - -static const int PORT_LABEL_SIZE = 8000; // in thousandths of a point - - -/** A port on a module on the canvas. - * - * This is a group that contains both the label and rectangle for a port. - * - * \ingroup FlowCanvas - */ -class Port : public Gnome::Canvas::Group -{ -public: - Port(Module* module, const string& name, bool is_input, int colour); - virtual ~Port() {}; - - void add_connection(Connection* c) { m_connections.push_back(c); } - void remove_connection(Connection* c); - void move_connections(); - void raise_connections(); - void disconnect_all(); - - Gnome::Art::Point connection_coords(); - - void hilite(bool b); - void zoom(float z); - - void popup_menu(guint button, guint32 activate_time) { - m_menu.popup(button, activate_time); - } - - Module* module() const { return m_module; } - list& connections() { return m_connections; } - Gnome::Canvas::Rect* rect() { return &m_rect; } - Gnome::Canvas::Text* label() { return &m_label; } - bool is_input() const { return m_is_input; } - bool is_output() const { return !m_is_input; } - int colour() const { return m_colour; } - double border_width() const { return m_border_width; } - void border_width(double w); - - const string& name() const { return m_name; } - virtual void name(const string& n); - - double width() const { return m_width; } - void width(double w); - - double height() const { return m_height; } - -protected: - Module* m_module; - string m_name; - bool m_is_input; - double m_width; - double m_height; - double m_border_width; - int m_colour; - - list m_connections; // needed for dragging - - Gnome::Canvas::Text m_label; - Gnome::Canvas::Rect m_rect; - Gtk::Menu m_menu; -}; - - -typedef list PortList; - -} // namespace LibFlowCanvas - -#endif // PORT_H diff --git a/libs/flowcanvas/src/Connection.cpp b/libs/flowcanvas/src/Connection.cpp deleted file mode 100644 index d792545a05..0000000000 --- a/libs/flowcanvas/src/Connection.cpp +++ /dev/null @@ -1,679 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "flowcanvas/Connection.h" -#include -#include -#include -#include "flowcanvas/FlowCanvas.h" - -// FIXME: remove -#include -using std::cerr; using std::endl; - -namespace LibFlowCanvas { - - -Connection::Connection(FlowCanvas* patch_bay, Port* source_port, Port* dest_port) -: Gnome::Canvas::Bpath(*patch_bay->root()), - m_patch_bay(patch_bay), - m_source_port(source_port), - m_dest_port(dest_port), - m_selected(false), -// m_path(Gnome::Canvas::PathDef::create()) - m_path(gnome_canvas_path_def_new()) -{ - assert(m_source_port->is_output()); - assert(m_dest_port->is_input()); - - m_colour = m_source_port->colour() + 0x44444400; - property_width_units() = 1.0; - property_outline_color_rgba() = m_colour; - property_cap_style() = (Gdk::CapStyle)GDK_CAP_ROUND; - - update_location(); -} - - -Connection::~Connection() -{ - if (m_selected) { - for (list::iterator c = m_patch_bay->selected_connections().begin(); - c != m_patch_bay->selected_connections().end(); ++c) - { - if ((*c) == this) { - m_patch_bay->selected_connections().erase(c); - break; - } - } - } -} - - -#undef MIN -#define MIN(x,y) (((x) < (y)) ? (x) : (y)) - -#undef MAX -#define MAX(x,y) (((x) > (y)) ? (x) : (y)) - -#if 0 -/** Updates the connection's location to match it's source/dest ports. - * - * This is used when modules are dragged, to keep the connections attached - * to their ports. - * - * You are not expected to understand this. - */ -void -Connection::update_location() -{ - const double src_x = m_source_port->connection_coords().get_x(); - const double src_y = m_source_port->connection_coords().get_y(); - const double dst_x = m_dest_port->connection_coords().get_x(); - const double dst_y = m_dest_port->connection_coords().get_y(); - - const double src_mod_x = m_source_port->module()->property_x(); - const double src_mod_y = m_source_port->module()->property_y(); - const double src_mod_w = m_source_port->module()->width(); - const double src_mod_h = m_source_port->module()->height(); - const double dst_mod_x = m_dest_port->module()->property_x(); - const double dst_mod_y = m_dest_port->module()->property_y(); - const double dst_mod_w = m_dest_port->module()->width(); - const double dst_mod_h = m_dest_port->module()->height(); - - // Y Modifier (-1 if src module is below dst module) - double y_mod = (src_y < dst_y) ? 1.0 : -1.0; - - // Added in various places to keep things parallel - /*double src_port_offset = src_y - src_mod_y - src_title_h; - double dst_port_offset = dst_y - dst_mod_y - dst_title_h; - if (y_mod < 0.0) { - src_port_offset = src_mod_y + src_mod_h - src_y; - dst_port_offset = dst_mod_y + dst_mod_h - dst_y; - }*/ - double src_port_offset = m_source_port->module()->port_connection_point_offset(m_source_port); - double src_offset_range = m_source_port->module()->port_connection_points_range(); - double dst_port_offset = m_dest_port->module()->port_connection_point_offset(m_dest_port); - double dst_offset_range = m_dest_port->module()->port_connection_points_range(); - - /* - double smallest_offset = (src_port_offset < dst_port_offset) - ? src_port_offset : dst_port_offset; - - double smallest_offset_range = (src_port_offset < dst_port_offset) - ? m_source_port->module()->port_connection_points_range() - : m_dest_port->module()->port_connection_points_range(); - */ - double smallest_offset = (src_offset_range < dst_offset_range) - ? src_port_offset : dst_port_offset; - - double smallest_offset_range = (src_offset_range < dst_offset_range) - ? m_source_port->module()->port_connection_points_range() - : m_dest_port->module()->port_connection_points_range(); - - //double largest_offset_range = (src_offset_range > dst_offset_range) - // ? m_source_port->module()->port_connection_points_range() - // : m_dest_port->module()->port_connection_points_range(); - - double x_dist = fabs(dst_x - src_x); - double y_dist = fabs(dst_y - src_y); - - // Vertical distance between modules - double y_mod_dist = dst_mod_y - src_mod_y - src_mod_h; - if (dst_y < src_y) - y_mod_dist = src_mod_y - dst_mod_y - dst_mod_h; - if (y_mod_dist < 1.0) - y_mod_dist = 1.0; - - // Horizontal distance between modules - double x_mod_dist = dst_mod_x - src_mod_x - src_mod_w; - if (src_x > dst_x + src_mod_w) - x_mod_dist = src_mod_x - dst_mod_x - dst_mod_w; - if (x_mod_dist < 1.0) - x_mod_dist = 1.0; - - double tallest_mod_h = m_source_port->module()->height(); - if (m_dest_port->module()->height() > tallest_mod_h) - tallest_mod_h = m_dest_port->module()->height(); - - double src_x1, src_y1, src_x2, src_y2, join_x, join_y; // Path 1 - double dst_x2, dst_y2, dst_x1, dst_y1; // Path 2 - - src_x1 = src_y1 = src_x2 = src_y2 = join_x = join_y = dst_x2 = dst_y2 = dst_x1 = dst_y1 = 0.0; - - static const double join_range = 15.0; - - double src_offset = (src_y < dst_y) - ? src_port_offset : src_offset_range - src_port_offset; - double dst_offset = (src_y < dst_y) - ? dst_port_offset : dst_offset_range - dst_port_offset; - - - // Wrap around connections - if (dst_x < src_x && y_mod_dist < join_range*3.0) { - - static const double module_padding = 20.0; - - // FIXME: completely different meanings in this case than the normal case - // (this one is better though) - smallest_offset = (src_offset_range < dst_offset_range) - ? src_offset : dst_offset; - - // Limit straight out distance - if (x_dist > 60.0) - x_dist = 60.0; - if (x_dist < 80.0 && y_dist > 40.0) - x_dist = 80.0; - - // Calculate join point - join_x = dst_mod_x + dst_mod_w + x_mod_dist/2.0; - join_y = (src_y < dst_y) - ? MIN(src_mod_y, dst_mod_y) - : MAX(src_mod_y + src_mod_h, dst_mod_y + dst_mod_h); - join_y -= (smallest_offset/smallest_offset_range*join_range + module_padding) * y_mod; - - if (join_x > src_mod_x) - join_x = src_mod_x; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + x_dist/5.0 + src_offset/src_offset_range*join_range; - src_y1 = src_y - (x_dist/3.0 + src_offset) * y_mod; - src_x2 = src_x + x_dist/3.0 + src_offset/src_offset_range*join_range; - src_y2 = join_y; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = MIN(dst_x, src_mod_x) - x_dist/5.0 - dst_offset/dst_offset_range*join_range; - dst_y1 = MIN(dst_y, src_mod_y + src_mod_h) - (x_dist/3.0 + dst_offset) * y_mod; - dst_x2 = MIN(dst_x, src_mod_x) - x_dist/3.0 - dst_offset/dst_offset_range*join_range; - dst_y2 = join_y; - - - // Curve through connections and normal (left->right) connections - // (These two cases are continuous) - } else { - /* The trick with this one is to define each curve's points exclusively in terms - * of the join point (ie nothing about the other module), and choose the join point - * cleverly */ - - // Calculate join point - double ratio = (x_dist - y_dist) / (y_dist + x_dist); - join_x = (src_x + dst_x)/2.0; - join_y = (src_y + dst_y)/2.0; - - // Vertical centre point between the modules - join_y = (src_y < dst_y) - ? (dst_mod_y - (dst_mod_y - (src_mod_y + src_mod_h)) / 2.0) - : (src_mod_y - (src_mod_y - (dst_mod_y + dst_mod_h)) / 2.0); - - join_y -= (smallest_offset / smallest_offset_range * join_range) - join_range/2.0; - - // Interpolate between (src_x < dst_x) case and (src_y == dst_y) case - if (src_x < dst_x && x_dist > y_dist) { - join_y *= (1.0-ratio); - join_y += (src_y + dst_y)/2.0 * ratio; - } - - if (src_x < dst_x) { - join_y += ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)); - join_x -= ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)) * y_mod; - } - - //cerr << "ratio: " << ratio << endl; - - // Curve through connections - if (dst_x < src_x) { - double src_x_offset = fabs(src_x - join_x)/8.0 + src_offset_range - src_offset/src_offset_range*join_range; - double dst_x_offset = fabs(dst_x - join_x)/8.0 + dst_offset_range + dst_offset/dst_offset_range*join_range; - double src_y_offset = fabs(src_y - join_y)/4.0 + src_offset/src_offset_range*(src_offset_range+join_range)/2.0; - double dst_y_offset = fabs(dst_y - join_y)/2.0 + (dst_offset_range-dst_offset)/dst_offset_range*(dst_offset_range+join_range)/2.0; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + src_x_offset; - src_y1 = join_y - src_y_offset * y_mod; - src_x2 = src_x + src_x_offset; - src_y2 = join_y; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = dst_x - dst_x_offset; - dst_y1 = join_y + dst_y_offset * y_mod; - dst_x2 = dst_x - dst_x_offset; - dst_y2 = join_y; - - // Normal connections - } else { - double src_x_offset = fabs(src_x - join_x)/8.0 + src_offset_range - src_offset/src_offset_range*join_range; - double dst_x_offset = fabs(dst_x - join_x)/8.0 + dst_offset_range + dst_offset/dst_offset_range*join_range; - double src_y_offset = fabs(src_y - join_y)/4.0 + src_offset/src_offset_range*(src_offset_range+join_range)/2.0; - double dst_y_offset = fabs(dst_y - join_y)/2.0 + (dst_offset_range-dst_offset)/dst_offset_range*(dst_offset_range+join_range)/2.0; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + src_x_offset; - // Interpolate from curve through case - if (x_dist < y_dist) { - // Smooth transition from (src_y) to (join_y - src_y_offset * y_mod) - src_y1 = (src_y * (1.0-fabs(ratio))) + ((join_y - src_y_offset * y_mod) * -ratio); - // Smooth transition from (join_x + src_offset_range/4.0 * -ratio) to (src_x + src_x_offset) - src_x2 = (join_x + src_offset_range/4.0 * -ratio)*(1.0-fabs(ratio)) + (src_x + src_x_offset)*-ratio; - } else { - src_y1 = src_y; - src_x2 = join_x + src_offset_range/4.0 * -ratio; - } - src_y2 = join_y - src_y_offset*(1.0-fabs(ratio)) * y_mod; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = dst_x - dst_x_offset; - dst_y1 = dst_y; - // Interpolate from curve through case - if (x_dist < y_dist) { - // Smooth transition from (dst_y) to (join_y - dst_y_offset * y_mod) - dst_y1 = (dst_y * (1.0-fabs(ratio))) + ((join_y + dst_y_offset * y_mod) * -ratio); - // Smooth transition from (join_x + dst_offset_range/4.0 * -ratio) to (dst_x + dst_x_offset) - dst_x2 = (join_x - dst_offset_range/4.0 * -ratio)*(1.0-fabs(ratio)) + (dst_x - dst_x_offset)*-ratio; - } else { - dst_y1 = dst_y; - dst_x2 = join_x - dst_offset_range/4.0 * -ratio; - } - dst_y2 = join_y + dst_y_offset*(1.0-fabs(ratio)) * y_mod; - } - /* - } else { - double src_x_offset = fabs(src_x - join_x)/4.0 + src_offset_range*2.0 - src_offset; - double dst_x_offset = fabs(dst_x - join_x)/4.0 + dst_offset + dst_offset_range; - double y_offset = fabs(join_y - src_y)/2.0; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + src_x_offset/2.0; - src_y1 = src_y; - if (x_dist < y_dist) - src_x2 = join_x + src_x_offset * -ratio; - else - src_x2 = join_x + src_offset_range/4.0 * -ratio; - src_y2 = join_y - y_offset*(1.0-fabs(ratio)) * y_mod; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = dst_x - dst_x_offset/2.0; - dst_y1 = dst_y; - if (x_dist < y_dist) - dst_x2 = join_x - dst_x_offset * -ratio; - else - dst_x2 = join_x - dst_x_offset/4.0 * -ratio; - dst_y2 = join_y + y_offset*(1.0-fabs(ratio)) * y_mod; - }*/ - } - - /* - cerr << "src_x1: " << src_x1 << endl; - cerr << "src_y1: " << src_y1 << endl; - cerr << "src_x2: " << src_x2 << endl; - cerr << "src_y2: " << src_x2 << endl; - cerr << "join_x: " << join_x << endl; - cerr << "join_y: " << join_y << endl; - cerr << "dst_x1: " << dst_x1 << endl; - cerr << "dst_y1: " << dst_y1 << endl; - cerr << "dst_x2: " << dst_x2 << endl; - cerr << "dst_y2: " << dst_x2 << endl << endl; - */ - - m_path->reset(); - - //m_path->moveto(0,0); - - - m_path->moveto(src_x, src_y); - //m_path->lineto(join_x, join_y); - m_path->curveto(src_x1, src_y1, src_x2, src_y2, join_x, join_y); - m_path->curveto(dst_x2, dst_y2, dst_x1, dst_y1, dst_x, dst_y); - set_bpath(m_path); -} -#endif - - -/** Updates the path of the connection to match it's ports if they've moved. - */ -void -Connection::update_location() -{ - const double src_x = m_source_port->connection_coords().get_x(); - const double src_y = m_source_port->connection_coords().get_y(); - const double dst_x = m_dest_port->connection_coords().get_x(); - const double dst_y = m_dest_port->connection_coords().get_y(); - - const double src_mod_x = m_source_port->module()->property_x(); - const double src_mod_y = m_source_port->module()->property_y(); - const double src_mod_w = m_source_port->module()->width(); - const double src_mod_h = m_source_port->module()->height(); - const double dst_mod_x = m_dest_port->module()->property_x(); - const double dst_mod_y = m_dest_port->module()->property_y(); - const double dst_mod_w = m_dest_port->module()->width(); - const double dst_mod_h = m_dest_port->module()->height(); - - // Vertical distance between modules - double y_mod_dist = dst_mod_y - src_mod_y - src_mod_h; - if (dst_y < src_y) - y_mod_dist = src_mod_y - dst_mod_y - dst_mod_h; - if (y_mod_dist < 1.0) - y_mod_dist = 1.0; - - // Horizontal distance between modules - double x_mod_dist = dst_mod_x - src_mod_x - src_mod_w; - if (src_x > dst_x + src_mod_w) - x_mod_dist = src_mod_x - dst_mod_x - dst_mod_w; - if (x_mod_dist < 1.0) - x_mod_dist = 1.0; - - // Y Modifier (-1 if src module is below dst module) - double y_mod = (src_y < dst_y) ? 1.0 : -1.0; - - double x_dist = fabsl(src_x - dst_x); - double y_dist = fabsl(src_y - dst_y); - - double src_port_offset = m_source_port->module()->port_connection_point_offset(m_source_port); - double src_offset_range = m_source_port->module()->port_connection_points_range(); - double dst_port_offset = m_dest_port->module()->port_connection_point_offset(m_dest_port); - double dst_offset_range = m_dest_port->module()->port_connection_points_range(); - - double smallest_offset = (src_offset_range < dst_offset_range) - ? src_port_offset : dst_port_offset; - - double smallest_offset_range = (src_offset_range < dst_offset_range) - ? m_source_port->module()->port_connection_points_range() - : m_dest_port->module()->port_connection_points_range(); - - double tallest_module_height = m_source_port->module()->height(); - if (m_dest_port->module()->height() > tallest_module_height) - tallest_module_height = m_dest_port->module()->height(); - - double src_x1, src_y1, src_x2, src_y2, join_x, join_y; // Path 1 - double dst_x2, dst_y2, dst_x1, dst_y1; // Path 2 - src_x1 = src_y1 = src_x2 = src_y2 = join_x = join_y = dst_x2 = dst_y2 = dst_x1 = dst_y1 = 0.0; - - double join_range = 20.0; - - double src_offset = (src_y < dst_y) - ? src_port_offset : src_offset_range - src_port_offset; - double dst_offset = (src_y < dst_y) - ? dst_port_offset : dst_offset_range - dst_port_offset; - - // Wrap around connections - if ((src_x > dst_x) - && y_mod_dist < join_range*3.0 - && ((dst_x > src_mod_x+src_mod_w+join_range*2.0) || src_x > dst_x) - && (! ((src_mod_y + src_mod_h < dst_mod_y - join_range*3.0) || (dst_mod_y + dst_mod_h < src_mod_h - join_range*3.0)))) { - //|| (dst_x < src_x)) { - - static const double module_padding = 20.0; - - // FIXME: completely different meanings in this case than the normal case - // (this one is better though) - smallest_offset = (src_offset_range < dst_offset_range) - ? src_offset : dst_offset; - - // Limit straight out distance - if (x_dist > 60.0) - x_dist = 60.0; - if (x_dist < 80.0 && y_dist > 40.0) - x_dist = 80.0; - - // Calculate join point - join_x = dst_mod_x + dst_mod_w + x_mod_dist/2.0; - join_y = (src_y < dst_y) - ? MIN(src_mod_y, dst_mod_y) - : MAX(src_mod_y + src_mod_h, dst_mod_y + dst_mod_h); - join_y -= (smallest_offset/smallest_offset_range*join_range + module_padding) * y_mod; - - if (join_x > src_mod_x) - join_x = src_mod_x; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + x_dist/5.0 + src_offset/src_offset_range*join_range; - src_y1 = src_y - (x_dist/3.0 + src_offset) * y_mod; - src_x2 = src_x + x_dist/3.0 + src_offset/src_offset_range*join_range; - src_y2 = join_y; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = MIN(dst_x, src_mod_x) - x_dist/5.0 - dst_offset/dst_offset_range*join_range; - dst_y1 = MIN(dst_y, src_mod_y + src_mod_h) - (x_dist/3.0 + dst_offset) * y_mod; - dst_x2 = MIN(dst_x, src_mod_x) - x_dist/3.0 - dst_offset/dst_offset_range*join_range; - dst_y2 = join_y; - - - // Curve through connections - } else if (dst_x < src_x) { - - join_range = MIN(join_range, smallest_offset_range); - - // Calculate join point - double ratio = (x_dist - y_dist) / (y_dist + x_dist); - join_x = (src_x + dst_x)/2.0; - join_y = (src_y + dst_y)/2.0; - - // Vertical centre point between the modules - join_y = (src_y < dst_y) - ? (dst_mod_y - (dst_mod_y - (src_mod_y + src_mod_h)) / 2.0) - : (src_mod_y - (src_mod_y - (dst_mod_y + dst_mod_h)) / 2.0); - - join_y -= (smallest_offset / smallest_offset_range * join_range) - join_range/2.0; - - // Interpolate between (src_x < dst_x) case and (src_y == dst_y) case - if (src_x < dst_x && x_dist > y_dist) { - join_y *= (1.0-ratio); - join_y += (src_y + dst_y)/2.0 * ratio; - } - - if (src_x < dst_x) { - join_y += ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)); - join_x -= ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)) * y_mod; - } - - //cerr << "ratio: " << ratio << endl; - - double src_x_offset = fabs(src_x - join_x)/8.0 + MAX(src_offset_range,join_range) - src_offset/src_offset_range*join_range; - double dst_x_offset = fabs(dst_x - join_x)/8.0 + MAX(dst_offset_range,join_range) + dst_offset/dst_offset_range*join_range; - double src_y_offset = fabs(src_y - join_y)/4.0 + src_offset/src_offset_range*(src_offset_range+join_range)/2.0; - double dst_y_offset = fabs(dst_y - join_y)/4.0 + (dst_offset_range-dst_offset)/dst_offset_range*(dst_offset_range+join_range)/2.0; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + src_x_offset; - src_y1 = join_y - src_y_offset * y_mod; - src_x2 = src_x + src_x_offset; - src_y2 = join_y; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = dst_x - dst_x_offset; - dst_y1 = join_y + dst_y_offset * y_mod; - dst_x2 = dst_x - dst_x_offset; - dst_y2 = join_y; - - - // In between curve through and normal connections -/* } else if (x_dist < y_dist && src_mod_y + src_mod_h < dst_mod_y) { - // Calculate join point - double ratio = (x_dist - y_dist) / (y_dist + x_dist); - join_x = (src_x + dst_x)/2.0; - join_y = (src_y + dst_y)/2.0; - - // Vertical centre point between the modules - join_y = (src_y < dst_y) - ? (dst_mod_y - (dst_mod_y - (src_mod_y + src_mod_h)) / 2.0) - : (src_mod_y - (src_mod_y - (dst_mod_y + dst_mod_h)) / 2.0); - - join_y -= (smallest_offset / smallest_offset_range * join_range) - join_range/2.0; - - // Interpolate between (src_x < dst_x) case and (src_y == dst_y) case - if (src_x < dst_x && x_dist > y_dist) { - join_y *= (1.0-ratio); - join_y += (src_y + dst_y)/2.0 * ratio; - } - - if (src_x < dst_x) { - join_y += ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)); - join_x -= ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)) * y_mod; - } - double src_x_offset = fabs(src_x - join_x)/8.0 + src_offset_range - src_offset/src_offset_range*join_range; - double dst_x_offset = fabs(dst_x - join_x)/8.0 + dst_offset_range + dst_offset/dst_offset_range*join_range; - double src_y_offset = fabs(src_y - join_y)/4.0 + src_offset/src_offset_range*(src_offset_range+join_range)/2.0; - double dst_y_offset = fabs(dst_y - join_y)/2.0 + (dst_offset_range-dst_offset)/dst_offset_range*(dst_offset_range+join_range)/2.0; - - // Path 1 (src_x, src_y) -> (join_x, join_y) - src_x1 = src_x + src_x_offset; - // Interpolate from curve through case - if (x_dist < y_dist) { - // Smooth transition from (src_y) to (join_y - src_y_offset * y_mod) - src_y1 = (src_y * (1.0-fabs(ratio))) + ((join_y - src_y_offset * y_mod) * -ratio); - // Smooth transition from (join_x + src_offset_range/4.0 * -ratio) to (src_x + src_x_offset) - src_x2 = (join_x + src_offset_range/4.0 * -ratio)*(1.0-fabs(ratio)) + (src_x + src_x_offset)*-ratio; - } else { - src_y1 = src_y; - src_x2 = join_x + src_offset_range/4.0 * -ratio; - } - src_y2 = join_y - src_y_offset*(1.0-fabs(ratio)) * y_mod; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - dst_x1 = dst_x - dst_x_offset; - dst_y1 = dst_y; - // Interpolate from curve through case - if (x_dist < y_dist) { - // Smooth transition from (dst_y) to (join_y - dst_y_offset * y_mod) - dst_y1 = (dst_y * (1.0-fabs(ratio))) + ((join_y + dst_y_offset * y_mod) * -ratio); - // Smooth transition from (join_x + dst_offset_range/4.0 * -ratio) to (dst_x + dst_x_offset) - dst_x2 = (join_x - dst_offset_range/4.0 * -ratio)*(1.0-fabs(ratio)) + (dst_x - dst_x_offset)*-ratio; - } else { - dst_y1 = dst_y; - dst_x2 = join_x - dst_offset_range/4.0 * -ratio; - } - dst_y2 = join_y + dst_y_offset*(1.0-fabs(ratio)) * y_mod; -*/ - - // "Normal" connections - } else { - - join_x = (src_x + dst_x)/2.0; - join_y = (src_y + dst_y)/2.0; -#if 0 - join_range = MIN(join_range, x_dist/2.0); - - - - /************ Find join point **************/ - - //const double join_range = 15.0; - //const double join_range = MIN(smallest_offset_range, x_dist/2.0); - //const double join_range = MIN(30.0, x_dist/2.0); - - // Calculate join point - double ratio = (x_dist - y_dist) / (y_dist + x_dist); - - cerr << "ratio: " << ratio << endl; - - /* if (MAX(x_dist, y_dist) > smallest_offset_range * 2.0) { - // Vertical centre point between the modules - join_y = (src_y < dst_y) - ? (dst_mod_y - (dst_mod_y - (src_mod_y + src_mod_h)) / 2.0) - : (src_mod_y - (src_mod_y - (dst_mod_y + dst_mod_h)) / 2.0); - - join_y -= (smallest_offset / smallest_offset_range * join_range) - join_range/2.0; - - // Interpolate between (src_x < dst_x) case and (src_y == dst_y) case - if (src_x < dst_x && x_dist > y_dist) { - join_y *= (1.0-ratio); - join_y += (src_y + dst_y)/2.0 * ratio; - } - }*/ - - if (src_x < dst_x) { - // join_y += ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)); - join_x -= ((smallest_offset/smallest_offset_range)) * join_range * (1.0-fabs(ratio)) * y_mod; - join_x += join_range/2.0 * (1.0-fabs(ratio)); // center - } -#endif - - /*************************************************/ - - - // Path 1 (src_x, src_y) -> (join_x, join_y) - // Control point 1 - src_x1 = src_x + fabs(join_x - src_x) / 2.0; - src_y1 = src_y; - // Control point 2 - src_x2 = join_x - fabs(join_x - src_x) / 4.0; - src_y2 = join_y - fabs(join_y - src_y) / 2.0 * y_mod; - - // Path 2, (join_x, join_y) -> (dst_x, dst_y) - // Control point 1 - dst_x1 = dst_x - fabs(join_x - dst_x) / 2.0; - dst_y1 = dst_y; - // Control point 2 - dst_x2 = join_x + fabs(join_x - dst_x) / 4.0; - dst_y2 = join_y + fabs(join_y - dst_y) / 2.0 * y_mod; - } - - // This was broken in libgnomecanvasmm with GTK 2.8. Nice work, guys. - /* - m_path->reset(); - m_path->moveto(src_x, src_y); - m_path->curveto(src_x1, src_y1, src_x2, src_y2, join_x, join_y); - m_path->curveto(dst_x2, dst_y2, dst_x1, dst_y1, dst_x, dst_y); - set_bpath(m_path); - */ - - // Work around it w/ the C API - gnome_canvas_path_def_reset(m_path); - gnome_canvas_path_def_moveto(m_path, src_x, src_y); - gnome_canvas_path_def_curveto(m_path, src_x1, src_y1, src_x2, src_y2, join_x, join_y); - gnome_canvas_path_def_curveto(m_path, dst_x2, dst_y2, dst_x1, dst_y1, dst_x, dst_y); - - GnomeCanvasBpath* c_obj = gobj(); - gnome_canvas_item_set(GNOME_CANVAS_ITEM(c_obj), "bpath", m_path, NULL); -} - - -/** Removes the reference to this connection contained in the ports. - * - * Must be called before destroying a connection. - */ -void -Connection::disconnect() -{ - m_source_port->remove_connection(this); - m_dest_port->remove_connection(this); - m_source_port = NULL; - m_dest_port = NULL; -} - - -void -Connection::hilite(bool b) -{ - if (b) - property_outline_color_rgba() = 0xFF0000FF; - else - property_outline_color_rgba() = m_colour; -} - - -void -Connection::selected(bool selected) -{ - m_selected = selected; - if (selected) - property_dash() = m_patch_bay->select_dash(); - else - property_dash() = NULL; -} - - -} // namespace LibFlowCanvas - diff --git a/libs/flowcanvas/src/FlowCanvas.cpp b/libs/flowcanvas/src/FlowCanvas.cpp deleted file mode 100644 index 0410450a71..0000000000 --- a/libs/flowcanvas/src/FlowCanvas.cpp +++ /dev/null @@ -1,884 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "flowcanvas/FlowCanvas.h" -#include -#include -#include -#include -#include "flowcanvas/Port.h" -#include "flowcanvas/Module.h" - -using std::cerr; using std::cout; using std::endl; - -namespace LibFlowCanvas { - - -FlowCanvas::FlowCanvas(double width, double height) -: m_selected_port(NULL), - m_connect_port(NULL), - m_zoom(1.0), - m_width(width), - m_height(height), - m_drag_state(NOT_DRAGGING), - m_base_rect(*root(), 0, 0, width, height), - m_select_rect(NULL), - m_select_dash(NULL) -{ - set_scroll_region(0.0, 0.0, width, height); - set_center_scroll_region(true); - - m_base_rect.property_fill_color_rgba() = 0x000000FF; - m_base_rect.show(); - //m_base_rect.signal_event().connect(sigc::mem_fun(this, &FlowCanvas::scroll_drag_handler)); - m_base_rect.signal_event().connect(sigc::mem_fun(this, &FlowCanvas::select_drag_handler)); - m_base_rect.signal_event().connect(sigc::mem_fun(this, &FlowCanvas::connection_drag_handler)); - m_base_rect.signal_event().connect(sigc::mem_fun(this, &FlowCanvas::canvas_event)); - - set_dither(Gdk::RGB_DITHER_NORMAL); // NONE or NORMAL or MAX - - // Dash style for selected modules and selection box - m_select_dash = new ArtVpathDash(); - m_select_dash->n_dash = 2; - m_select_dash->dash = art_new(double, 2); - m_select_dash->dash[0] = 5; - m_select_dash->dash[1] = 5; - - Glib::signal_timeout().connect( - sigc::mem_fun(this, &FlowCanvas::animate_selected), 150); -} - - -FlowCanvas::~FlowCanvas() -{ - destroy(); -} - - -void -FlowCanvas::zoom(float pix_per_unit) -{ - // Round to .25 - m_zoom = static_cast(pix_per_unit*4) / 4.0; - if (m_zoom < 0.25) - m_zoom = 0.25; - - set_pixels_per_unit(m_zoom); - - for (ModuleMap::iterator m = m_modules.begin(); m != m_modules.end(); ++m) - (*m).second->zoom(m_zoom); -} - - -void -FlowCanvas::clear_selection() -{ - for (list::iterator m = m_selected_modules.begin(); m != m_selected_modules.end(); ++m) - (*m)->selected(false); - - for (list::iterator c = m_selected_connections.begin(); c != m_selected_connections.end(); ++c) - (*c)->selected(false); - - m_selected_modules.clear(); - m_selected_connections.clear(); -} - - -/** Add a module to the current selection, and automagically select any connections - * between selected modules */ -void -FlowCanvas::select_module(Module* m) -{ - assert(! m->selected()); - - m_selected_modules.push_back(m); - - Connection* c; - for (ConnectionList::iterator i = m_connections.begin(); i != m_connections.end(); ++i) { - c = (*i); - if ( !c->selected()) { - if (c->source_port()->module() == m && c->dest_port()->module()->selected()) { - c->selected(true); - m_selected_connections.push_back(c); - } else if (c->dest_port()->module() == m && c->source_port()->module()->selected()) { - c->selected(true); - m_selected_connections.push_back(c); - } - } - } - - m->selected(true); -} - - -void -FlowCanvas::unselect_module(Module* m) -{ - assert(m->selected()); - - // Remove any connections that aren't selected anymore because this module isn't - Connection* c; - for (ConnectionList::iterator i = m_selected_connections.begin(); i != m_selected_connections.end();) { - c = (*i); - if (c->selected() - && ((c->source_port()->module() == m && c->dest_port()->module()->selected()) - || c->dest_port()->module() == m && c->source_port()->module()->selected())) - { - c->selected(false); - i = m_selected_connections.erase(i); - } else { - ++i; - } - } - - // Remove the module - for (list::iterator i = m_selected_modules.begin(); i != m_selected_modules.end(); ++i) { - if ((*i) == m) { - m_selected_modules.erase(i); - break; - } - } - - m->selected(false); -} - - -/** Removes all ports and connections and modules. - */ -void -FlowCanvas::destroy() -{ - for (ModuleMap::iterator m = m_modules.begin(); m != m_modules.end(); ++m) - delete (*m).second; - for (ConnectionList::iterator c = m_connections.begin(); c != m_connections.end(); ++c) - delete (*c); - - m_modules.clear(); - m_connections.clear(); - - m_selected_port = NULL; - m_connect_port = NULL; -} - - -void -FlowCanvas::selected_port(Port* p) -{ - if (m_selected_port != NULL) - m_selected_port->rect()->property_fill_color_rgba() = m_selected_port->colour(); // "turn off" the old one - - m_selected_port = p; - - if (p != NULL) - m_selected_port->rect()->property_fill_color() = "red"; -} - - -Module* -FlowCanvas::find_module(const string& name) -{ - ModuleMap::iterator m = m_modules.find(name); - - if (m != m_modules.end()) - return (*m).second; - else - return NULL; -} - - -/** Sets the passed module's location to a reasonable default. - */ -void -FlowCanvas::set_default_placement(Module* m) -{ - assert(m != NULL); - - // Simple cascade. This will get more clever in the future. - double x = ((m_width / 2.0) + (m_modules.size() * 25)); - double y = ((m_height / 2.0) + (m_modules.size() * 25)); - - m->move_to(x, y); -} - - -void -FlowCanvas::add_module(Module* m) -{ - assert(m != NULL); - std::pair p(m->name(), m); - m_modules.insert(p); -} - - -void -FlowCanvas::remove_module(const string& name) -{ - ModuleMap::iterator m = m_modules.find(name); - - if (m != m_modules.end()) { - delete (*m).second; - m_modules.erase(m); - } else { - cerr << "[FlowCanvas::remove_module] Unable to find module!" << endl; - } -} - - -Port* -FlowCanvas::find_port(const string& node_name, const string& port_name) -{ - Module* module = NULL; - Port* port = NULL; - - for (ModuleMap::iterator i = m_modules.begin(); i != m_modules.end(); ++i) { - module = (*i).second; - port = module->port(port_name); - if (module->name() == node_name && port != NULL) - return port; - } - - cerr << "[FlowCanvas::find_port] Failed to find port " << - node_name << ":" << port_name << endl; - - return NULL; -} - - -void -FlowCanvas::rename_module(const string& old_name, const string& new_name) -{ - Module* module = NULL; - - for (ModuleMap::iterator i = m_modules.begin(); i != m_modules.end(); ++i) { - module = (*i).second; - assert(module != NULL); - if (module->name() == old_name) { - m_modules.erase(i); - module->name(new_name); - add_module(module); - return; - } - } - - cerr << "[FlowCanvas::rename_module] Failed to find module " << - old_name << endl; -} - - -/** Add a connection. - */ -void -FlowCanvas::add_connection(const string& node1_name, const string& port1_name, - const string& node2_name, const string& port2_name) -{ - Port* port1 = find_port(node1_name, port1_name); - Port* port2 = find_port(node2_name, port2_name); - - if (port1 == NULL) { - cerr << "Unable to find port " << node1_name << ":" << port1_name - << " to make connection." << endl; - } else if (port2 == NULL) { - cerr << "Unable to find port " << node2_name << ":" << port2_name - << " to make connection." << endl; - } else { - add_connection(port1, port2); - } -} - - -bool -FlowCanvas::remove_connection(Port* port1, Port* port2) -{ - assert(port1 != NULL); - assert(port2 != NULL); - - Connection* c = get_connection(port1, port2); - if (c == NULL) { - cerr << "Couldn't find connection.\n"; - return false; - } else { - remove_connection(c); - return true; - } -} - - -/** Remove a connection. - * - * Returns whether or not the connection was found (and removed). - */ -bool -FlowCanvas::remove_connection(const string& mod1_name, const string& port1_name, const string& mod2_name, const string& port2_name) -{ - Connection* c = get_connection(find_port(mod1_name, port1_name), - find_port(mod2_name, port2_name)); - if (c == NULL) { - cerr << "Couldn't find connection.\n"; - return false; - } else { - remove_connection(c); - return true; - } -} - - -bool -FlowCanvas::are_connected(const Port* port1, const Port* port2) -{ - assert(port1 != NULL); - assert(port2 != NULL); - - ConnectionList::const_iterator c; - const Connection* connection; - - - for (c = m_connections.begin(); c != m_connections.end(); ++c) { - connection = *c; - if (connection->source_port() == port1 && connection->dest_port() == port2) - return true; - if (connection->source_port() == port2 && connection->dest_port() == port1) - return true; - } - - return false; -} - - -Connection* -FlowCanvas::get_connection(const Port* port1, const Port* port2) -{ - assert(port1 != NULL); - assert(port2 != NULL); - - for (ConnectionList::iterator i = m_connections.begin(); i != m_connections.end(); ++i) { - if ( (*i)->source_port() == port1 && (*i)->dest_port() == port2 ) - return *i; - else if ( (*i)->dest_port() == port1 && (*i)->source_port() == port2 ) - return *i; - } - - return NULL; -} - - -void -FlowCanvas::add_connection(Port* port1, Port* port2) -{ - assert(port1->is_input() != port2->is_input()); - assert(port1->is_output() != port2->is_output()); - Port* src_port = NULL; - Port* dst_port = NULL; - if (port1->is_output() && port2->is_input()) { - src_port = port1; - dst_port = port2; - } else { - src_port = port2; - dst_port = port1; - } - - // Create (graphical) connection object - if (get_connection(port1, port2) == NULL) { - Connection* c = new Connection(this, src_port, dst_port); - port1->add_connection(c); - port2->add_connection(c); - m_connections.push_back(c); - } -} - - -void -FlowCanvas::remove_connection(Connection* connection) -{ - assert(connection != NULL); - - ConnectionList::iterator i = find(m_connections.begin(), m_connections.end(), connection); - Connection* c = *i; - - c->disconnect(); - m_connections.erase(i); - delete c; -} - - -/** Called when two ports are 'toggled' (connected or disconnected) - */ -void -FlowCanvas::ports_joined(Port* port1, Port* port2) -{ - assert(port1 != NULL); - assert(port2 != NULL); - - port1->hilite(false); - port2->hilite(false); - - string src_mod_name, dst_mod_name, src_port_name, dst_port_name; - - Port* src_port = NULL; - Port* dst_port = NULL; - - if (port2->is_input() && ! port1->is_input()) { - src_port = port1; - dst_port = port2; - } else if ( ! port2->is_input() && port1->is_input()) { - src_port = port2; - dst_port = port1; - } else { - return; - } - - if (are_connected(src_port, dst_port)) - disconnect(src_port, dst_port); - else - connect(src_port, dst_port); -} - - -/** Event handler for ports. - * - * These events can't be handled in the Port class because they have to do with - * connections etc. which deal with multiple ports (ie m_selected_port). Ports - * pass their events on to this function to get around this. - */ -bool -FlowCanvas::port_event(GdkEvent* event, Port* port) -{ - static bool port_dragging = false; - bool handled = true; - - switch (event->type) { - - case GDK_BUTTON_PRESS: - if (event->button.button == 1) { - port_dragging = true; - } else if (event->button.button == 3) { - m_selected_port = port; - port->popup_menu(event->button.button, event->button.time); - } else { - handled = false; - } - break; - - case GDK_BUTTON_RELEASE: - if (port_dragging) { - if (m_connect_port == NULL) { - selected_port(port); - m_connect_port = port; - } else { - ports_joined(port, m_connect_port); - m_connect_port = NULL; - selected_port(NULL); - } - port_dragging = false; - } else { - handled = false; - } - break; - - case GDK_ENTER_NOTIFY: - if (port != m_selected_port) - port->hilite(true); - break; - - case GDK_LEAVE_NOTIFY: - if (port_dragging) { - m_drag_state = CONNECTION; - m_connect_port = port; - - m_base_rect.grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, - Gdk::Cursor(Gdk::CROSSHAIR), event->button.time); - - port_dragging = false; - } else { - if (port != m_selected_port) - port->hilite(false); - } - break; - - default: - handled = false; - } - - return handled; -} - - -/* -bool -FlowCanvas::canvas_event(GdkEvent* event) -{ - if (m_connection_dragging) { - return connection_drag_handler(event); - } else if (m_scroll_dragging) { - return scroll_drag_handler(event); - } else if (event->type == GDK_BUTTON_PRESS && event->button.button == 2) { - get_scroll_offsets(m_scroll_offset_x, m_scroll_offset_y); - //double x, y; - //window_to_world(event->button.x, event->button.y, x, y); - //w2c(x, y, m_scroll_origin_x, m_scroll_origin_y); - m_scroll_origin_x = event->button.x; - m_scroll_origin_y = event->button.y; - //root()->w2i(m_scroll_origin_x, m_scroll_origin_y); - //window_to_world(event->button.x, event->button.y, x, y); - //w2c(x, y, m_scroll_origin_x, m_scroll_origin_y); - m_scroll_dragging = true; - } - return false; -} -*/ - - -/* I can not get this to work for the life of me. - * Man I hate gnomecanvas. -bool -FlowCanvas::scroll_drag_handler(GdkEvent* event) -{ - - bool handled = true; - - static int original_scroll_x = 0; - static int original_scroll_y = 0; - static double origin_x = 0; - static double origin_y = 0; - static double x_offset = 0; - static double y_offset = 0; - static double scroll_offset_x = 0; - static double scroll_offset_y = 0; - static double last_x = 0; - static double last_y = 0; - - bool first_motion = true; - - if (event->type == GDK_BUTTON_PRESS && event->button.button == 2) { - m_base_rect.grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK, - Gdk::Cursor(Gdk::FLEUR), event->button.time); - get_scroll_offsets(original_scroll_x, original_scroll_y); - scroll_offset_x = original_scroll_x; - scroll_offset_y = original_scroll_y; - origin_x = event->button.x; - origin_y = event->button.y; - last_x = origin_x; - last_y = origin_y; - first_motion = true; - m_scroll_dragging = true; - - } else if (event->type == GDK_MOTION_NOTIFY && m_scroll_dragging) { - // These are world-relative coordinates - double x = event->motion.x_root; - double y = event->motion.y_root; - - //c2w(x, y, x, y); - //world_to_window(x, y, x, y); - //window_to_world(event->button.x, event->button.y, x, y); - //w2c(x, y, x, y); - - x_offset += last_x - x;//x + original_scroll_x; - y_offset += last_y - y;// + original_scroll_y; - - //cerr << "Coord: (" << x << "," << y << ")\n"; - //cerr << "Offset: (" << x_offset << "," << y_offset << ")\n"; - - int temp_x; - int temp_y; - w2c(lrint(x_offset), lrint(y_offset), - temp_x, temp_y); - scroll_offset_x += temp_x; - scroll_offset_y += temp_y; - scroll_to(scroll_offset_x, - scroll_offset_y); - last_x = x; - last_y = y; - } else if (event->type == GDK_BUTTON_RELEASE && m_scroll_dragging) { - m_base_rect.ungrab(event->button.time); - m_scroll_dragging = false; - } else { - handled = false; - } - - return handled; - return false; -} -*/ - - -bool -FlowCanvas::select_drag_handler(GdkEvent* event) -{ - Module* module = NULL; - - if (event->type == GDK_BUTTON_PRESS && event->button.button == 1) { - assert(m_select_rect == NULL); - m_drag_state = SELECT; - if ( !(event->button.state & GDK_CONTROL_MASK)) - clear_selection(); - m_select_rect = new Gnome::Canvas::Rect(*root(), - event->button.x, event->button.y, event->button.x, event->button.y); - m_select_rect->property_fill_color_rgba() = 0x273344FF; - m_select_rect->property_outline_color_rgba() = 0xEEEEFFFF; - m_select_rect->lower_to_bottom(); - m_base_rect.lower_to_bottom(); - return true; - } else if (event->type == GDK_MOTION_NOTIFY && m_drag_state == SELECT) { - assert(m_select_rect != NULL); - m_select_rect->property_x2() = event->button.x; - m_select_rect->property_y2() = event->button.y; - return true; - } else if (event->type == GDK_BUTTON_RELEASE && m_drag_state == SELECT) { - // Select all modules within rect - for (ModuleMap::iterator i = m_modules.begin(); i != m_modules.end(); ++i) { - module = (*i).second; - if (module->is_within(m_select_rect)) { - if (module->selected()) - unselect_module(module); - else - select_module(module); - } - } - - delete m_select_rect; - m_select_rect = NULL; - m_drag_state = NOT_DRAGGING; - return true; - } - return false; -} - - -/** Updates m_select_dash for rotation effect, and updates any - * selected item's borders (and the selection rectangle). - */ -bool -FlowCanvas::animate_selected() -{ - static int i = 10; - - if (--i == 0) - i = 10; - - m_select_dash->offset = i; - - if (m_select_rect != NULL) - m_select_rect->property_dash() = m_select_dash; - - for (list::iterator m = m_selected_modules.begin(); m != m_selected_modules.end(); ++m) - (*m)->rect()->property_dash() = m_select_dash; - - for (list::iterator c = m_selected_connections.begin(); c != m_selected_connections.end(); ++c) - (*c)->property_dash() = m_select_dash; - - return true; -} - - -bool -FlowCanvas::connection_drag_handler(GdkEvent* event) -{ - bool handled = true; - - // These are invisible, just used for making connections (while dragging) - static Module* drag_module = NULL; - static Port* drag_port = NULL; - - static Connection* drag_connection = NULL; - static Port* snapped_port = NULL; - - static bool snapped = false; - - if (event->type == GDK_BUTTON_PRESS && event->button.button == 2) { - m_drag_state = SCROLL; - } else if (event->type == GDK_MOTION_NOTIFY && m_drag_state == CONNECTION) { - double x = event->button.x, y = event->button.y; - root()->w2i(x, y); - - if (drag_connection == NULL) { // Havn't created the connection yet - assert(drag_port == NULL); - assert(m_connect_port != NULL); - - drag_module = new Module(this, ""); - bool drag_port_is_input = true; - if (m_connect_port->is_input()) - drag_port_is_input = false; - - drag_port = new Port(drag_module, "", drag_port_is_input, m_connect_port->colour()); - drag_module->add_port(drag_port); - - //drag_port->hide(); - drag_module->hide(); - - drag_module->move_to(x, y); - - drag_port->property_x() = 0; - drag_port->property_y() = 0; - drag_port->rect()->property_x2() = 1; - drag_port->rect()->property_y2() = 1; - if (drag_port_is_input) - drag_connection = new Connection(this, m_connect_port, drag_port); - else - drag_connection = new Connection(this, drag_port, m_connect_port); - - drag_connection->update_location(); - //drag_connection->property_line_style() = Gdk::LINE_DOUBLE_DASH; - //drag_connection->property_last_arrowhead() = true; - } - - if (snapped) { - if (drag_connection != NULL) drag_connection->hide(); - Port* p = get_port_at(x, y); - if (drag_connection != NULL) drag_connection->show(); - if (p != NULL) { - if (p != m_selected_port) { - if (snapped_port != NULL) - snapped_port->hilite(false); - p->hilite(true); - snapped_port = p; - } - drag_module->property_x() = p->module()->property_x().get_value(); - drag_module->rect()->property_x2() = p->module()->rect()->property_x2().get_value(); - drag_module->property_y() = p->module()->property_y().get_value(); - drag_module->rect()->property_y2() = p->module()->rect()->property_y2().get_value(); - drag_port->property_x() = p->property_x().get_value(); - drag_port->property_y() = p->property_y().get_value(); - } else { // off the port now, unsnap - if (snapped_port != NULL) - snapped_port->hilite(false); - snapped_port = NULL; - snapped = false; - drag_module->property_x() = x; - drag_module->property_y() = y; - drag_port->property_x() = 0; - drag_port->property_y() = 0; - drag_port->rect()->property_x2() = 1; - drag_port->rect()->property_y2() = 1; - } - drag_connection->update_location(); - } else { // not snapped to a port - assert(drag_module != NULL); - assert(drag_port != NULL); - assert(m_connect_port != NULL); - - // "Snap" to port, if we're on a port and it's the right direction - if (drag_connection != NULL) drag_connection->hide(); - Port* p = get_port_at(x, y); - if (drag_connection != NULL) drag_connection->show(); - if (p != NULL && p->is_input() != m_connect_port->is_input()) { - p->hilite(true); - snapped_port = p; - snapped = true; - // Make drag module and port exactly the same size/loc as the snapped - drag_module->move_to(p->module()->property_x().get_value(), p->module()->property_y().get_value()); - drag_module->width(p->module()->width()); - drag_module->height(p->module()->height()); - drag_port->property_x() = p->property_x().get_value(); - drag_port->property_y() = p->property_y().get_value(); - // Make the drag port as wide as the snapped port so the connection coords are the same - drag_port->rect()->property_x2() = p->rect()->property_x2().get_value(); - drag_port->rect()->property_y2() = p->rect()->property_y2().get_value(); - } else { - drag_module->property_x() = x; - drag_module->property_y() = y; - } - drag_connection->update_location(); - } - } else if (event->type == GDK_BUTTON_RELEASE && m_drag_state == CONNECTION) { - m_base_rect.ungrab(event->button.time); - - double x = event->button.x; - double y = event->button.y; - m_base_rect.i2w(x, y); - - if (drag_connection != NULL) drag_connection->hide(); - Port* p = get_port_at(x, y); - if (drag_connection != NULL) drag_connection->show(); - - if (p != NULL) { - if (p == m_connect_port) { // drag ended on same port it started on - if (m_selected_port == NULL) { // no active port, just activate (hilite) it - selected_port(m_connect_port); - } else { // there is already an active port, connect it with this one - if (m_selected_port != m_connect_port) - ports_joined(m_selected_port, m_connect_port); - selected_port(NULL); - m_connect_port = NULL; - snapped_port = NULL; - } - } else { // drag ended on different port - //p->hilite(false); - ports_joined(m_connect_port, p); - selected_port(NULL); - m_connect_port = NULL; - snapped_port = NULL; - } - } - - // Clean up dragging stuff - if (m_connect_port != NULL) - m_connect_port->hilite(false); - - m_drag_state = NOT_DRAGGING; - delete drag_connection; - drag_connection = NULL; - //delete drag_port; - drag_port = NULL; - delete drag_module; // deletes drag_port - drag_module = NULL; - snapped_port = NULL; - } else { - handled = false; - } - - return handled; -} - - -Port* -FlowCanvas::get_port_at(double x, double y) -{ - Gnome::Canvas::Item* item = get_item_at(x, y); - if (item == NULL) return NULL; - - Port* p = NULL; - // Loop through every port and see if the item at these coordinates is that port - // yes, this is disgusting ;) - for (ModuleMap::iterator i = m_modules.begin(); i != m_modules.end(); ++i) { - for (PortList::iterator j = (*i).second->ports().begin(); j != (*i).second->ports().end(); ++j) { - p = (*j); - - if ((Gnome::Canvas::Item*)p == item - || (Gnome::Canvas::Item*)(p->rect()) == item - || (Gnome::Canvas::Item*)(p->label()) == item) { - return p; - } - } - } - return NULL; -} - -/* -void -FlowCanvas::port_menu_disconnect_all() -{ - Connection* c = NULL; - list temp_list = m_selected_port->connections(); - for (list::iterator i = temp_list.begin(); i != temp_list.end(); ++i) { - c = *i; - disconnect(c->source_port(), c->dest_port()); - } - - selected_port(NULL); -} -*/ - -} // namespace LibFlowCanvas diff --git a/libs/flowcanvas/src/Module.cpp b/libs/flowcanvas/src/Module.cpp deleted file mode 100644 index 14f9e3eda6..0000000000 --- a/libs/flowcanvas/src/Module.cpp +++ /dev/null @@ -1,472 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "flowcanvas/Module.h" -#include "flowcanvas/FlowCanvas.h" -#include -#include -#include -#include -#include - -using std::string; - -namespace LibFlowCanvas { - -static const int MODULE_FILL_COLOUR = 0x122A3CFF; -static const int MODULE_OUTLINE_COLOUR = 0x8899AAFF; -static const int MODULE_TITLE_COLOUR = 0xDDEEFFFF; - -Module::Module(FlowCanvas* patch_bay, const string& name, double x, double y) -: Gnome::Canvas::Group(*patch_bay->root(), x, y), - m_name(name), - m_selected(false), - m_patch_bay(patch_bay), - m_module_box(*this, 0, 0, 0, 0), // w, h set later - m_canvas_title(*this, 0, 6, name) // x set later -{ - assert(m_patch_bay != NULL); - - m_module_box.property_fill_color_rgba() = MODULE_FILL_COLOUR; - - m_module_box.property_outline_color_rgba() = MODULE_OUTLINE_COLOUR; - m_module_box.property_join_style() = Gdk::JOIN_ROUND; - border_width(1.0); - - m_canvas_title.property_size_set() = true; - m_canvas_title.property_size() = 10000; - m_canvas_title.property_weight_set() = true; - m_canvas_title.property_weight() = 400; - m_canvas_title.property_fill_color_rgba() = MODULE_TITLE_COLOUR; - - width(m_canvas_title.property_text_width() + 6.0); - height(m_canvas_title.property_text_height() + 2.0); - m_canvas_title.property_x() = m_width/2.0; - - signal_event().connect(sigc::mem_fun(this, &Module::module_event)); -} - - -Module::~Module() -{ - if (m_selected) { - for (list::iterator i = m_patch_bay->selected_modules().begin(); - i != m_patch_bay->selected_modules().end(); ++i) - { - if ((*i) == this) { - m_patch_bay->selected_modules().erase(i); - break; - } - } - } - for (PortList::iterator p = m_ports.begin(); p != m_ports.end(); ++p) - delete (*p); -} - -/** Set the border width of the module. - * - * Do NOT directly set the width_units property on the rect, use this function. - */ -void -Module::border_width(double w) -{ - m_border_width = w; - m_module_box.property_width_units() = w; -} - - -bool -Module::module_event(GdkEvent* event) -{ - assert(event != NULL); - - static double x, y; - static double drag_start_x, drag_start_y; - double module_x, module_y; // FIXME: bad name, actually mouse click loc - static bool dragging = false; - bool handled = true; - - module_x = event->button.x; - module_y = event->button.y; - - property_parent().get_value()->w2i(module_x, module_y); - - switch (event->type) { - - case GDK_2BUTTON_PRESS: - on_double_click(); - handled = true; - break; - - case GDK_BUTTON_PRESS: - if (event->button.button == 1) { - x = module_x; - y = module_y; - // Set these so we can tell on a button release if a drag actually - // happened (if not, it's just a click) - drag_start_x = x; - drag_start_y = y; - grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK, - Gdk::Cursor(Gdk::FLEUR), - event->button.time); - dragging = true; - } else if (event->button.button == 2) { - on_double_click(); - handled = true; - } else if (event->button.button == 3) { - show_menu(&event->button); - } else { - handled = false; - } - break; - - case GDK_MOTION_NOTIFY: - if ((dragging && (event->motion.state & GDK_BUTTON1_MASK))) { - double new_x = module_x; - double new_y = module_y; - - // Move any other selected modules if we're selected - if (m_selected) { - for (list::iterator i = m_patch_bay->selected_modules().begin(); - i != m_patch_bay->selected_modules().end(); ++i) - { - (*i)->move(new_x - x, new_y - y); - } - } else { - move(new_x - x, new_y - y); - } - - x = new_x; - y = new_y; - } else { - handled = false; - } - break; - - case GDK_BUTTON_RELEASE: - if (dragging) { - ungrab(event->button.time); - dragging = false; - if (module_x != drag_start_x || module_y != drag_start_y) {// dragged - store_location(); - } else { // just a click - if (m_selected) { - m_patch_bay->unselect_module(this); - assert(!m_selected); - } else { - if ( !(event->button.state & GDK_CONTROL_MASK)) - m_patch_bay->clear_selection(); - m_patch_bay->select_module(this); - assert(m_selected); - } - } - } else { - handled = false; - } - break; - - case GDK_ENTER_NOTIFY: - hilite(true); - raise_to_top(); - for (PortList::iterator p = m_ports.begin(); p != m_ports.end(); ++p) - (*p)->raise_connections(); - break; - - case GDK_LEAVE_NOTIFY: - hilite(false); - break; - - default: - handled = false; - } - - return handled; -} - - -void -Module::zoom(float z) -{ - m_canvas_title.property_size() = static_cast(roundf(10000.0f * z)); - for (PortList::iterator p = m_ports.begin(); p != m_ports.end(); ++p) - (*p)->zoom(z); -} - - -void -Module::hilite(bool b) -{ - if (b) { - m_module_box.property_fill_color_rgba() = 0x223553FF; - } else { - m_module_box.property_fill_color_rgba() = MODULE_FILL_COLOUR; - } -} - - -void -Module::selected(bool selected) -{ - m_selected = selected; - if (selected) { - m_module_box.property_fill_color_rgba() = 0x223553FF; - m_module_box.property_outline_color_rgba() = 0xEEEEFFFF; - m_module_box.property_dash() = m_patch_bay->select_dash(); - m_canvas_title.property_fill_color_rgba() = 0xEEEEFFFF; - //for (PortList::iterator p = m_ports.begin(); p != m_ports.end(); ++p) - // (*p)->rect()->property_outline_color_rgba() = 0xEEEEFFFF; - } else { - m_module_box.property_fill_color_rgba() = MODULE_FILL_COLOUR; - m_module_box.property_outline_color_rgba() = MODULE_OUTLINE_COLOUR; - m_module_box.property_dash() = NULL; - m_canvas_title.property_fill_color_rgba() = MODULE_TITLE_COLOUR; - //for (PortList::iterator p = m_ports.begin(); p != m_ports.end(); ++p) - // (*p)->rect()->property_outline_color_rgba() = 0x8899AAFF; - } -} - - -bool -Module::is_within(const Gnome::Canvas::Rect* const rect) -{ - const double x1 = rect->property_x1(); - const double y1 = rect->property_y1(); - const double x2 = rect->property_x2(); - const double y2 = rect->property_y2(); - - if (x1 < x2 && y1 < y2) { - return (property_x() > x1 - && property_y() > y1 - && property_x() + width() < x2 - && property_y() + height() < y2); - } else if (x2 < x1 && y2 < y1) { - return (property_x() > x2 - && property_y() > y2 - && property_x() + width() < x1 - && property_y() + height() < y1); - } else if (x1 < x2 && y2 < y1) { - return (property_x() > x1 - && property_y() > y2 - && property_x() + width() < x2 - && property_y() + height() < y1); - } else if (x2 < x1 && y1 < y2) { - return (property_x() > x2 - && property_y() > y1 - && property_x() + width() < x1 - && property_y() + height() < y2); - } else { - return false; - } -} - - -void -Module::remove_port(const string& port_name, bool resize_to_fit) -{ - for (PortList::iterator i = m_ports.begin(); i != m_ports.end(); ++i) { - if ((*i)->name() == port_name) { - delete (*i); - i = m_ports.erase(i); - } - } - - if (resize_to_fit) - resize(); -} - - -void -Module::width(double w) -{ - m_width = w; - m_module_box.property_x2() = m_module_box.property_x1() + w; -} - - -void -Module::height(double h) -{ - m_height = h; - m_module_box.property_y2() = m_module_box.property_y1() + h; -} - - -/** Overloaded Group::move to update connection paths and keep module on the canvas */ -void -Module::move(double dx, double dy) -{ - double new_x = property_x() + dx; - double new_y = property_y() + dy; - - if (new_x < 0) dx = property_x() * -1; - else if (new_x + m_width > m_patch_bay->width()) dx = m_patch_bay->width() - property_x() - m_width; - - if (new_y < 0) dy = property_y() * -1; - else if (new_y + m_height > m_patch_bay->height()) dy = m_patch_bay->height() - property_y() - m_height; - - Gnome::Canvas::Group::move(dx, dy); - - // Deal with moving the connection lines - for (PortList::iterator p = ports().begin(); p != ports().end(); ++p) - (*p)->move_connections(); -} - - -/** Move to the specified absolute coordinate on the canvas */ -void -Module::move_to(double x, double y) -{ - if (x < 0) x = 0; - if (y < 0) y = 0; - if (x + m_width > m_patch_bay->width()) x = m_patch_bay->width() - m_width; - if (y + m_height > m_patch_bay->height()) y = m_patch_bay->height() - m_height; - - // Man, not many things left to try to get the damn things to move! :) - property_x() = x; - property_y() = y; - move(0, 0); - // Deal with moving the connection lines - for (PortList::iterator p = ports().begin(); p != ports().end(); ++p) - (*p)->move_connections(); -} - - -void -Module::name(const string& n) -{ - m_name = n; - m_canvas_title.property_text() = m_name; - resize(); -} - -/* -void -Module::add_port(const string& port_name, bool is_input, int colour, bool resize_to_fit) -{ - Port* port = new Port(this, port_name, is_input, colour); - - port->signal_event().connect( - sigc::bind(sigc::mem_fun(m_patch_bay, &FlowCanvas::port_event), port)); - - add_port(port, resize_to_fit); -} -*/ - -void -Module::add_port(Port* port, bool resize_to_fit) -{ - m_ports.push_back(port); - - if (resize_to_fit) - resize(); -} - - -/** Resize the module to fit its contents best. - */ -void -Module::resize() -{ - double widest_in = 0.0; - double widest_out = 0.0; - - Port* p = NULL; - - // Find widest in/out ports - for (PortList::iterator i = m_ports.begin(); i != m_ports.end(); ++i) { - p = (*i); - if (p->is_input() && p->width() > widest_in) - widest_in = p->width(); - else if (p->is_output() && p->width() > widest_out) - widest_out = p->width(); - } - - // Make sure module is wide enough for ports - if (widest_in > widest_out) - width(widest_in + 5.0 + border_width()*2.0); - else - width(widest_out + 5.0 + border_width()*2.0); - - // Make sure module is wide enough for title - if (m_canvas_title.property_text_width() + 6.0 > m_width) - width(m_canvas_title.property_text_width() + 6.0); - - // Set height to contain ports and title - double height_base = m_canvas_title.property_text_height() + 2; - double h = height_base; - if (m_ports.size() > 0) - h += m_ports.size() * ((*m_ports.begin())->height()+2.0); - height(h); - - // Move ports to appropriate locations - - double y; - int i = 0; - for (PortList::iterator pi = m_ports.begin(); pi != m_ports.end(); ++pi, ++i) { - Port* p = (*pi); - - y = height_base + (i * (p->height() + 2.0)); - if (p->is_input()) { - p->width(widest_in); - p->property_x() = 1.0;//border_width(); - p->property_y() = y; - } else { - p->width(widest_out); - p->property_x() = m_width - p->width() - 1.0;//p->border_width(); - p->property_y() = y; - } - } - - // Center title - m_canvas_title.property_x() = m_width/2.0; - - // Update connection locations if we've moved/resized - for (PortList::iterator pi = m_ports.begin(); pi != m_ports.end(); ++pi, ++i) { - (*pi)->move_connections(); - } - - // Make things actually move to their new locations (?!) - move(0, 0); -} - - -/** Port offset, for connection drawing. See doc/port_offsets.dia */ -double -Module::port_connection_point_offset(Port* port) -{ - assert(port->module() == this); - assert(ports().size() > 0); - - return (port->connection_coords().get_y() - - m_ports.front()->connection_coords().get_y()); -} - - -/** Range of port offsets, for connection drawing. See doc/port_offsets.dia */ -double -Module::port_connection_points_range() -{ - assert(m_ports.size() > 0); - - double ret = fabs(m_ports.back()->connection_coords().get_y() - - m_ports.front()->connection_coords().get_y()); - - return (ret < 1.0) ? 1.0 : ret; -} - - -} // namespace LibFlowCanvas diff --git a/libs/flowcanvas/src/Port.cpp b/libs/flowcanvas/src/Port.cpp deleted file mode 100644 index 8310b484c3..0000000000 --- a/libs/flowcanvas/src/Port.cpp +++ /dev/null @@ -1,189 +0,0 @@ -/* This file is part of FlowCanvas. Copyright (C) 2005 Dave Robillard. - * - * FlowCanvas is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * FlowCanvas is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include -#include "flowcanvas/Port.h" -#include "flowcanvas/Module.h" -#include "flowcanvas/FlowCanvas.h" - -namespace LibFlowCanvas { - - -Port::Port(Module* module, const string& name, bool is_input, int color) -: Gnome::Canvas::Group(*module, 0, 0), - m_module(module), - m_name(name), - m_is_input(is_input), - m_colour(color), - m_label(*this, 1, 1, m_name), - m_rect(*this, 0, 0, 0, 0) -{ - m_menu.items().push_back(Gtk::Menu_Helpers::MenuElem( - "Disconnect All", sigc::mem_fun(this, &Port::disconnect_all))); - - m_rect.property_fill_color_rgba() = color; - - // Make rectangle pretty - //m_rect.property_outline_color_rgba() = 0x8899AAFF; - m_rect.property_outline_color_rgba() = color; - m_rect.property_join_style() = Gdk::JOIN_MITER; - border_width(1.0); - - // Make label pretty - m_label.property_size() = PORT_LABEL_SIZE; - m_label.property_fill_color_rgba() = 0xFFFFFFFF; - m_label.property_weight() = 200; - - m_width = m_label.property_text_width() + 4.0; - m_height = m_label.property_text_height(); - - // Place everything - m_rect.property_x1() = 0; - m_rect.property_y1() = 0; - m_rect.property_x2() = m_width; - m_rect.property_y2() = m_height; - m_label.property_x() = m_label.property_text_width() / 2 + 1; - m_label.property_y() = m_height / 2; - - m_label.raise_to_top(); - -} - - -/** Set the border width of the port's rectangle. - * - * Do NOT directly set the width_units property on the rect, use this function. - */ -void -Port::border_width(double w) -{ - m_border_width = w; - m_rect.property_width_units() = w; -} - - -void -Port::name(const string& n) -{ - m_name = n; - - // Reposition label - m_label.property_text() = m_name; - m_width = m_label.property_text_width() + 4.0; - m_height = m_label.property_text_height(); - m_rect.property_x2() = m_width; - m_rect.property_y2() = m_height; - m_label.property_x() = m_label.property_text_width() / 2 + 1; - m_label.property_y() = m_height / 2; - - m_module->resize(); -} - - -void -Port::zoom(float z) -{ - m_label.property_size() = static_cast(8000 * z); -} - - -/** Update the location of all connections to/from this port if this port has moved */ -void -Port::move_connections() -{ - for (list::iterator i = m_connections.begin(); i != m_connections.end(); i++) { - ((Connection*)(*i))->update_location(); - } -} - - -void -Port::remove_connection(Connection* c) -{ - m_connections.erase( - find(m_connections.begin(), m_connections.end(), c) - ); -} - - -void -Port::disconnect_all() -{ - Connection* c = NULL; - list temp_list = m_connections; - for (list::iterator i = temp_list.begin(); i != temp_list.end(); ++i) { - c = *i; - m_module->patch_bay()->disconnect(c->source_port(), c->dest_port()); - } -} - - -void -Port::hilite(bool b) -{ - m_module->hilite(b); - - for (list::iterator i = m_connections.begin(); i != m_connections.end(); ++i) { - (*i)->hilite(b); - if (b) - (*i)->raise_to_top(); - } - - if (b) { - raise_to_top(); - m_rect.raise_to_top(); - m_label.raise_to_top(); - m_rect.property_fill_color_rgba() = m_colour + 0x33333300; - } else { - m_rect.property_fill_color_rgba() = m_colour; - } -} - - -void -Port::raise_connections() -{ - for (list::iterator i = m_connections.begin(); i != m_connections.end(); ++i) { - (*i)->raise_to_top(); - } -} - - -// Returns the world-relative coordinates of where a connection line -// should attach -Gnome::Art::Point -Port::connection_coords() -{ - double x = (is_input()) ? m_rect.property_x1()-1.0 : m_rect.property_x2()+1.0; - double y = m_rect.property_y1() + m_height / 2; - - i2w(x, y); // convert to world-relative coords - - return Gnome::Art::Point(x, y); -} - - -void -Port::width(double w) -{ - double diff = w - m_width; - m_rect.property_x2() = m_rect.property_x2() + diff; - m_width = w; -} - - -} // namespace LibFlowCanvas diff --git a/libs/glibmm2/ChangeLog b/libs/glibmm2/ChangeLog index 2862d348ff..af229af44e 100644 --- a/libs/glibmm2/ChangeLog +++ b/libs/glibmm2/ChangeLog @@ -1,3 +1,370 @@ +2.14.2: + +2007-10-22 Murray Cumming + + * Merged this change from 2007-03-03 from the glibmm-2-12 branch, which was + missing from this branch: + * configure.in: + * glib/glibmmconfig.h.in: + * glib/src/date.ccg: + * glib/src/date.hg: + * scripts/Makefile.am: + * scripts/c_std.m4: Added a test for the case that time_t is equivalent to + guint32, as seems to be the case on NetBSD-4.99.6/amd64, so we can ifdef-out + the (deprecated, anyway) Glib::Date::set_time(GTime) method when necessary, because + GTime is also equivalent to guint32. + Bug #386990. + +2007-10-12 Armin Burgmeier + + * tools/m4/base.m4: Added a new section called SECTION_HEADER_FIRST + that within the header file that is before any generated code (apart + from the include guards) and a _CONFIGINCLUDE macro that includes a + file within this section. This is intended to be used with + g*mmconfig.h so the *_DISABLE_DEPRECATED define is set for deprecated + classes also when included from other code. + +2.14.1: + +2007-09-29 Rémi Cardona + + * configure.in: + increase the minimum glib requirements. + Bug #481566. + +2007-10-02 Murray Cumming + + * glib/glibmm/wrap.cc: + * glib/glibmm/wrap.h: Replaced wrap_create_new_wrapper() + (introduced by the last commit) with wrap_create_new_wrapper(), + allowing us to check that the parent GType actually implements + the interface. This allows us to return a parent known type + if it implements the wanted interface. + +2007-09-25 Murray Cumming + + * glib/glibmm/wrap.cc: + * glib/glibmm/wrap.h: Added wrap_auto_interface<>(), which should + be used by wrap() specializations for interfaces, so we create + instances of the interface even if the derived C type is unknown to + us. + * glib/glibmm/signalproxy_connectionnode.h: Do not wrap.h from here + unnecessarily, to allow us to include objectbase.h in wrap.h, + needed by the new templated method. + * tools/m4/class_interface.m4: Use wrap_auto_interface<>() + instead of wrap_auto() for interfaces. + +2.14.0: + +2007-09-06 Daniel Elstner + + * glib/src/regex.{ccg,hg} (Regex): Some cosmetic cleanup. Also + replace C-style casts in default argument values with static_cast<>. + (escape_string): Wrap missing function. + (match_full): Rename to and add as overloads of match(). + (match_all_full): Rename to and add as overloads of match_all(). + (split_full): Rename to and add as overloads of split(). + + This has freeze-break approval from the release team. + +2007-08-16 Jonathon Jongsma + + * docs/reference/glibmm_footer.html_fragment, + docs/reference/glibmm_header.html_fragment: added
to doxygen header + and footer to make it easier to integrate with library.gnome.org, per a + request by Frederic Peters + +2.13.9: + +2007-07-28 Murray Cumming + + * glib/src/keyfile.hg: + * glib/src/keyfile.ccg: Added a set_double() without the group_name + parameter, because the C function can take NULL. + * glib/src/glib_docs_override.xml: Corrected the documnentation for + g_keyfile_set/get_double() to mention 2.14, instead of 2.12, + because we only added these to glibmm in 2.14. + * glib/src/regex.hg: Correct the since documentation to be 2.14 + not 2.12. + * glib/src/iochannel.hg: read(): Corrected a parameter name to + match the generated documentation. + * glib/glibmm/miscutils.h: Fixed typos in the use of newin2p14. + +2007-07-28 Murray Cumming + + * docs/Makefile_web.am_fragment: Corrected the rsync options, to + match those used by gtkmm, to fix the examples upload. + * glib/src/glib_docs.xml: Regenerated from the C documentation. + +2007-07-14 Murray Cumming + + * glib/src/keyfile.ccg: + * glib/src/keyfile.hg: Added get_double(), set_double(), get_double_list() + and set_double_list(). + +2.13.8: + +2007-07-07 Jonathon Jongsma + + * glib/src/optioncontext.ccg: + * glib/src/optioncontext.hg: add some new API that was added in glib 2.12, + including get/set_summary(), get/set_description(), set_translation_domain(), + and set_translate_func(). + * glib/src/glib_docs.xml: Regenerated with docextract_to_xml.py + * glib/src/glib_docs_override.xml: override docs for the new functions so + that they say that they were introduced in glibmm 2.14 instead of 2.12 + +2007-07-02 Johannes Schmid + + * glib/src/regex.hg: + Added class documentation + +2007-07-02 Murray Cumming + + * tools/pm/DocsParser.pm: convert_tags_to_doxygen(): + Handle newin markers for 2.12 and a few after that. + * docs/reference/Doxyfile.in: Added ALIASES for newin2p12 and + a few more. + +2.13.7: + +2007-06-22 Murray Cumming + + * glib/glibmm/main.cc: + * glib/glibmm/main.h: Added SignalTimeout::connect_seconds() + as an equivalent for g_timeout_add_seconds() and took the improved + documentation from glib. + + * glib/glibmm/miscutils.cc: + * glib/glibmm/miscutils.h: Added get_user_special_dir(), though we + should maybe wrap the enum. + Reimplemented many of the functions with the + convert_return_gchar_ptr_to_stdstring() and + convert_const_gchar_ptr_to_stdstring() functions to simplify them + and make them handle NULLs properly. + +2007-06-22 Murray Cumming + + * glib/src/regex.ccg: + * glib/src/regex.hg: Added a create() method, and added some + more default parameter values to the methods. + + * configure.in: + * examples/Makefile.am: + * examples/regex/main.cc: Added a very simple example. + + * glib/glibmm/value_custom.h: Put header guards around this, though + this should never be included directly anyway. + +2.13.6: + +2007-06-17 Murray Cumming + + * glib/src/regex.hg: + * glib/src/matchinfo.hg: Removed API that uses GMatchInfo, until we + wrap this properly, probably as a C++ iterator. This will avoid this + API accidentally being released as stable sometime. + +2007-06-12 Murray Cumming + + * glib/src/glib_enums.defs: Regenerated with enums.pl + * glib/src/glib_functions.defs: Regenerated with h2defs.py + + * glib/src/Makefile_list_of_hg.am_fragment: + * tools/m4/convert_glib.m4: + * glib/src/matchinfo.ccg: + * glib/src/matchinfo.hg: + * glib/src/regex.ccg: + * glib/src/regex.hg: Added the RegEx and MatchInfo classes. + These need some examples to test them. The MatchInfo class is + probably particularly broken at the moment. See the TODO comments. + + * glib/glibmm.h: Added regex.h + +2007-05-14 Murray Cumming + + * tools/m4/class_boxedtype.m4: + * tools/m4/class_gobject.m4: + * tools/m4/class_gtkobject.m4: + * tools/m4/class_interface.m4: + * tools/m4/class_opaque_copyable.m4: + * tools/m4/class_opaque_refcounted.m4: Explicitly mention Glib::wrap() + in the documentation for generated Glib::wrap() functions, because doxygen + does not show their namespace. + +2007-05-04 Murray Cumming + + * tools/pm/Function.pm: When generating example prototypes for + signal handlers, prefix them with on_my_, to avoid confusion with + similarly named functions and with on_*() default signal handlers. + +2.13.5: + +2007-04-30 Johannes Schmid + + * tools/generate_wrap_init.pl.in: + * tools/m4/class_gtkobject.m4: + Use _IS_DEPRECATED instead of _CLASS_DEPRECATED because + the latter confuses gmmproc. + We cannot just use _DEPRECATED because it will result + in incorrect handling of for example + #ifndef GTKMM_DISABLE_DEPRECATED + +2007-04-24 Yselkowitz + + * scripts/macros.m4: Check for both m4 and M4 in the GNU m4 output, + to fix the build on some platforms. + Bug #423990 + +2.13.4: + +2007-04-11 Armin Burgmeier + + * tools/pm/WrapParser.pm: Added peek_token() function which only + returns the next token without removing it from the tokens array. + Parse '/**' as a separate token and handle it in a special way so that + when the final '*/' is encountered and _WRAP_SIGNAL follows, the + comment is not terminated but continued by that automatically + generated doxygen comment. + + * tools/pm/Output.pm: Added a merge_doxygen_comment_with_previous + parameter in output_wrap_sig_decl(). If it is nonzero, the function + assumes that there is already a comment open and continues to use it + instead of opening a new comment by removing the leading '/**' from + what get_refdoc_comment() returns. Bug #378810. + +2007-04-06 Johannes Schmid + + * tools/generate_wrap_init.pl.in: + Use _CLASS_DEPRECATE instead of just _DEPRECATE to + known whether a whole class should be avoided in wrap_init. + Otherwise every .hg file containing deprecated methods + might get ignored. (Fixes Gtk::TextBuffer bug in maemo) + +2007-03-19 Bradley Bell + + * glib/glibmm/helperlist.h: Change variable name to avoid + warnings about a shadowed member. + Bug #420316. + +2007-03-19 Bradley Bell + + * glib/glibmm/utility.h: remove g_free prototype, include gmem.h + instead, to avoid a warning about a redundant declaration. + Bug #420339. + +2007-03-17 Armin Burgmeier + + * tools/m4/signal.m4: + * tools/m4/vfunc.m4: + Use static_cast in vfuncs and signal handlers to cast the + wrapper object to ObjectBase*. This is enough to check whether the object is + from a derived type or not. A slow dynamic_cast has only to be performed if it + is derived, and the C++ vfunc needs to be called. + * glib/glibmm/objectbase.h: This requires ObjectBase::is_derived_ to be public, + because it is called on a ObjectBase* rather than the actual type. + This causes a slight speed up of vfuncs and default signal handler invokation. + + Also added commented-out inline versions of ObjectBase::_get_current_wrapper() and + ObjectBase::is_derived(), which could be used in the generated code if we find + that this has significant performance benefits. Note that these methods must be + additional to the non-inline methods, because inline methods are not usually exported in the + shared library. + +2007-02-10 Murray Cumming + + * examples/options/main.cc: Use a default value, to show that it + can be done. + (This change, from 2006-03-30 was restored after being accidentally lost on Apr 12 2006) + +2007-02-10 Armin Burgmeier + + * glib/src/optiongroup.ccg: default_c_arg(): Set the initial + value of the C argument to the value the C++ argument has, to avoid + that glibmm resets arguments to zero that were not given on the + command line. + (This change, from 2006-03-30 was restored after being accidentally lost on Apr 12 2006) + +2007-01-28 Daniel Elstner + + * tools/m4/ctor.m4: If the argument list is empty, call the non- + varargs overload of the Glib::ConstructParams constructor instead + of using an empty varargs list. This mistake was exposed thanks + to the recent addition of G_GNUC_NULL_TERMINATED to the varargs + constructor declaration. Fortunately it was harmless in this case. + Also use the opportunity to clean up the M4 code and prefix builtin + M4 macros with m4_, so that we may get rid of the unprefixed macros + altogether some day. + +Thu, 25 Jan 2007 23:13:05 +0100 Dodji Seketeli + + * tools/m4/base.m4: + prefix the builting mkstemp with 'm4' because otherwise, + m4 1.4.8 recognizes it as a builtin macro and expands it, leading + to compilation errors on some distros. + This should fix #397167. Thanks to Daniel Elstner for spotting this. + +2007-01-20 Daniel Elstner + + * glib/glibmm/dispatcher.{cc,h}: Early spring cleaning. Also add + a paragraph about Dispatcher on win32 to the documentation. + (DispatchNotifyData): Remove the 'tag' member from the struct that + was always set to 0xdeadbeef in order to detect memory corruption. + This is pointless, as we already check the DispatchNotifier pointer + sent across the pipe, which is a far better indicator of corruption + anyway. + (warn_failed_pipe_io): Remove the err_no parameter and retrieve + errno respectively GetLastError() within the function instead. + (DispatchNotifier::conn_io_handler_): Remove, as we now inherit + from sigc::trackable. I verified that this doesn't cause problems + with threading in this particular case. + (DispatchNotifier::DispatchNotifier): If creating the pipe failed + and exceptions are disabled, call at least warn_failed_pipe_io() + instead of doing nothing at all. + (DispatchNotifier::*): Rework the win32 implementation so that it + matches more closely the Dispatcher semantics on Unix. This still + needs testing by someone on win32, though. So far I only verified + that it compiles with dummy definitions of the win32 API. Also, + I accidentally located the real cause of the race condition Cedric + experienced in bug #109966. It was a bug in my patch, rather than + in the example code. + + * examples/thread/dispatcher.cc: Cleanup. In particular, get rid + of the Glib::RefPtr<> abuse with non-Glib::Object types. I don't + believe we endorse such usage officially, so it shouldn't be in + the examples. + +2007-01-20 Daniel Elstner + + * glib/glibmm/miscutils.cc: Clean up the code a bit. + (get_application_name): Remove the code that checked the string for + valid UTF-8, and attempted conversion if not valid. I must have + been on crack when I wrote this, as the combination of conditions + that would cause the string to be invalid UTF-8 is quite unlikely. + If this is a valid concern at all, it should be filed as a GLib bug + and not worked around in glibmm. + (build_filename(const std::string&, const std::string&)): Just call + the plain g_build_filename() instead of building a temporary array + and passing that via ArrayHandle to the build_filename() overload + for containers. + (build_path): Remove the already deactivated custom implementation + from the time before g_build_pathv() was added to GLib. + + * glib/glibmm/object.{cc,h}: Improve/fix a couple of comments. + (ConstructParams::ConstructParams): Add G_GNUC_NULL_TERMINATED + function attribute to make the compiler complain if the variadic + argument list is not terminated by a NULL pointer. + + * glib/glibmm/ustring.{cc,h} (utf8_find_last_of): Avoid applying + bitwise logical operators directly to (possibly signed) operands + of char type. In order to avoid relying on implementation-defined + behavior, make sure that the operands are of unsigned integer type. + (ustring::is_ascii): Likewise, + (ustring_Iterator::operator--): Likewise. + (get_unichar_from_std_iterator): De-obfuscate this highly optimized + piece of code, as the current stable release of GCC (4.1.2-pre on + my system) generates better assembler output without the voodoo. + 2.13.3: 2006-11-28 Daniel Elstner diff --git a/libs/glibmm2/INSTALL b/libs/glibmm2/INSTALL index 23e5f25d0e..5458714e1e 100644 --- a/libs/glibmm2/INSTALL +++ b/libs/glibmm2/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it. Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -78,7 +78,7 @@ details on some of the pertinent environment variables. by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,17 +87,15 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== @@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== diff --git a/libs/glibmm2/MSVC_Net2003/Makefile b/libs/glibmm2/MSVC_Net2003/Makefile deleted file mode 100644 index 9e94b9c52b..0000000000 --- a/libs/glibmm2/MSVC_Net2003/Makefile +++ /dev/null @@ -1,507 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = .. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003 -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -SUBDIRS = gendef glibmm examples tests -EXTRA_DIST = blank.cpp glibmm.sln README -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/Makefile.am b/libs/glibmm2/MSVC_Net2003/Makefile.am deleted file mode 100644 index 11f3ce0f3d..0000000000 --- a/libs/glibmm2/MSVC_Net2003/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = gendef glibmm examples tests - -EXTRA_DIST = blank.cpp glibmm.sln README diff --git a/libs/glibmm2/MSVC_Net2003/README b/libs/glibmm2/MSVC_Net2003/README deleted file mode 100644 index a269667c1e..0000000000 --- a/libs/glibmm2/MSVC_Net2003/README +++ /dev/null @@ -1,13 +0,0 @@ -Building glibmm-2.4 with Visual Studio .NET 2003 - -* You will need Visual Studio .NET 2003 (MSVC 7.1). Earlier versions of the compiler, including 6.0 and 7.0 will not work. -* Install the latest Win32 GTK+ Development Environment from the Glade for Windows project, http://gladewin32.sourceforge.net. -* Build libsigc++ 2.0.6 or later from source, http://sourceforge.net/project/showfiles.php?group_id=1970&package_id=76644. -* Add libsigc++ to the include and lib paths in Visual Studio. -* Load the glibmm/MSVC_Net2003/glibmm.sln solution. -* Build the entire solution. -* Run the tests. - -Timothy M. Shead -10/19/2004 - diff --git a/libs/glibmm2/MSVC_Net2003/examples/Makefile b/libs/glibmm2/MSVC_Net2003/examples/Makefile deleted file mode 100644 index f5d67112e3..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/Makefile +++ /dev/null @@ -1,506 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -SUBDIRS = dispatcher dispatcher2 markup options thread thread_pool -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/Makefile.am deleted file mode 100644 index 7e882e1d6d..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = dispatcher dispatcher2 markup options thread thread_pool - - diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile b/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile deleted file mode 100644 index f8893d9b60..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/dispatcher/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples/dispatcher -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = dispatcher.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile.am deleted file mode 100644 index b73bc99c90..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = dispatcher.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile b/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile deleted file mode 100644 index a8949a08e4..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/dispatcher2/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples/dispatcher2 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = dispatcher2.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher2/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher2/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile.am deleted file mode 100644 index 8aafacb7cd..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = dispatcher2.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile b/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile deleted file mode 100644 index 99b9236b48..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/markup/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples/markup -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = markup.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/markup/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/markup/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile.am deleted file mode 100644 index de7bc5f71f..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/markup/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = markup.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/options/Makefile b/libs/glibmm2/MSVC_Net2003/examples/options/Makefile deleted file mode 100644 index 75d80fa4cd..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/options/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/options/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples/options -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = options.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/options/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/options/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/options/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/options/Makefile.am deleted file mode 100644 index 91d27e519e..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/options/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = options.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile b/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile deleted file mode 100644 index 7d711f08f8..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/thread/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples/thread -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = thread.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile.am deleted file mode 100644 index 93a41289f9..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/thread/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = thread.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile b/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile deleted file mode 100644 index c5b139a852..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/examples/thread_pool/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/examples/thread_pool -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = thread_pool.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread_pool/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread_pool/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile.am b/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile.am deleted file mode 100644 index b0759e7c7d..0000000000 --- a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = thread_pool.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/gendef/Makefile b/libs/glibmm2/MSVC_Net2003/gendef/Makefile deleted file mode 100644 index b2d05ceccf..0000000000 --- a/libs/glibmm2/MSVC_Net2003/gendef/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/gendef/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/gendef -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = gendef.vcproj gendef.cc -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/gendef/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/gendef/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/glibmm.sln b/libs/glibmm2/MSVC_Net2003/glibmm.sln deleted file mode 100755 index 486f5112e1..0000000000 --- a/libs/glibmm2/MSVC_Net2003/glibmm.sln +++ /dev/null @@ -1,89 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glibmm-2.4", "glibmm\glibmm.vcproj", "{58B2B53C-C4FF-47FD-817B-095E45B7F7D4}" - ProjectSection(ProjectDependencies) = postProject - {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_markup", "examples\markup\markup.vcproj", "{6300FCFA-97F1-4967-802E-E354D95DB0EB}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_glibmm_value", "tests\glibmm_value\glibmm_value.vcproj", "{22277003-3228-486E-A6A8-994B8B13AF30}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread", "examples\thread\thread.vcproj", "{5357AB2B-A5F9-463C-92D8-00357CCC3ECE}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_thread_pool", "examples\thread_pool\thread_pool.vcproj", "{962484DB-2111-48A4-BEF0-194433719D0D}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher", "examples\dispatcher\dispatcher.vcproj", "{129ECC08-6D30-4884-B824-4AF96EF0A45C}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dispatcher2", "examples\dispatcher2\dispatcher2.vcproj", "{18A82706-B645-4DF5-AB09-06B90128BAC5}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_options", "examples\options\options.vcproj", "{46962B9A-C5E9-4863-9408-97514D63F420}" - ProjectSection(ProjectDependencies) = postProject - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} = {58B2B53C-C4FF-47FD-817B-095E45B7F7D4} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.ActiveCfg = Debug|Win32 - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Debug|Win32.Build.0 = Debug|Win32 - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.ActiveCfg = Release|Win32 - {58B2B53C-C4FF-47FD-817B-095E45B7F7D4}.Release|Win32.Build.0 = Release|Win32 - {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.ActiveCfg = Debug|Win32 - {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.Build.0 = Debug|Win32 - {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.ActiveCfg = Release|Win32 - {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.Build.0 = Release|Win32 - {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Debug|Win32.Build.0 = Debug|Win32 - {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.ActiveCfg = Release|Win32 - {6300FCFA-97F1-4967-802E-E354D95DB0EB}.Release|Win32.Build.0 = Release|Win32 - {22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.ActiveCfg = Debug|Win32 - {22277003-3228-486E-A6A8-994B8B13AF30}.Debug|Win32.Build.0 = Debug|Win32 - {22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.ActiveCfg = Release|Win32 - {22277003-3228-486E-A6A8-994B8B13AF30}.Release|Win32.Build.0 = Release|Win32 - {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.ActiveCfg = Debug|Win32 - {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Debug|Win32.Build.0 = Debug|Win32 - {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.ActiveCfg = Release|Win32 - {5357AB2B-A5F9-463C-92D8-00357CCC3ECE}.Release|Win32.Build.0 = Release|Win32 - {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.ActiveCfg = Debug|Win32 - {962484DB-2111-48A4-BEF0-194433719D0D}.Debug|Win32.Build.0 = Debug|Win32 - {962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.ActiveCfg = Release|Win32 - {962484DB-2111-48A4-BEF0-194433719D0D}.Release|Win32.Build.0 = Release|Win32 - {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.ActiveCfg = Debug|Win32 - {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Debug|Win32.Build.0 = Debug|Win32 - {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.ActiveCfg = Release|Win32 - {129ECC08-6D30-4884-B824-4AF96EF0A45C}.Release|Win32.Build.0 = Release|Win32 - {18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.ActiveCfg = Debug|Win32 - {18A82706-B645-4DF5-AB09-06B90128BAC5}.Debug|Win32.Build.0 = Debug|Win32 - {18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.ActiveCfg = Release|Win32 - {18A82706-B645-4DF5-AB09-06B90128BAC5}.Release|Win32.Build.0 = Release|Win32 - {46962B9A-C5E9-4863-9408-97514D63F420}.Debug|Win32.ActiveCfg = Debug|Win32 - {46962B9A-C5E9-4863-9408-97514D63F420}.Release|Win32.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/Makefile b/libs/glibmm2/MSVC_Net2003/glibmm/Makefile deleted file mode 100644 index b32a820893..0000000000 --- a/libs/glibmm2/MSVC_Net2003/glibmm/Makefile +++ /dev/null @@ -1,366 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/glibmm/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/glibmm -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/glibmm.rc.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = glibmm.rc -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -BUILT_SOURCES = glibmmconfig.h glibmm.rc -MAINTAINERCLEANFILES = $(built_sources) -EXTRA_DIST = glibmmconfig.h glibmm.vcproj glibmm.rc -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/glibmm/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/glibmm/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -glibmm.rc: $(top_builddir)/config.status $(srcdir)/glibmm.rc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile -installdirs: -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - - -# Copy config file generated by the configure script. Dependency is -# wht respect to the .h.in file, to prevent an error with 'make distcheck'. -# See http://sources.redhat.com/automake/automake.html#distcleancheck - -glibmmconfig.h: $(top_srcdir)/glib/glibmmconfig.h.in $(top_srcdir)/configure.in - cp -f $(top_builddir)/glib/glibmmconfig.h $@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.vcproj b/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.vcproj deleted file mode 100755 index 561b422134..0000000000 --- a/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/glibmmconfig.h b/libs/glibmm2/MSVC_Net2003/glibmm/glibmmconfig.h deleted file mode 100644 index 7cf16ed623..0000000000 --- a/libs/glibmm2/MSVC_Net2003/glibmm/glibmmconfig.h +++ /dev/null @@ -1,91 +0,0 @@ -/* glib/glibmmconfig.h. Generated by configure. */ -#ifndef _GLIBMM_CONFIG_H -#define _GLIBMM_CONFIG_H 1 - -/* version numbers */ -#define GLIBMM_MAJOR_VERSION 2 -#define GLIBMM_MINOR_VERSION 13 -#define GLIBMM_MICRO_VERSION 3 - -// detect common platforms -#if defined(_WIN32) -// Win32 compilers have a lot of varation -#if defined(_MSC_VER) -#define GLIBMM_MSC -#define GLIBMM_WIN32 -#define GLIBMM_DLL -#elif defined(__CYGWIN__) -#define GLIBMM_CONFIGURE -#elif defined(__MINGW32__) -#define GLIBMM_WIN32 -#define GLIBMM_DLL -#define GLIBMM_CONFIGURE -#else -//AIX clR compiler complains about this even though it doesn't get this far: -//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)" -#endif -#else -#define GLIBMM_CONFIGURE -#endif /* _WIN32 */ - -#ifdef GLIBMM_CONFIGURE -/* #undef GLIBMM_CXX_HAVE_MUTABLE */ -/* #undef GLIBMM_CXX_HAVE_NAMESPACES */ -//#undef GLIBMM_CXX_GAUB -//#undef GLIBMM_CXX_AMBIGUOUS_TEMPLATES -#define GLIBMM_HAVE_NAMESPACE_STD 1 -#define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1 -/* #undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR */ -#define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1 -#define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 -/* #undef GLIBMM_COMPILER_SUN_FORTE */ -/* #undef GLIBMM_DEBUG_REFCOUNTING */ -#define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 -#define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 -#define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 -#define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS 1 -#define GLIBMM_PROPERTIES_ENABLED 1 -#define GLIBMM_VFUNCS_ENABLED 1 -#define GLIBMM_EXCEPTIONS_ENABLED 1 -#define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1 -#endif - -#ifdef GLIBMM_MSC - #define GLIBMM_CXX_HAVE_MUTABLE 1 - #define GLIBMM_CXX_HAVE_NAMESPACES 1 - #define GLIBMM_HAVE_NAMESPACE_STD 1 - #define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1 - #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1 - #define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 - #define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 - #define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 - #define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 - #define GLIBMM_PROPERTIES_ENABLED 1 - #define GLIBMM_VFUNCS_ENABLED 1 - #define GLIBMM_EXCEPTIONS_ENABLED 1 - #define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1 - #pragma warning (disable: 4786 4355 4800 4181) -#endif - -#ifndef GLIBMM_HAVE_NAMESPACE_STD -# define GLIBMM_USING_STD(Symbol) namespace std { using ::Symbol; } -#else -# define GLIBMM_USING_STD(Symbol) /* empty */ -#endif - -#ifdef GLIBMM_DLL - #if defined(GLIBMM_BUILD) && defined(_WINDLL) - /* Do not dllexport as it is handled by gendef on MSVC */ - #define GLIBMM_API - #elif !defined(GLIBMM_BUILD) - #define GLIBMM_API __declspec(dllimport) - #else - /* Build a static library */ - #define GLIBMM_API - #endif /* GLIBMM_BUILD - _WINDLL */ -#else - #define GLIBMM_API -#endif /* GLIBMM_DLL */ - -#endif /* _GLIBMM_CONFIG_H */ - diff --git a/libs/glibmm2/MSVC_Net2003/tests/Makefile b/libs/glibmm2/MSVC_Net2003/tests/Makefile deleted file mode 100644 index 9f23a37abb..0000000000 --- a/libs/glibmm2/MSVC_Net2003/tests/Makefile +++ /dev/null @@ -1,506 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/tests/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -SUBDIRS = glibmm_value -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/tests/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/tests/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/tests/Makefile.am b/libs/glibmm2/MSVC_Net2003/tests/Makefile.am deleted file mode 100644 index 4b7007dd4b..0000000000 --- a/libs/glibmm2/MSVC_Net2003/tests/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = glibmm_value - - - diff --git a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile b/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile deleted file mode 100644 index 66c2d744b6..0000000000 --- a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# MSVC_Net2003/tests/glibmm_value/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = MSVC_Net2003/tests/glibmm_value -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -EXTRA_DIST = glibmm_value.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/tests/glibmm_value/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/tests/glibmm_value/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile.am b/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile.am deleted file mode 100644 index d4f2850731..0000000000 --- a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = glibmm_value.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile.in b/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile.in deleted file mode 100644 index 4f55df7d7d..0000000000 --- a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/Makefile.in +++ /dev/null @@ -1,349 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = MSVC_Net2003/tests/glibmm_value -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = glibmm_value.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/tests/glibmm_value/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/tests/glibmm_value/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/Makefile.in b/libs/glibmm2/Makefile.in index a6edbd4478..42dac0e7ef 100644 --- a/libs/glibmm2/Makefile.in +++ b/libs/glibmm2/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -42,8 +38,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ChangeLog INSTALL NEWS subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -52,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h $(top_builddir)/glib/glibmmconfig.h CONFIG_CLEAN_FILES = @@ -60,10 +56,13 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -78,8 +77,6 @@ GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -117,12 +114,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -136,13 +133,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -152,27 +146,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -184,28 +169,39 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I scripts SUBDIRS = tools glib examples docs scripts tests MSVC_Net2003 DIST_SUBDIRS = $(SUBDIRS) @@ -220,7 +216,7 @@ web_host = gtkmm.org web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.4/ #web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.4/ web_path_docs = $(web_path_gtkmm)docs/ -rsync_args = -vz --rsh ssh --delete --delete-after +rsync_args = -vz --rsh ssh gtkmm_docdir = $(datadir)/doc/glibmm-2.4/docs doc_tarball_files = \ docs/images/*.gif \ @@ -267,7 +263,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -289,7 +285,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -322,8 +317,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -425,24 +419,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/MSVC_Net2003/glibmm $(distdir)/build_shared $(distdir)/docs $(distdir)/docs/reference $(distdir)/glib $(distdir)/scripts $(distdir)/tools - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -456,7 +448,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -464,6 +456,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -474,7 +468,7 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -549,7 +543,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -619,12 +613,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -645,24 +647,26 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \ - am--refresh check check-am clean clean-generic clean-libtool \ - clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local am--refresh check check-am clean \ + clean-generic clean-libtool ctags ctags-recursive dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am all-local: diff --git a/libs/glibmm2/NEWS b/libs/glibmm2/NEWS index ec811b31ed..c65cc36191 100644 --- a/libs/glibmm2/NEWS +++ b/libs/glibmm2/NEWS @@ -1,5 +1,121 @@ +2.14.2: + +* Build: Hopefully fix the build on NetBSD-4.99.6/amd64. + Bug #386990. (was already in 2.12.7) (Murray Cumming) +* gmmproc: Added support for the new _CONFIGINCLUDE() macro. + (Armin Burgmeier) + +2.14.1: + +* Glib::wrap(): Don't fail when wrapping an interface that + is implemented by an unrecognized type. + gmmproc-generated code now uses the new wrap_auto_interface(), + so newly-generated source code will require this latest glibmm + version. +* Increase version number check for glib. + (Rémi Cardona) + +2.14: + +Changes sinze 2.12: + +* New Regex class, allowing string searching with regular expressions. + (Murray Cumming, Daniel Elstner) +* New KeyFile class. + (Rob Page, Jonathan Jongsma, Murray Cumming) +* Main: Added SignalTimeout::connect_seconds(). + (Murray Cumming) +* OptionContext: Added get/set_summary(), get/set_description(), + set_translation_domain() and set_translate_func(). + (Jonathan Jongsma) +* Added Glib::get_user_special_dir(), get_user_data_dir(), + get_user_config_dir(), and get_user_cache_dir(). + (Jonathan Jongsma, Murray Cumming) +* Improved documentation. + (Johannes Schmid, Jonathan Jongsma, Ralf Stephan) + +2.14.0: + +* Regex: + - Add escape_string(). + - match_full(): Rename to match(). + - match_all_full(): Rename to match_all(). + - split_full(): Rename to split(). + +2.13.9: + +* KeyFile: Added Added get_double(), set_double(), get_double_list() + and set_double_list(). + (Murray Cumming) + +2.13.8: + +* OptionContext: Added get/set_summary(), get/set_description(), set_translation_domain(), + and set_translate_func(). + (Jonathon Jongsma) +* Documenation: + Added RegEx class documentation. (Johannes Schmid) + Show new API in 2.14. + +2.13.7: + +* Regex: Added a create() method and added default parameter values. + Added a simple example. +* Added SignalTimeout::connect_seconds(), in addition to the existing + SignalTimeout::connect(), as a wrapper of g_timeout_add_seconds(). + Improveed the documentation. +* Added get_user_special_dir(). + (Murray Cumming) + +2.13.6: + +* Added Glib::Regex, an API for doing regular expression search/matching. + This is not fully wrapped yet, but the simple versions of the API are there. + We need to write an example for this. + (Murray Cumming) + +2.13.5: + +* Correctly ifdef-out initialization of deprecated classes. + (Johannes Schmid, Openismus) +* Build: Cope with newer m4 versions. (Yselkowitz) + +2.13.4: + +* Correct initialization when using --disable-deprecated for reduced code-size + on embedded devices. (Johannes Schmid, Openismus) +* Glib::ObjectBase::is_derived_() is now public, though it is still only for + internal use. This allows us to do some optimization of default signal handlers and + vfuncs. + (Armin Burgmeier, Openismus) +* Options: Don't overwrite default arguments. This change was lost in + March 2006, but now it is back. + (Armin Burgmeier) +* Dispatcher: Several minor implementation improvements. (Daniel Elstner) +* ustring: Minor improvements. (Daniel Elstner) +* Documentation: Actually use the signals documentation again. + (Armin Burgmeier, Openismus) +* Build: + - Fix code generation when using the latest m4, and functions named + mkstemp, as experienced on Ubuntu Feisty. + Bug #397167 (Dodji Seketeli, Daniel Elstner) + - helperlist.h: Avoid warnings about a shadowed member. + Bug #420316 from Bradley Bell. + - utility.h: Avoid a warning about a redundant declaration. + Bug #420339 from Bradley Bell. + 2.13.3: + +* Glib::ObjectBase::is_derived_() is now public, though it is still only for + internal use. This allows us to do some optimization of default signal handlers and + vfuncs. + (Armin Burgmeier, Openismus) +* Build: + - helperlist.h: Avoid warnings about a shadowed member. + Bug #420316 from Bradley Bell. + - utility.h: Avoid a warning about a redundant declaration. + Bug #420339 from Bradley Bell. * gmmproc improvements: - gmmproc: Allow () in property and signal docuemntation. - gmmproc: Do not try to remove a common prefix from the @@ -7,7 +123,6 @@ - enum.pl: Allow whitespace in front of an enum typedef. (Daniel Elstner) - enum.pl: Fix an infinite loop. - * ObjectBase: Added connect_property_changed(), as an alternative to use when the property proxies are not available because GLIBMM_PROPERTIES_ENABLED is not defined. diff --git a/libs/glibmm2/aclocal.m4 b/libs/glibmm2/aclocal.m4 index 3010e9d14d..315dca8abb 100644 --- a/libs/glibmm2/aclocal.m4 +++ b/libs/glibmm2/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +m4_if(m4_PACKAGE_VERSION, [2.60],, +[m4_fatal([this file was generated for autoconf 2.60. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,14 +26,29 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +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.10], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -85,14 +105,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -101,8 +121,10 @@ AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -116,15 +138,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -152,6 +173,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -217,6 +239,7 @@ AC_CACHE_CHECK([dependency style of $depcc], depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -269,7 +292,8 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -294,8 +318,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # 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. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -354,8 +379,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -378,16 +403,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -407,6 +436,9 @@ m4_ifval([$2], AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -442,6 +474,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -477,7 +513,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -584,14 +620,14 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # 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_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -607,6 +643,7 @@ AC_SUBST($1)]) # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -617,7 +654,7 @@ else fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -625,60 +662,23 @@ fi # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -790,9 +790,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. @@ -2456,10 +2468,27 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -7404,7 +7433,8 @@ installed software in a non-standard prefix. _PKG_TEXT ])], - [$4]) + [AC_MSG_RESULT([no]) + $4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it @@ -7423,6 +7453,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES +m4_include([scripts/c_std.m4]) m4_include([scripts/cxx.m4]) m4_include([scripts/cxx_std.m4]) m4_include([scripts/docgen.m4]) diff --git a/libs/glibmm2/config.h b/libs/glibmm2/config.h deleted file mode 100644 index 499aed41b4..0000000000 --- a/libs/glibmm2/config.h +++ /dev/null @@ -1,6 +0,0 @@ -/* config.h. Generated by configure. */ - -#define HAVE_FLOCKFILE 1 -#define HAVE_FUNLOCKFILE 1 -/* #undef GETC_UNLOCKED */ -#define HAVE_MKFIFO 1 diff --git a/libs/glibmm2/config.log b/libs/glibmm2/config.log deleted file mode 100644 index c02b9381fb..0000000000 --- a/libs/glibmm2/config.log +++ /dev/null @@ -1,1285 +0,0 @@ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by configure, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ ./configure - -## --------- ## -## Platform. ## -## --------- ## - -hostname = houllier -uname -m = i686 -uname -r = 2.6.20-16-lowlatency -uname -s = Linux -uname -v = #2 SMP PREEMPT Sun Sep 23 19:54:02 UTC 2007 - -/usr/bin/uname -p = unknown -/bin/uname -X = unknown - -/bin/arch = i686 -/usr/bin/arch -k = unknown -/usr/convex/getsysinfo = unknown -hostinfo = unknown -/bin/machine = unknown -/usr/bin/oslevel = unknown -/bin/universe = unknown - -PATH: /home/carl/bin -PATH: /usr/local/sbin -PATH: /usr/local/bin -PATH: /usr/sbin -PATH: /usr/bin -PATH: /sbin -PATH: /bin -PATH: /usr/games - - -## ----------- ## -## Core tests. ## -## ----------- ## - -configure:1629: checking for a BSD-compatible install -configure:1684: result: /usr/bin/install -c -configure:1695: checking whether build environment is sane -configure:1738: result: yes -configure:1803: checking for gawk -configure:1832: result: no -configure:1803: checking for mawk -configure:1819: found /usr/bin/mawk -configure:1829: result: mawk -configure:1839: checking whether make sets $(MAKE) -configure:1859: result: yes -configure:2030: checking whether to enable maintainer-specific portions of Makefiles -configure:2039: result: no -configure:2116: checking for gcc -configure:2132: found /usr/bin/gcc -configure:2142: result: gcc -configure:2386: checking for C compiler version -configure:2389: gcc --version &5 -gcc (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4) -Copyright (C) 2006 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:2392: $? = 0 -configure:2394: gcc -v &5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu -Thread model: posix -gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4) -configure:2397: $? = 0 -configure:2399: gcc -V &5 -gcc: '-V' option must have argument -configure:2402: $? = 1 -configure:2425: checking for C compiler default output file name -configure:2428: gcc conftest.c >&5 -configure:2431: $? = 0 -configure:2477: result: a.out -configure:2482: checking whether the C compiler works -configure:2488: ./a.out -configure:2491: $? = 0 -configure:2508: result: yes -configure:2515: checking whether we are cross compiling -configure:2517: result: no -configure:2520: checking for suffix of executables -configure:2522: gcc -o conftest conftest.c >&5 -configure:2525: $? = 0 -configure:2550: result: -configure:2556: checking for suffix of object files -configure:2577: gcc -c conftest.c >&5 -configure:2580: $? = 0 -configure:2602: result: o -configure:2606: checking whether we are using the GNU C compiler -configure:2630: gcc -c conftest.c >&5 -configure:2636: $? = 0 -configure:2640: test -z - || test ! -s conftest.err -configure:2643: $? = 0 -configure:2646: test -s conftest.o -configure:2649: $? = 0 -configure:2662: result: yes -configure:2668: checking whether gcc accepts -g -configure:2689: gcc -c -g conftest.c >&5 -configure:2695: $? = 0 -configure:2699: test -z - || test ! -s conftest.err -configure:2702: $? = 0 -configure:2705: test -s conftest.o -configure:2708: $? = 0 -configure:2719: result: yes -configure:2736: checking for gcc option to accept ANSI C -configure:2806: gcc -c -g -O2 conftest.c >&5 -configure:2812: $? = 0 -configure:2816: test -z - || test ! -s conftest.err -configure:2819: $? = 0 -configure:2822: test -s conftest.o -configure:2825: $? = 0 -configure:2843: result: none needed -configure:2861: gcc -c -g -O2 conftest.c >&5 -conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me' -configure:2867: $? = 1 -configure: failed program was: -| #ifndef __cplusplus -| choke me -| #endif -configure:3011: checking for style of include used by make -configure:3039: result: GNU -configure:3067: checking dependency style of gcc -configure:3157: result: gcc3 -configure:3179: checking how to run the C preprocessor -configure:3214: gcc -E conftest.c -configure:3220: $? = 0 -configure:3252: gcc -E conftest.c -conftest.c:14:28: error: ac_nonexistent.h: No such file or directory -configure:3258: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define GLIBMM_MAJOR_VERSION 2 -| #define GLIBMM_MINOR_VERSION 13 -| #define GLIBMM_MICRO_VERSION 3 -| #define PACKAGE "glibmm" -| #define VERSION "2.13.3" -| /* end confdefs.h. */ -| #include -configure:3297: result: gcc -E -configure:3321: gcc -E conftest.c -configure:3327: $? = 0 -configure:3359: gcc -E conftest.c -conftest.c:14:28: error: ac_nonexistent.h: No such file or directory -configure:3365: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define GLIBMM_MAJOR_VERSION 2 -| #define GLIBMM_MINOR_VERSION 13 -| #define GLIBMM_MICRO_VERSION 3 -| #define PACKAGE "glibmm" -| #define VERSION "2.13.3" -| /* end confdefs.h. */ -| #include -configure:3408: checking whether make sets $(MAKE) -configure:3428: result: yes -configure:3443: checking build system type -configure:3461: result: i686-pc-linux-gnu -configure:3469: checking host system type -configure:3483: result: i686-pc-linux-gnu -configure:3492: checking for some Win32 platform -configure:3502: result: no -configure:3515: checking for native Win32 -configure:3525: result: no -configure:3613: checking for a sed that does not truncate output -configure:3667: result: /bin/sed -configure:3670: checking for egrep -configure:3680: result: grep -E -configure:3696: checking for ld used by gcc -configure:3763: result: /usr/bin/ld -configure:3772: checking if the linker (/usr/bin/ld) is GNU ld -configure:3787: result: yes -configure:3792: checking for /usr/bin/ld option to reload object files -configure:3799: result: -r -configure:3817: checking for BSD-compatible nm -configure:3866: result: /usr/bin/nm -B -configure:3870: checking whether ln -s works -configure:3874: result: yes -configure:3881: checking how to recognise dependent libraries -configure:4057: result: pass_all -configure:4532: checking for ANSI C header files -configure:4557: gcc -c -g -O2 conftest.c >&5 -configure:4563: $? = 0 -configure:4567: test -z - || test ! -s conftest.err -configure:4570: $? = 0 -configure:4573: test -s conftest.o -configure:4576: $? = 0 -configure:4665: gcc -o conftest -g -O2 conftest.c >&5 -conftest.c: In function 'main': -conftest.c:31: warning: incompatible implicit declaration of built-in function 'exit' -configure:4668: $? = 0 -configure:4670: ./conftest -configure:4673: $? = 0 -configure:4688: result: yes -configure:4712: checking for sys/types.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for sys/stat.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for stdlib.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for string.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for memory.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for strings.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for inttypes.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for stdint.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4712: checking for unistd.h -configure:4728: gcc -c -g -O2 conftest.c >&5 -configure:4734: $? = 0 -configure:4738: test -z - || test ! -s conftest.err -configure:4741: $? = 0 -configure:4744: test -s conftest.o -configure:4747: $? = 0 -configure:4758: result: yes -configure:4784: checking dlfcn.h usability -configure:4796: gcc -c -g -O2 conftest.c >&5 -configure:4802: $? = 0 -configure:4806: test -z - || test ! -s conftest.err -configure:4809: $? = 0 -configure:4812: test -s conftest.o -configure:4815: $? = 0 -configure:4825: result: yes -configure:4829: checking dlfcn.h presence -configure:4839: gcc -E conftest.c -configure:4845: $? = 0 -configure:4865: result: yes -configure:4900: checking for dlfcn.h -configure:4907: result: yes -configure:4972: checking for g++ -configure:4988: found /usr/bin/g++ -configure:4998: result: g++ -configure:5014: checking for C++ compiler version -configure:5017: g++ --version &5 -g++ (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4) -Copyright (C) 2006 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:5020: $? = 0 -configure:5022: g++ -v &5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu -Thread model: posix -gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4) -configure:5025: $? = 0 -configure:5027: g++ -V &5 -g++: '-V' option must have argument -configure:5030: $? = 1 -configure:5033: checking whether we are using the GNU C++ compiler -configure:5057: g++ -c conftest.cc >&5 -configure:5063: $? = 0 -configure:5067: test -z - || test ! -s conftest.err -configure:5070: $? = 0 -configure:5073: test -s conftest.o -configure:5076: $? = 0 -configure:5089: result: yes -configure:5095: checking whether g++ accepts -g -configure:5116: g++ -c -g conftest.cc >&5 -configure:5122: $? = 0 -configure:5126: test -z - || test ! -s conftest.err -configure:5129: $? = 0 -configure:5132: test -s conftest.o -configure:5135: $? = 0 -configure:5146: result: yes -configure:5188: g++ -c -g -O2 conftest.cc >&5 -configure:5194: $? = 0 -configure:5198: test -z - || test ! -s conftest.err -configure:5201: $? = 0 -configure:5204: test -s conftest.o -configure:5207: $? = 0 -configure:5233: g++ -c -g -O2 conftest.cc >&5 -conftest.cc: In function 'int main()': -conftest.cc:29: error: 'exit' was not declared in this scope -configure:5239: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define GLIBMM_MAJOR_VERSION 2 -| #define GLIBMM_MINOR_VERSION 13 -| #define GLIBMM_MICRO_VERSION 3 -| #define PACKAGE "glibmm" -| #define VERSION "2.13.3" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_DLFCN_H 1 -| /* end confdefs.h. */ -| -| int -| main () -| { -| exit (42); -| ; -| return 0; -| } -configure:5188: g++ -c -g -O2 conftest.cc >&5 -configure:5194: $? = 0 -configure:5198: test -z - || test ! -s conftest.err -configure:5201: $? = 0 -configure:5204: test -s conftest.o -configure:5207: $? = 0 -configure:5233: g++ -c -g -O2 conftest.cc >&5 -configure:5239: $? = 0 -configure:5243: test -z - || test ! -s conftest.err -configure:5246: $? = 0 -configure:5249: test -s conftest.o -configure:5252: $? = 0 -configure:5277: checking dependency style of g++ -configure:5367: result: gcc3 -configure:5394: checking how to run the C++ preprocessor -configure:5425: g++ -E conftest.cc -configure:5431: $? = 0 -configure:5463: g++ -E conftest.cc -conftest.cc:28:28: error: ac_nonexistent.h: No such file or directory -configure:5469: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define GLIBMM_MAJOR_VERSION 2 -| #define GLIBMM_MINOR_VERSION 13 -| #define GLIBMM_MICRO_VERSION 3 -| #define PACKAGE "glibmm" -| #define VERSION "2.13.3" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_DLFCN_H 1 -| #ifdef __cplusplus -| extern "C" void std::exit (int) throw (); using std::exit; -| #endif -| /* end confdefs.h. */ -| #include -configure:5508: result: g++ -E -configure:5532: g++ -E conftest.cc -configure:5538: $? = 0 -configure:5570: g++ -E conftest.cc -conftest.cc:28:28: error: ac_nonexistent.h: No such file or directory -configure:5576: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define GLIBMM_MAJOR_VERSION 2 -| #define GLIBMM_MINOR_VERSION 13 -| #define GLIBMM_MICRO_VERSION 3 -| #define PACKAGE "glibmm" -| #define VERSION "2.13.3" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_DLFCN_H 1 -| #ifdef __cplusplus -| extern "C" void std::exit (int) throw (); using std::exit; -| #endif -| /* end confdefs.h. */ -| #include -configure:5673: checking for g77 -configure:5702: result: no -configure:5673: checking for f77 -configure:5702: result: no -configure:5673: checking for xlf -configure:5702: result: no -configure:5673: checking for frt -configure:5702: result: no -configure:5673: checking for pgf77 -configure:5702: result: no -configure:5673: checking for fort77 -configure:5702: result: no -configure:5673: checking for fl32 -configure:5702: result: no -configure:5673: checking for af77 -configure:5702: result: no -configure:5673: checking for f90 -configure:5702: result: no -configure:5673: checking for xlf90 -configure:5702: result: no -configure:5673: checking for pgf90 -configure:5702: result: no -configure:5673: checking for epcf90 -configure:5702: result: no -configure:5673: checking for f95 -configure:5702: result: no -configure:5673: checking for fort -configure:5702: result: no -configure:5673: checking for xlf95 -configure:5702: result: no -configure:5673: checking for ifc -configure:5702: result: no -configure:5673: checking for efc -configure:5702: result: no -configure:5673: checking for pgf95 -configure:5702: result: no -configure:5673: checking for lf95 -configure:5702: result: no -configure:5673: checking for gfortran -configure:5702: result: no -configure:5714: checking for Fortran 77 compiler version -configure:5717: --version &5 -./configure: line 5718: --version: command not found -configure:5720: $? = 127 -configure:5722: -v &5 -./configure: line 5723: -v: command not found -configure:5725: $? = 127 -configure:5727: -V &5 -./configure: line 5728: -V: command not found -configure:5730: $? = 127 -configure:5738: checking whether we are using the GNU Fortran 77 compiler -configure:5752: -c conftest.F >&5 -./configure: line 5753: -c: command not found -configure:5758: $? = 127 -configure: failed program was: -| program main -| #ifndef __GNUC__ -| choke me -| #endif -| -| end -configure:5784: result: no -configure:5790: checking whether accepts -g -configure:5802: -c -g conftest.f >&5 -./configure: line 5803: -c: command not found -configure:5808: $? = 127 -configure: failed program was: -| program main -| -| end -configure:5833: result: no -configure:5863: checking the maximum length of command line arguments -configure:5972: result: 32768 -configure:5983: checking command to parse /usr/bin/nm -B output from gcc object -configure:6088: gcc -c -g -O2 conftest.c >&5 -configure:6091: $? = 0 -configure:6095: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm -configure:6098: $? = 0 -configure:6150: gcc -o conftest -g -O2 conftest.c conftstm.o >&5 -configure:6153: $? = 0 -configure:6191: result: ok -configure:6195: checking for objdir -configure:6210: result: .libs -configure:6300: checking for ar -configure:6316: found /usr/bin/ar -configure:6327: result: ar -configure:6380: checking for ranlib -configure:6396: found /usr/bin/ranlib -configure:6407: result: ranlib -configure:6460: checking for strip -configure:6476: found /usr/bin/strip -configure:6487: result: strip -configure:6759: checking if gcc supports -fno-rtti -fno-exceptions -configure:6777: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5 -cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C -configure:6781: $? = 0 -configure:6794: result: no -configure:6809: checking for gcc option to produce PIC -configure:7019: result: -fPIC -configure:7027: checking if gcc PIC flag -fPIC works -configure:7045: gcc -c -g -O2 -fPIC -DPIC conftest.c >&5 -configure:7049: $? = 0 -configure:7062: result: yes -configure:7090: checking if gcc static flag -static works -configure:7118: result: yes -configure:7128: checking if gcc supports -c -o file.o -configure:7149: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5 -configure:7153: $? = 0 -configure:7175: result: yes -configure:7201: checking whether the gcc linker (/usr/bin/ld) supports shared libraries -configure:8159: result: yes -configure:8180: checking whether -lc should be explicitly linked in -configure:8185: gcc -c -g -O2 conftest.c >&5 -configure:8188: $? = 0 -configure:8203: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep -lc \>/dev/null 2\>\&1 -configure:8206: $? = 0 -configure:8218: result: no -configure:8226: checking dynamic linker characteristics -configure:8814: result: GNU/Linux ld.so -configure:8823: checking how to hardcode library paths into programs -configure:8848: result: immediate -configure:8862: checking whether stripping libraries is possible -configure:8867: result: yes -configure:9701: checking if libtool supports shared libraries -configure:9703: result: yes -configure:9706: checking whether to build shared libraries -configure:9727: result: yes -configure:9730: checking whether to build static libraries -configure:9734: result: no -configure:9826: creating libtool -configure:10414: checking for ld used by g++ -configure:10481: result: /usr/bin/ld -configure:10490: checking if the linker (/usr/bin/ld) is GNU ld -configure:10505: result: yes -configure:10556: checking whether the g++ linker (/usr/bin/ld) supports shared libraries -configure:11494: result: yes -configure:11512: g++ -c -g -O2 conftest.cpp >&5 -configure:11515: $? = 0 -configure:11634: checking for g++ option to produce PIC -configure:11908: result: -fPIC -configure:11916: checking if g++ PIC flag -fPIC works -configure:11934: g++ -c -g -O2 -fPIC -DPIC conftest.cpp >&5 -configure:11938: $? = 0 -configure:11951: result: yes -configure:11979: checking if g++ static flag -static works -configure:12007: result: yes -configure:12017: checking if g++ supports -c -o file.o -configure:12038: g++ -c -g -O2 -o out/conftest2.o conftest.cpp >&5 -configure:12042: $? = 0 -configure:12064: result: yes -configure:12090: checking whether the g++ linker (/usr/bin/ld) supports shared libraries -configure:12115: result: yes -configure:12182: checking dynamic linker characteristics -configure:12770: result: GNU/Linux ld.so -configure:12779: checking how to hardcode library paths into programs -configure:12804: result: immediate -configure:18960: checking for gm4 -configure:18989: result: no -configure:18960: checking for m4 -configure:18976: found /usr/bin/m4 -configure:18986: result: m4 -configure:18999: checking whether m4 is GNU m4 -configure:19005: result: no -configure:19019: checking whether make is GNU Make -configure:19022: result: yes -configure:19044: checking for perl -configure:19062: found /usr/bin/perl -configure:19074: result: /usr/bin/perl -configure:19088: checking whether Perl is new enough -configure:19098: result: yes -configure:19136: checking for flockfile -configure:19193: gcc -o conftest -g -O2 conftest.c >&5 -configure:19199: $? = 0 -configure:19203: test -z - || test ! -s conftest.err -configure:19206: $? = 0 -configure:19209: test -s conftest -configure:19212: $? = 0 -configure:19224: result: yes -configure:19136: checking for funlockfile -configure:19193: gcc -o conftest -g -O2 conftest.c >&5 -configure:19199: $? = 0 -configure:19203: test -z - || test ! -s conftest.err -configure:19206: $? = 0 -configure:19209: test -s conftest -configure:19212: $? = 0 -configure:19224: result: yes -configure:19136: checking for getc_unlocked -configure:19193: gcc -o conftest -g -O2 conftest.c >&5 -configure:19199: $? = 0 -configure:19203: test -z - || test ! -s conftest.err -configure:19206: $? = 0 -configure:19209: test -s conftest -configure:19212: $? = 0 -configure:19224: result: yes -configure:19136: checking for mkfifo -configure:19193: gcc -o conftest -g -O2 conftest.c >&5 -configure:19199: $? = 0 -configure:19203: test -z - || test ! -s conftest.err -configure:19206: $? = 0 -configure:19209: test -s conftest -configure:19212: $? = 0 -configure:19224: result: yes -configure:19289: checking for pkg-config -configure:19307: found /usr/bin/pkg-config -configure:19319: result: /usr/bin/pkg-config -configure:19334: checking pkg-config is at least version 0.9.0 -configure:19337: result: yes -configure:19348: checking for GLIBMM -configure:19356: $PKG_CONFIG --exists --print-errors "sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version}" -configure:19359: $? = 0 -configure:19374: $PKG_CONFIG --exists --print-errors "sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version}" -configure:19377: $? = 0 -configure:19453: result: yes -configure:19463: checking for GTHREAD -configure:19471: $PKG_CONFIG --exists --print-errors "gthread-2.0 >= ${gtkmm_min_glib_version}" -configure:19474: $? = 0 -configure:19489: $PKG_CONFIG --exists --print-errors "gthread-2.0 >= ${gtkmm_min_glib_version}" -configure:19492: $? = 0 -configure:19526: result: yes -configure:19631: checking for C++ compiler version -configure:19634: g++ --version &5 -g++ (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4) -Copyright (C) 2006 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -configure:19637: $? = 0 -configure:19639: g++ -v &5 -Using built-in specs. -Target: i486-linux-gnu -Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu -Thread model: posix -gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4) -configure:19642: $? = 0 -configure:19644: g++ -V &5 -g++: '-V' option must have argument -configure:19647: $? = 1 -configure:19650: checking whether we are using the GNU C++ compiler -configure:19706: result: yes -configure:19712: checking whether g++ accepts -g -configure:19763: result: yes -configure:19805: g++ -c -g -O2 conftest.cc >&5 -configure:19811: $? = 0 -configure:19815: test -z - || test ! -s conftest.err -configure:19818: $? = 0 -configure:19821: test -s conftest.o -configure:19824: $? = 0 -configure:19850: g++ -c -g -O2 conftest.cc >&5 -configure:19856: $? = 0 -configure:19860: test -z - || test ! -s conftest.err -configure:19863: $? = 0 -configure:19866: test -s conftest.o -configure:19869: $? = 0 -configure:19894: checking dependency style of g++ -configure:19984: result: gcc3 -configure:20003: checking whether we are using SUN CC compiler -configure:20009: g++ -V 2>&1 -configure:20012: $? = 1 -configure:20020: result: no -configure:20081: checking if C++ compiler supports bool -configure:20105: g++ -c -g -O2 conftest.cc >&5 -configure:20111: $? = 0 -configure:20115: test -z - || test ! -s conftest.err -configure:20118: $? = 0 -configure:20121: test -s conftest.o -configure:20124: $? = 0 -configure:20128: result: yes -configure:20146: checking if C++ compiler supports namespaces -configure:20170: g++ -c -g -O2 conftest.cc >&5 -configure:20176: $? = 0 -configure:20180: test -z - || test ! -s conftest.err -configure:20183: $? = 0 -configure:20186: test -s conftest.o -configure:20189: $? = 0 -configure:20193: result: yes -configure:20211: checking if C++ compiler supports mutable -configure:20236: g++ -c -g -O2 conftest.cc >&5 -configure:20242: $? = 0 -configure:20246: test -z - || test ! -s conftest.err -configure:20249: $? = 0 -configure:20252: test -s conftest.o -configure:20255: $? = 0 -configure:20259: result: yes -configure:20277: checking if C++ environment provides all required features -configure:20286: result: yes -configure:20290: checking whether C++ library symbols are declared in namespace std -configure:20325: g++ -c -g -O2 conftest.cc >&5 -configure:20331: $? = 0 -configure:20335: test -z - || test ! -s conftest.err -configure:20338: $? = 0 -configure:20341: test -s conftest.o -configure:20344: $? = 0 -configure:20357: result: yes -configure:20373: checking whether the C++ library supports std::iterator_traits -configure:20402: g++ -c -g -O2 conftest.cc >&5 -configure:20408: $? = 0 -configure:20412: test -z - || test ! -s conftest.err -configure:20415: $? = 0 -configure:20418: test -s conftest.o -configure:20421: $? = 0 -configure:20434: result: yes -configure:20450: checking for non-standard Sun libCstd reverse_iterator -configure:20479: g++ -c -g -O2 conftest.cc >&5 -conftest.cc: In function 'int main()': -conftest.cc:44: error: wrong number of template arguments (6, should be 1) -/usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../include/c++/4.1.2/bits/stl_iterator.h:92: error: provided for 'template class std::reverse_iterator' -conftest.cc:44: error: invalid type in declaration before ';' token -configure:20485: $? = 1 -configure: failed program was: -| /* confdefs.h. */ -| -| #define PACKAGE_NAME "" -| #define PACKAGE_TARNAME "" -| #define PACKAGE_VERSION "" -| #define PACKAGE_STRING "" -| #define PACKAGE_BUGREPORT "" -| #define GLIBMM_MAJOR_VERSION 2 -| #define GLIBMM_MINOR_VERSION 13 -| #define GLIBMM_MICRO_VERSION 3 -| #define PACKAGE "glibmm" -| #define VERSION "2.13.3" -| #define STDC_HEADERS 1 -| #define HAVE_SYS_TYPES_H 1 -| #define HAVE_SYS_STAT_H 1 -| #define HAVE_STDLIB_H 1 -| #define HAVE_STRING_H 1 -| #define HAVE_MEMORY_H 1 -| #define HAVE_STRINGS_H 1 -| #define HAVE_INTTYPES_H 1 -| #define HAVE_STDINT_H 1 -| #define HAVE_UNISTD_H 1 -| #define HAVE_DLFCN_H 1 -| #ifdef __cplusplus -| extern "C" void std::exit (int) throw (); using std::exit; -| #endif -| #define HAVE_FLOCKFILE 1 -| #define HAVE_FUNLOCKFILE 1 -| #define HAVE_GETC_UNLOCKED 1 -| #define HAVE_MKFIFO 1 -| #define GLIBMM_HAVE_NAMESPACE_STD 1 -| #define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1 -| /* end confdefs.h. */ -| -| #include -| #ifdef GLIBMM_HAVE_NAMESPACE_STD -| using namespace std; -| #endif -| -| int -| main () -| { -| -| typedef reverse_iterator ReverseIter; -| -| ; -| return 0; -| } -configure:20511: result: no -configure:20527: checking whether STL containers have templated sequence constructors -configure:20562: g++ -c -g -O2 conftest.cc >&5 -configure:20568: $? = 0 -configure:20572: test -z - || test ! -s conftest.err -configure:20575: $? = 0 -configure:20578: test -s conftest.o -configure:20581: $? = 0 -configure:20594: result: yes -configure:20608: checking if C++ compiler allows member functions to refer to member templates -configure:20658: g++ -c -g -O2 conftest.cc >&5 -configure:20664: $? = 0 -configure:20668: test -z - || test ! -s conftest.err -configure:20671: $? = 0 -configure:20674: test -s conftest.o -configure:20677: $? = 0 -configure:20686: result: yes -configure:20708: checking whether the compiler finds it ambiguous to have both const and non-const template specializations -configure:20767: g++ -c -g -O2 conftest.cc >&5 -configure:20773: $? = 0 -configure:20777: test -z - || test ! -s conftest.err -configure:20780: $? = 0 -configure:20783: test -s conftest.o -configure:20786: $? = 0 -configure:20799: result: yes -configure:20813: checking whether the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined -configure:20854: g++ -c -g -O2 conftest.cc >&5 -configure:20860: $? = 0 -configure:20864: test -z - || test ! -s conftest.err -configure:20867: $? = 0 -configure:20870: test -s conftest.o -configure:20873: $? = 0 -configure:20886: result: yes -configure:20900: checking whether the the compilerallows us to use a non-extern "C" function for an extern "C" function pointer. -configure:20939: g++ -c -g -O2 conftest.cc >&5 -configure:20945: $? = 0 -configure:20949: test -z - || test ! -s conftest.err -configure:20952: $? = 0 -configure:20955: test -s conftest.o -configure:20958: $? = 0 -configure:20971: result: yes -configure:20985: checking whether the compiler uses namespace declarations inside extern "C" blocks. -configure:21038: g++ -c -g -O2 conftest.cc >&5 -configure:21044: $? = 0 -configure:21048: test -z - || test ! -s conftest.err -configure:21051: $? = 0 -configure:21054: test -s conftest.o -configure:21057: $? = 0 -configure:21070: result: yes -configure:21086: checking whether the compiler allows a static member variable to be initialized inline to std::string::npos -configure:21121: g++ -c -g -O2 conftest.cc >&5 -configure:21127: $? = 0 -configure:21131: test -z - || test ! -s conftest.err -configure:21134: $? = 0 -configure:21137: test -s conftest.o -configure:21140: $? = 0 -configure:21153: result: yes -configure:21187: checking whether to merge C reference docs into generated headers -configure:21198: result: no -configure:21283: checking for compiler warning flags to use -configure:21328: result: -Wall -Wno-long-long -configure:21359: WARNING: Deprecated API will be built, for backwards-compatibility. -configure:21629: creating ./config.status - -## ---------------------- ## -## Running config.status. ## -## ---------------------- ## - -This file was extended by config.status, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = - CONFIG_HEADERS = - CONFIG_LINKS = - CONFIG_COMMANDS = - $ ./config.status - -on houllier - -config.status:787: creating Makefile -config.status:787: creating glib/Makefile -config.status:787: creating glib/glibmm-2.4.pc -config.status:787: creating glib/src/Makefile -config.status:787: creating glib/glibmm/Makefile -config.status:787: creating glib/glibmm/private/Makefile -config.status:787: creating tools/Makefile -config.status:787: creating tools/gmmproc -config.status:787: creating tools/generate_wrap_init.pl -config.status:787: creating tools/m4/Makefile -config.status:787: creating tools/pm/Makefile -config.status:787: creating tools/extra_defs_gen/Makefile -config.status:787: creating tests/Makefile -config.status:787: creating tests/glibmm_value/Makefile -config.status:787: creating examples/Makefile -config.status:787: creating examples/markup/Makefile -config.status:787: creating examples/options/Makefile -config.status:787: creating examples/thread/Makefile -config.status:787: creating examples/iochannel_stream/Makefile -config.status:787: creating examples/child_watch/Makefile -config.status:787: creating scripts/Makefile -config.status:787: creating docs/Makefile -config.status:787: creating docs/images/Makefile -config.status:787: creating docs/reference/Makefile -config.status:787: creating docs/reference/Doxyfile -config.status:787: creating docs/reference/beautify_docs.pl -config.status:787: creating docs/internal/Makefile -config.status:787: creating MSVC_Net2003/Makefile -config.status:787: creating MSVC_Net2003/gendef/Makefile -config.status:787: creating MSVC_Net2003/glibmm/Makefile -config.status:787: creating MSVC_Net2003/glibmm/glibmm.rc -config.status:787: creating MSVC_Net2003/examples/Makefile -config.status:787: creating MSVC_Net2003/examples/dispatcher/Makefile -config.status:787: creating MSVC_Net2003/examples/dispatcher2/Makefile -config.status:787: creating MSVC_Net2003/examples/markup/Makefile -config.status:787: creating MSVC_Net2003/examples/options/Makefile -config.status:787: creating MSVC_Net2003/examples/thread/Makefile -config.status:787: creating MSVC_Net2003/examples/thread_pool/Makefile -config.status:787: creating MSVC_Net2003/tests/Makefile -config.status:787: creating MSVC_Net2003/tests/glibmm_value/Makefile -config.status:891: creating config.h -config.status:1048: config.h is unchanged -config.status:891: creating glib/glibmmconfig.h -config.status:1228: executing depfiles commands - -## ---------------- ## -## Cache variables. ## -## ---------------- ## - -ac_cv_build=i686-pc-linux-gnu -ac_cv_build_alias=i686-pc-linux-gnu -ac_cv_c_compiler_gnu=yes -ac_cv_cxx_compiler_gnu=yes -ac_cv_env_CC_set= -ac_cv_env_CC_value= -ac_cv_env_CFLAGS_set= -ac_cv_env_CFLAGS_value= -ac_cv_env_CPPFLAGS_set= -ac_cv_env_CPPFLAGS_value= -ac_cv_env_CPP_set= -ac_cv_env_CPP_value= -ac_cv_env_CXXCPP_set= -ac_cv_env_CXXCPP_value= -ac_cv_env_CXXFLAGS_set= -ac_cv_env_CXXFLAGS_value= -ac_cv_env_CXX_set= -ac_cv_env_CXX_value= -ac_cv_env_F77_set= -ac_cv_env_F77_value= -ac_cv_env_FFLAGS_set= -ac_cv_env_FFLAGS_value= -ac_cv_env_GLIBMM_CFLAGS_set= -ac_cv_env_GLIBMM_CFLAGS_value= -ac_cv_env_GLIBMM_LIBS_set= -ac_cv_env_GLIBMM_LIBS_value= -ac_cv_env_GTHREAD_CFLAGS_set= -ac_cv_env_GTHREAD_CFLAGS_value= -ac_cv_env_GTHREAD_LIBS_set= -ac_cv_env_GTHREAD_LIBS_value= -ac_cv_env_LDFLAGS_set= -ac_cv_env_LDFLAGS_value= -ac_cv_env_PKG_CONFIG_set= -ac_cv_env_PKG_CONFIG_value= -ac_cv_env_build_alias_set= -ac_cv_env_build_alias_value= -ac_cv_env_host_alias_set= -ac_cv_env_host_alias_value= -ac_cv_env_target_alias_set= -ac_cv_env_target_alias_value= -ac_cv_exeext= -ac_cv_f77_compiler_gnu=no -ac_cv_func_flockfile=yes -ac_cv_func_funlockfile=yes -ac_cv_func_getc_unlocked=yes -ac_cv_func_mkfifo=yes -ac_cv_header_dlfcn_h=yes -ac_cv_header_inttypes_h=yes -ac_cv_header_memory_h=yes -ac_cv_header_stdc=yes -ac_cv_header_stdint_h=yes -ac_cv_header_stdlib_h=yes -ac_cv_header_string_h=yes -ac_cv_header_strings_h=yes -ac_cv_header_sys_stat_h=yes -ac_cv_header_sys_types_h=yes -ac_cv_header_unistd_h=yes -ac_cv_host=i686-pc-linux-gnu -ac_cv_host_alias=i686-pc-linux-gnu -ac_cv_objext=o -ac_cv_path_PERL_PATH=/usr/bin/perl -ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config -ac_cv_path_install='/usr/bin/install -c' -ac_cv_prog_AWK=mawk -ac_cv_prog_CPP='gcc -E' -ac_cv_prog_CXXCPP='g++ -E' -ac_cv_prog_M4=m4 -ac_cv_prog_ac_ct_AR=ar -ac_cv_prog_ac_ct_CC=gcc -ac_cv_prog_ac_ct_CXX=g++ -ac_cv_prog_ac_ct_RANLIB=ranlib -ac_cv_prog_ac_ct_STRIP=strip -ac_cv_prog_cc_g=yes -ac_cv_prog_cc_stdc= -ac_cv_prog_cxx_g=yes -ac_cv_prog_egrep='grep -E' -ac_cv_prog_f77_g=no -ac_cv_prog_make_make_set=yes -ac_cv_prog_sun_cxx=no -am_cv_CC_dependencies_compiler_type=gcc3 -am_cv_CXX_dependencies_compiler_type=gcc3 -glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks=yes -glibmm_cv_cxx_can_disambiguate_const_template_specializations=yes -glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition=yes -glibmm_cv_cxx_can_use_namespaces_inside_externc=yes -glibmm_cv_perl_version_5_6_0=yes -gtkmm_cv_cxx_has_allows_static_inline_npos=yes -gtkmm_cv_cxx_has_namespace_std=yes -gtkmm_cv_cxx_has_std_iterator_traits=yes -gtkmm_cv_cxx_has_sun_reverse_iterator=no -gtkmm_cv_cxx_has_template_sequence_ctors=yes -lt_cv_deplibs_check_method=pass_all -lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_ld_reload_flag=-r -lt_cv_objdir=.libs -lt_cv_path_LD=/usr/bin/ld -lt_cv_path_LDCXX=/usr/bin/ld -lt_cv_path_NM='/usr/bin/nm -B' -lt_cv_path_SED=/bin/sed -lt_cv_prog_compiler_c_o=yes -lt_cv_prog_compiler_c_o_CXX=yes -lt_cv_prog_compiler_rtti_exceptions=no -lt_cv_prog_gnu_ld=yes -lt_cv_prog_gnu_ldcxx=yes -lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\''' -lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr) \&\2},/p'\''' -lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p'\''' -lt_cv_sys_max_cmd_len=32768 -lt_lt_cv_prog_compiler_c_o='"yes"' -lt_lt_cv_prog_compiler_c_o_CXX='"yes"' -lt_lt_cv_sys_global_symbol_pipe='"sed -n -e '\''s/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'\''"' -lt_lt_cv_sys_global_symbol_to_c_name_address='"sed -n -e '\''s/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'\''"' -lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern int \\1;/p'\''"' -pkg_cv_GLIBMM_CFLAGS='-I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ' -pkg_cv_GLIBMM_LIBS='-Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 ' -pkg_cv_GTHREAD_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ' -pkg_cv_GTHREAD_LIBS='-pthread -lgthread-2.0 -lrt -lglib-2.0 ' - -## ----------------- ## -## Output variables. ## -## ----------------- ## - -ACLOCAL='${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts' -AMDEPBACKSLASH='\' -AMDEP_FALSE='#' -AMDEP_TRUE='' -AMTAR='${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar' -AR='ar' -AS='as' -AUTOCONF='${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf' -AUTOHEADER=':' -AUTOMAKE='${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9' -AWK='mawk' -CC='gcc' -CCDEPMODE='depmode=gcc3' -CFLAGS='-g -O2' -CPP='gcc -E' -CPPFLAGS='' -CXX='g++' -CXXCPP='g++ -E' -CXXDEPMODE='depmode=gcc3' -CXXFLAGS='-g -O2 -Wall -Wno-long-long' -CYGPATH_W='echo' -DEFS='-DHAVE_CONFIG_H' -DEPDIR='.deps' -DISABLE_DEPRECATED_API_CFLAGS='' -DISABLE_DEPRECATED_CFLAGS='' -DLLTOOL='dlltool' -ECHO='echo' -ECHO_C='' -ECHO_N='-n' -ECHO_T='' -EGREP='grep -E' -EXEEXT='' -F77='' -FFLAGS='' -GLIBMM_CFLAGS='-I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ' -GLIBMM_LIBS='-Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 ' -GLIBMM_MAJOR_VERSION='2' -GLIBMM_MICRO_VERSION='3' -GLIBMM_MINOR_VERSION='13' -GLIBMM_RELEASE='2.13' -GLIBMM_VERSION='2.13.3' -GTHREAD_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ' -GTHREAD_LIBS='-pthread -lgthread-2.0 -lrt -lglib-2.0 ' -GTKMMPROC_MERGECDOCS='' -GTKMM_DOXYGEN_INPUT=' /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/' -GTKMM_FALSE_FALSE='' -GTKMM_FALSE_TRUE='#' -INSTALL_DATA='${INSTALL} -m 644' -INSTALL_PROGRAM='${INSTALL}' -INSTALL_SCRIPT='${INSTALL}' -INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s' -LDFLAGS='' -LIBGLIBMM_SO_VERSION='1:24:0' -LIBOBJS='' -LIBS='' -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -LN_S='ln -s' -LTLIBOBJS='' -M4='m4' -MAINT='#' -MAINTAINER_MODE_FALSE='' -MAINTAINER_MODE_TRUE='#' -MAKEINFO='${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo' -OBJDUMP='objdump' -OBJEXT='o' -OS_WIN32_FALSE='' -OS_WIN32_TRUE='#' -PACKAGE='glibmm' -PACKAGE_BUGREPORT='' -PACKAGE_NAME='' -PACKAGE_STRING='' -PACKAGE_TARNAME='' -PACKAGE_VERSION='' -PATH_SEPARATOR=':' -PERL_PATH='/usr/bin/perl' -PKG_CONFIG='/usr/bin/pkg-config' -PLATFORM_WIN32_FALSE='' -PLATFORM_WIN32_TRUE='#' -RANLIB='ranlib' -SET_MAKE='' -SHELL='/bin/bash' -STRIP='strip' -VERSION='2.13.3' -ac_ct_AR='ar' -ac_ct_AS='' -ac_ct_CC='gcc' -ac_ct_CXX='g++' -ac_ct_DLLTOOL='' -ac_ct_F77='' -ac_ct_OBJDUMP='' -ac_ct_RANLIB='ranlib' -ac_ct_STRIP='strip' -ac_pt_PKG_CONFIG='/usr/bin/pkg-config' -am__fastdepCC_FALSE='#' -am__fastdepCC_TRUE='' -am__fastdepCXX_FALSE='#' -am__fastdepCXX_TRUE='' -am__include='include' -am__leading_dot='.' -am__quote='' -am__tar='${AMTAR} chof - "$$tardir"' -am__untar='${AMTAR} xf -' -bindir='${exec_prefix}/bin' -build='i686-pc-linux-gnu' -build_alias='' -build_cpu='i686' -build_os='linux-gnu' -build_vendor='pc' -datadir='${prefix}/share' -exec_prefix='${prefix}' -host='i686-pc-linux-gnu' -host_alias='' -host_cpu='i686' -host_os='linux-gnu' -host_vendor='pc' -includedir='${prefix}/include' -infodir='${prefix}/info' -install_sh='/home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh' -libdir='${exec_prefix}/lib' -libexecdir='${exec_prefix}/libexec' -localstatedir='${prefix}/var' -mandir='${prefix}/man' -mkdir_p='mkdir -p --' -oldincludedir='/usr/include' -prefix='/usr/local' -program_transform_name='s,x,x,' -sbindir='${exec_prefix}/sbin' -sharedstatedir='${prefix}/com' -sysconfdir='${prefix}/etc' -target_alias='' - -## ----------- ## -## confdefs.h. ## -## ----------- ## - -#define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 -#define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 -#define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 -#define GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED 1 -#define GLIBMM_EXCEPTIONS_ENABLED 1 -#define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS 1 -#define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 -#define GLIBMM_HAVE_NAMESPACE_STD 1 -#define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1 -#define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1 -#define GLIBMM_MAJOR_VERSION 2 -#define GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES 1 -#define GLIBMM_MICRO_VERSION 3 -#define GLIBMM_MINOR_VERSION 13 -#define GLIBMM_PROPERTIES_ENABLED 1 -#define GLIBMM_VFUNCS_ENABLED 1 -#define HAVE_DLFCN_H 1 -#define HAVE_FLOCKFILE 1 -#define HAVE_FUNLOCKFILE 1 -#define HAVE_GETC_UNLOCKED 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_MKFIFO 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_UNISTD_H 1 -#define PACKAGE "glibmm" -#define PACKAGE_BUGREPORT "" -#define PACKAGE_NAME "" -#define PACKAGE_STRING "" -#define PACKAGE_TARNAME "" -#define PACKAGE_VERSION "" -#define STDC_HEADERS 1 -#define VERSION "2.13.3" -#endif -#ifdef __cplusplus -extern "C" void std::exit (int) throw (); using std::exit; - -configure: exit 0 diff --git a/libs/glibmm2/config.status b/libs/glibmm2/config.status deleted file mode 100644 index 443f453f22..0000000000 --- a/libs/glibmm2/config.status +++ /dev/null @@ -1,1319 +0,0 @@ -#! /bin/bash -# Generated by configure. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/bash} -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -config_files=" Makefile glib/Makefile glib/glibmm-2.4.pc glib/src/Makefile glib/glibmm/Makefile glib/glibmm/private/Makefile tools/Makefile tools/gmmproc tools/generate_wrap_init.pl tools/m4/Makefile tools/pm/Makefile tools/extra_defs_gen/Makefile tests/Makefile tests/glibmm_value/Makefile examples/Makefile examples/markup/Makefile examples/options/Makefile examples/thread/Makefile examples/iochannel_stream/Makefile examples/child_watch/Makefile scripts/Makefile docs/Makefile docs/images/Makefile docs/reference/Makefile docs/reference/Doxyfile docs/reference/beautify_docs.pl docs/internal/Makefile MSVC_Net2003/Makefile MSVC_Net2003/gendef/Makefile MSVC_Net2003/glibmm/Makefile MSVC_Net2003/glibmm/glibmm.rc MSVC_Net2003/examples/Makefile MSVC_Net2003/examples/dispatcher/Makefile MSVC_Net2003/examples/dispatcher2/Makefile MSVC_Net2003/examples/markup/Makefile MSVC_Net2003/examples/options/Makefile MSVC_Net2003/examples/thread/Makefile MSVC_Net2003/examples/thread_pool/Makefile MSVC_Net2003/tests/Makefile MSVC_Net2003/tests/glibmm_value/Makefile" -config_headers=" config.h glib/glibmmconfig.h" -config_commands=" depfiles" - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." -ac_cs_version="\ -config.status -configured by ./configure, generated by GNU Autoconf 2.59, - with options \"\" - -Copyright (C) 2003 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=. -INSTALL="/usr/bin/install -c" -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -if $ac_cs_recheck; then - echo "running /bin/bash ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6 - exec /bin/bash ./configure $ac_configure_extra_args --no-create --no-recursion -fi - -# -# INIT-COMMANDS section. -# - -AMDEP_TRUE="" ac_aux_dir="scripts" - -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "glib/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/Makefile" ;; - "glib/glibmm-2.4.pc" ) CONFIG_FILES="$CONFIG_FILES glib/glibmm-2.4.pc" ;; - "glib/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/src/Makefile" ;; - "glib/glibmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/glibmm/Makefile" ;; - "glib/glibmm/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/glibmm/private/Makefile" ;; - "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tools/gmmproc" ) CONFIG_FILES="$CONFIG_FILES tools/gmmproc" ;; - "tools/generate_wrap_init.pl" ) CONFIG_FILES="$CONFIG_FILES tools/generate_wrap_init.pl" ;; - "tools/m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/m4/Makefile" ;; - "tools/pm/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/pm/Makefile" ;; - "tools/extra_defs_gen/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/extra_defs_gen/Makefile" ;; - "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "tests/glibmm_value/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/glibmm_value/Makefile" ;; - "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/markup/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/markup/Makefile" ;; - "examples/options/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/options/Makefile" ;; - "examples/thread/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/thread/Makefile" ;; - "examples/iochannel_stream/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/iochannel_stream/Makefile" ;; - "examples/child_watch/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/child_watch/Makefile" ;; - "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/images/Makefile" ;; - "docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; - "docs/reference/Doxyfile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; - "docs/reference/beautify_docs.pl" ) CONFIG_FILES="$CONFIG_FILES docs/reference/beautify_docs.pl" ;; - "docs/internal/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/internal/Makefile" ;; - "MSVC_Net2003/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/Makefile" ;; - "MSVC_Net2003/gendef/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gendef/Makefile" ;; - "MSVC_Net2003/glibmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/glibmm/Makefile" ;; - "MSVC_Net2003/glibmm/glibmm.rc" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/glibmm/glibmm.rc" ;; - "MSVC_Net2003/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/Makefile" ;; - "MSVC_Net2003/examples/dispatcher/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dispatcher/Makefile" ;; - "MSVC_Net2003/examples/dispatcher2/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dispatcher2/Makefile" ;; - "MSVC_Net2003/examples/markup/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/markup/Makefile" ;; - "MSVC_Net2003/examples/options/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/options/Makefile" ;; - "MSVC_Net2003/examples/thread/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/thread/Makefile" ;; - "MSVC_Net2003/examples/thread_pool/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/thread_pool/Makefile" ;; - "MSVC_Net2003/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/tests/Makefile" ;; - "MSVC_Net2003/tests/glibmm_value/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/tests/glibmm_value/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "glib/glibmmconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS glib/glibmmconfig.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF -s,@SHELL@,/bin/bash,;t t -s,@PATH_SEPARATOR@,:,;t t -s,@PACKAGE_NAME@,,;t t -s,@PACKAGE_TARNAME@,,;t t -s,@PACKAGE_VERSION@,,;t t -s,@PACKAGE_STRING@,,;t t -s,@PACKAGE_BUGREPORT@,,;t t -s,@exec_prefix@,${prefix},;t t -s,@prefix@,/usr/local,;t t -s,@program_transform_name@,s,x,x,,;t t -s,@bindir@,${exec_prefix}/bin,;t t -s,@sbindir@,${exec_prefix}/sbin,;t t -s,@libexecdir@,${exec_prefix}/libexec,;t t -s,@datadir@,${prefix}/share,;t t -s,@sysconfdir@,${prefix}/etc,;t t -s,@sharedstatedir@,${prefix}/com,;t t -s,@localstatedir@,${prefix}/var,;t t -s,@libdir@,${exec_prefix}/lib,;t t -s,@includedir@,${prefix}/include,;t t -s,@oldincludedir@,/usr/include,;t t -s,@infodir@,${prefix}/info,;t t -s,@mandir@,${prefix}/man,;t t -s,@build_alias@,,;t t -s,@host_alias@,,;t t -s,@target_alias@,,;t t -s,@DEFS@,-DHAVE_CONFIG_H,;t t -s,@ECHO_C@,,;t t -s,@ECHO_N@,-n,;t t -s,@ECHO_T@,,;t t -s,@LIBS@,,;t t -s,@GLIBMM_MAJOR_VERSION@,2,;t t -s,@GLIBMM_MINOR_VERSION@,13,;t t -s,@GLIBMM_MICRO_VERSION@,3,;t t -s,@GLIBMM_VERSION@,2.13.3,;t t -s,@GLIBMM_RELEASE@,2.13,;t t -s,@LIBGLIBMM_SO_VERSION@,1:24:0,;t t -s,@INSTALL_PROGRAM@,${INSTALL},;t t -s,@INSTALL_SCRIPT@,${INSTALL},;t t -s,@INSTALL_DATA@,${INSTALL} -m 644,;t t -s,@CYGPATH_W@,echo,;t t -s,@PACKAGE@,glibmm,;t t -s,@VERSION@,2.13.3,;t t -s,@ACLOCAL@,${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts,;t t -s,@AUTOCONF@,${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf,;t t -s,@AUTOMAKE@,${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9,;t t -s,@AUTOHEADER@,:,;t t -s,@MAKEINFO@,${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo,;t t -s,@install_sh@,/home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh,;t t -s,@STRIP@,strip,;t t -s,@ac_ct_STRIP@,strip,;t t -s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t -s,@mkdir_p@,mkdir -p --,;t t -s,@AWK@,mawk,;t t -s,@SET_MAKE@,,;t t -s,@am__leading_dot@,.,;t t -s,@AMTAR@,${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar,;t t -s,@am__tar@,${AMTAR} chof - "$$tardir",;t t -s,@am__untar@,${AMTAR} xf -,;t t -s,@MAINTAINER_MODE_TRUE@,#,;t t -s,@MAINTAINER_MODE_FALSE@,,;t t -s,@MAINT@,#,;t t -s,@CC@,gcc,;t t -s,@CFLAGS@,-g -O2,;t t -s,@LDFLAGS@,,;t t -s,@CPPFLAGS@,,;t t -s,@ac_ct_CC@,gcc,;t t -s,@EXEEXT@,,;t t -s,@OBJEXT@,o,;t t -s,@DEPDIR@,.deps,;t t -s,@am__include@,include,;t t -s,@am__quote@,,;t t -s,@AMDEP_TRUE@,,;t t -s,@AMDEP_FALSE@,#,;t t -s,@AMDEPBACKSLASH@,\,;t t -s,@CCDEPMODE@,depmode=gcc3,;t t -s,@am__fastdepCC_TRUE@,,;t t -s,@am__fastdepCC_FALSE@,#,;t t -s,@CPP@,gcc -E,;t t -s,@build@,i686-pc-linux-gnu,;t t -s,@build_cpu@,i686,;t t -s,@build_vendor@,pc,;t t -s,@build_os@,linux-gnu,;t t -s,@host@,i686-pc-linux-gnu,;t t -s,@host_cpu@,i686,;t t -s,@host_vendor@,pc,;t t -s,@host_os@,linux-gnu,;t t -s,@PLATFORM_WIN32_TRUE@,#,;t t -s,@PLATFORM_WIN32_FALSE@,,;t t -s,@OS_WIN32_TRUE@,#,;t t -s,@OS_WIN32_FALSE@,,;t t -s,@EGREP@,grep -E,;t t -s,@LN_S@,ln -s,;t t -s,@ECHO@,echo,;t t -s,@AR@,ar,;t t -s,@ac_ct_AR@,ar,;t t -s,@RANLIB@,ranlib,;t t -s,@ac_ct_RANLIB@,ranlib,;t t -s,@DLLTOOL@,dlltool,;t t -s,@ac_ct_DLLTOOL@,,;t t -s,@AS@,as,;t t -s,@ac_ct_AS@,,;t t -s,@OBJDUMP@,objdump,;t t -s,@ac_ct_OBJDUMP@,,;t t -s,@CXX@,g++,;t t -s,@CXXFLAGS@,-g -O2 -Wall -Wno-long-long,;t t -s,@ac_ct_CXX@,g++,;t t -s,@CXXDEPMODE@,depmode=gcc3,;t t -s,@am__fastdepCXX_TRUE@,,;t t -s,@am__fastdepCXX_FALSE@,#,;t t -s,@CXXCPP@,g++ -E,;t t -s,@F77@,,;t t -s,@FFLAGS@,,;t t -s,@ac_ct_F77@,,;t t -s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t -s,@M4@,m4,;t t -s,@PERL_PATH@,/usr/bin/perl,;t t -s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t -s,@ac_pt_PKG_CONFIG@,/usr/bin/pkg-config,;t t -s,@GLIBMM_CFLAGS@,-I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ,;t t -s,@GLIBMM_LIBS@,-Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 ,;t t -s,@GTHREAD_CFLAGS@,-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ,;t t -s,@GTHREAD_LIBS@,-pthread -lgthread-2.0 -lrt -lglib-2.0 ,;t t -s,@GTKMM_DOXYGEN_INPUT@, /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/,;t t -s,@GTKMMPROC_MERGECDOCS@,,;t t -s,@DISABLE_DEPRECATED_CFLAGS@,,;t t -s,@DISABLE_DEPRECATED_API_CFLAGS@,,;t t -s,@GTKMM_FALSE_TRUE@,#,;t t -s,@GTKMM_FALSE_FALSE@,,;t t -s,@LIBOBJS@,,;t t -s,@LTLIBOBJS@,,;t t -CEOF - - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - sed "/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -} - -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - - # Handle all the #define templates only if necessary. - if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then - # If there are no defines, we may have an empty if/fi - : - cat >$tmp/defines.sed <$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - fi # grep - - # Handle all the #undef templates - cat >$tmp/undefs.sed <$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - cat >$tmp/undefs.sed <$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file - fi - else - cat $tmp/config.h - rm -f $tmp/config.h - fi -# Compute $ac_file's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; 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=`(dirname "$file") 2>/dev/null || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - esac -done - -{ (exit 0); exit 0; } diff --git a/libs/glibmm2/configure b/libs/glibmm2/configure old mode 100755 new mode 100644 index fe22ab05df..3d074a173d --- a/libs/glibmm2/configure +++ b/libs/glibmm2/configure @@ -1,8 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.60. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -16,66 +17,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. +# PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -96,124 +46,464 @@ if test "${PATH_SEPARATOR+set}" != set; then rm -f conf$$.sh fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done +IFS=$as_save_IFS - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +512,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,15 +533,6 @@ 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'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -395,29 +688,26 @@ tagnames=${tagnames+${tagnames},}CXX tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 &1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -454,17 +744,167 @@ ac_includes_default="\ #endif #if HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif +#endif +#if HAVE_STDINT_H +# include #endif #if HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GLIBMM_MAJOR_VERSION GLIBMM_MINOR_VERSION GLIBMM_MICRO_VERSION GLIBMM_VERSION GLIBMM_RELEASE LIBGLIBMM_SO_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE OS_WIN32_TRUE OS_WIN32_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL M4 PERL_PATH PKG_CONFIG ac_pt_PKG_CONFIG GLIBMM_CFLAGS GLIBMM_LIBS GTHREAD_CFLAGS GTHREAD_LIBS GTKMM_DOXYGEN_INPUT GTKMMPROC_MERGECDOCS DISABLE_DEPRECATED_CFLAGS DISABLE_DEPRECATED_API_CFLAGS GTKMM_FALSE_TRUE GTKMM_FALSE_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +GLIBMM_MAJOR_VERSION +GLIBMM_MINOR_VERSION +GLIBMM_MICRO_VERSION +GLIBMM_VERSION +GLIBMM_RELEASE +LIBGLIBMM_SO_VERSION +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +am__isrc +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +CPP +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +PLATFORM_WIN32_TRUE +PLATFORM_WIN32_FALSE +OS_WIN32_TRUE +OS_WIN32_FALSE +GREP +EGREP +LN_S +ECHO +AR +RANLIB +DLLTOOL +AS +OBJDUMP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CXXCPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +M4 +PERL_PATH +PKG_CONFIG +GLIBMM_CFLAGS +GLIBMM_LIBS +GTHREAD_CFLAGS +GTHREAD_LIBS +GTKMM_DOXYGEN_INPUT +GTKMMPROC_MERGECDOCS +DISABLE_DEPRECATED_CFLAGS +DISABLE_DEPRECATED_API_CFLAGS +GTKMM_FALSE_TRUE +GTKMM_FALSE_FALSE +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS +PKG_CONFIG +GLIBMM_CFLAGS +GLIBMM_LIBS +GTHREAD_CFLAGS +GTHREAD_LIBS' + # Initialize some variables set by options. ac_init_help= @@ -491,34 +931,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -540,12 +994,18 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. @@ -553,7 +1013,17 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` @@ -562,11 +1032,7 @@ do { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -593,6 +1059,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -617,13 +1089,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -688,6 +1163,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -744,11 +1229,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -757,7 +1238,7 @@ do { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -788,8 +1269,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -809,27 +1289,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -856,114 +1328,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS -ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_env_PKG_CONFIG_value=$PKG_CONFIG -ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} -ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG -ac_env_GLIBMM_CFLAGS_set=${GLIBMM_CFLAGS+set} -ac_env_GLIBMM_CFLAGS_value=$GLIBMM_CFLAGS -ac_cv_env_GLIBMM_CFLAGS_set=${GLIBMM_CFLAGS+set} -ac_cv_env_GLIBMM_CFLAGS_value=$GLIBMM_CFLAGS -ac_env_GLIBMM_LIBS_set=${GLIBMM_LIBS+set} -ac_env_GLIBMM_LIBS_value=$GLIBMM_LIBS -ac_cv_env_GLIBMM_LIBS_set=${GLIBMM_LIBS+set} -ac_cv_env_GLIBMM_LIBS_value=$GLIBMM_LIBS -ac_env_GTHREAD_CFLAGS_set=${GTHREAD_CFLAGS+set} -ac_env_GTHREAD_CFLAGS_value=$GTHREAD_CFLAGS -ac_cv_env_GTHREAD_CFLAGS_set=${GTHREAD_CFLAGS+set} -ac_cv_env_GTHREAD_CFLAGS_value=$GTHREAD_CFLAGS -ac_env_GTHREAD_LIBS_set=${GTHREAD_LIBS+set} -ac_env_GTHREAD_LIBS_value=$GTHREAD_LIBS -ac_cv_env_GTHREAD_LIBS_set=${GTHREAD_LIBS+set} -ac_cv_env_GTHREAD_LIBS_value=$GTHREAD_LIBS + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -992,9 +1426,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -1012,15 +1443,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1047,10 +1485,8 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-static[=PKGS] - build static libraries [default=no] - --enable-shared[=PKGS] - build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) @@ -1079,16 +1515,15 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] Some influential environment variables: CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags @@ -1108,118 +1543,86 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.60 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +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 $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1238,7 +1641,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1252,6 +1655,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1273,7 +1677,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1284,7 +1687,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1306,9 +1709,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1319,8 +1720,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1333,20 +1734,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1357,22 +1772,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1384,26 +1805,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1434,14 +1853,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1457,8 +1879,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1470,12 +1892,11 @@ fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1500,8 +1921,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1518,6 +1938,22 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi + + + + + + + + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1526,30 +1962,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - ######################################################################### # Version and initialization ######################################################################### GLIBMM_MAJOR_VERSION=2 -GLIBMM_MINOR_VERSION=13 -GLIBMM_MICRO_VERSION=3 +GLIBMM_MINOR_VERSION=14 +GLIBMM_MICRO_VERSION=2 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION @@ -1584,35 +2003,42 @@ LIBGLIBMM_SO_VERSION=1:24:0 ac_aux_dir= -for ac_dir in scripts $srcdir/scripts; do - if test -f $ac_dir/install-sh; then +for ac_dir in scripts "$srcdir"/scripts; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts $srcdir/scripts" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in scripts $srcdir/scripts" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + VERSION=$GLIBMM_VERSION PACKAGE=glibmm -am__api_version="1.9" +am__api_version='1.10' + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1626,8 +2052,8 @@ am__api_version="1.9" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1649,7 +2075,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1668,21 +2094,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1692,8 +2119,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1735,20 +2162,20 @@ echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1763,45 +2190,60 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # 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 +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1814,54 +2256,57 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1874,12 +2319,16 @@ else fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -1922,7 +2371,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -1932,8 +2381,8 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1946,32 +2395,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1984,33 +2435,47 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2025,22 +2490,20 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - ac_config_headers="$ac_config_headers config.h glib/glibmmconfig.h" +ac_config_headers="$ac_config_headers config.h glib/glibmmconfig.h" -echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 - # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no -fi; - echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 +fi - -if test $USE_MAINTAINER_MODE = yes; then + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' else @@ -2075,8 +2538,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2089,32 +2552,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2127,36 +2592,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2169,74 +2649,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2250,7 +2690,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2261,6 +2701,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2278,22 +2719,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2306,36 +2748,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2348,29 +2792,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2383,21 +2843,35 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2422,46 +2896,70 @@ ac_clean_files="$ac_clean_files a.out 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. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2474,19 +2972,23 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2505,22 +3007,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2531,9 +3038,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2547,14 +3053,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2574,14 +3080,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2599,12 +3111,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2627,24 +3139,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2653,24 +3177,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2686,24 +3214,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2712,12 +3252,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2733,12 +3392,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2772,12 +3431,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2792,205 +3456,74 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2998,7 +3531,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -3008,8 +3541,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -3036,22 +3569,20 @@ if test "$am__include" = "#"; then fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -3061,11 +3592,10 @@ fi - depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3129,6 +3659,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3154,13 +3685,11 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -3176,8 +3705,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3211,8 +3740,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3237,9 +3771,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3249,8 +3784,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3277,6 +3817,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3294,8 +3835,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3318,8 +3859,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3344,9 +3890,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3356,8 +3903,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -3384,6 +3936,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3405,92 +3958,122 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes @@ -3499,11 +4082,9 @@ case "$host" in platform_win32=no ;; esac -echo "$as_me:$LINENO: result: $platform_win32" >&5 -echo "${ECHO_T}$platform_win32" >&6 - - -if test "$platform_win32" = "yes"; then +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } + if test "$platform_win32" = "yes"; then PLATFORM_WIN32_TRUE= PLATFORM_WIN32_FALSE='#' else @@ -3512,8 +4093,8 @@ else fi -echo "$as_me:$LINENO: checking for native Win32" >&5 -echo $ECHO_N "checking for native Win32... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for native Win32" >&5 +echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } case "$host" in *-*-mingw*) os_win32=yes @@ -3522,11 +4103,9 @@ case "$host" in os_win32=no ;; esac -echo "$as_me:$LINENO: result: $os_win32" >&5 -echo "${ECHO_T}$os_win32" >&6 - - -if test "$os_win32" = "yes"; then +{ echo "$as_me:$LINENO: result: $os_win32" >&5 +echo "${ECHO_T}$os_win32" >&6; } + if test "$os_win32" = "yes"; then OS_WIN32_TRUE= OS_WIN32_FALSE='#' else @@ -3535,10 +4114,9 @@ else fi -# Check whether --enable-static or --disable-static was given. +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -3557,15 +4135,15 @@ if test "${enable_static+set}" = set; then esac else enable_static=no -fi; +fi -# Check whether --enable-shared or --disable-shared was given. + +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -3584,12 +4162,12 @@ if test "${enable_shared+set}" = set; then esac else enable_shared=yes -fi; +fi -# Check whether --enable-fast-install or --disable-fast-install was given. + +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -3608,10 +4186,11 @@ if test "${enable_fast_install+set}" = set; then esac else enable_fast_install=yes -fi; +fi -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3664,37 +4243,184 @@ done fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -3723,11 +4449,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3760,17 +4486,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3784,20 +4510,20 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -3814,8 +4540,8 @@ case $host_os in ;; esac -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3863,23 +4589,23 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4054,8 +4780,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4073,11 +4799,11 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -4104,7 +4830,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4107 "configure"' > conftest.$ac_ext + echo '#line 4833 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4189,8 +4915,8 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4216,24 +4942,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4242,9 +4980,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4253,8 +4992,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -4284,8 +5023,8 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4298,32 +5037,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4336,27 +5077,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false" fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - DLLTOOL=$ac_ct_DLLTOOL + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi else DLLTOOL="$ac_cv_prog_DLLTOOL" fi @@ -4364,8 +5119,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4378,32 +5133,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6 + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4416,27 +5173,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false" fi fi ac_ct_AS=$ac_cv_prog_ac_ct_AS if test -n "$ac_ct_AS"; then - echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AS=$ac_ct_AS + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi else AS="$ac_cv_prog_AS" fi @@ -4444,8 +5215,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4458,32 +5229,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4496,27 +5269,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false" fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - OBJDUMP=$ac_ct_OBJDUMP + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi else OBJDUMP="$ac_cv_prog_OBJDUMP" fi @@ -4529,8 +5316,8 @@ need_locks="$enable_libtool_lock" -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4554,24 +5341,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4580,9 +5379,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -4638,6 +5438,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -4657,18 +5458,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4681,12 +5491,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + fi fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -4709,9 +5521,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -4725,24 +5537,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4751,12 +5575,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -4771,18 +5597,19 @@ done for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4793,24 +5620,36 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -4819,15 +5658,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4836,8 +5676,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -4861,9 +5706,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -4887,25 +5733,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -4917,18 +5757,22 @@ fi done -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4941,36 +5785,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4983,55 +5829,85 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5054,24 +5930,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5080,24 +5968,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5113,24 +6005,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5139,12 +6043,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -5160,113 +6183,7 @@ else CXXFLAGS= fi fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5274,8 +6191,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5339,6 +6256,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -5364,13 +6282,11 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -5386,13 +6302,13 @@ fi if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5422,8 +6338,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5448,9 +6369,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5460,8 +6382,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5488,6 +6415,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5505,8 +6433,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -5529,8 +6457,13 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5555,9 +6488,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5567,8 +6501,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -5595,6 +6534,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -5610,7 +6550,7 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5624,12 +6564,12 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5642,36 +6582,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5684,48 +6626,78 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:5714:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -5735,8 +6707,8 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5749,24 +6721,36 @@ else end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5775,20 +6759,21 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5799,24 +6784,36 @@ cat >conftest.$ac_ext <<_ACEOF end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5825,13 +6822,14 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -5860,8 +6858,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5969,19 +6967,19 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6185,15 +7183,15 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6207,8 +7205,8 @@ else fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -6259,8 +7257,8 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6273,32 +7271,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6311,27 +7311,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -6339,8 +7353,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6353,32 +7367,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6391,27 +7407,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -6419,8 +7449,8 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6433,32 +7463,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6471,27 +7503,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -6550,8 +7596,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6603,17 +7649,17 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6665,11 +7711,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -6684,21 +7730,21 @@ esac enable_dlopen=no enable_win32_dll=yes -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -6756,8 +7802,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6774,11 +7820,11 @@ else -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:6777: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7823: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6781: \$? = $ac_status" >&5 + echo "$as_me:7827: \$? = $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. @@ -6791,8 +7837,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -6806,8 +7852,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7016,16 +8062,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7042,11 +8088,11 @@ else -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:7045: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8091: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7049: \$? = $ac_status" >&5 + echo "$as_me:8095: \$? = $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. @@ -7059,8 +8105,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -7087,8 +8133,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7115,8 +8161,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } if test x"$lt_prog_compiler_static_works" = xyes; then : @@ -7125,8 +8171,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7146,11 +8192,11 @@ else -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:7149: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8195: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7153: \$? = $ac_status" >&5 + echo "$as_me:8199: \$? = $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 @@ -7172,23 +8218,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -7198,8 +8244,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -7614,24 +8660,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7645,8 +8703,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -7675,24 +8735,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7706,8 +8778,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8156,8 +9230,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -8177,8 +9251,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8215,16 +9289,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -8611,10 +9685,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 9692 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -8811,8 +9906,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -8820,8 +9915,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -8845,8 +9940,8 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -8859,29 +9954,29 @@ fi striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -8913,8 +10008,8 @@ else darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8927,40 +10022,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -8969,14 +10076,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -8990,8 +10098,8 @@ fi ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9018,53 +10126,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9073,18 +10187,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shl_load=no + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9097,40 +10212,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9139,19 +10266,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_load=no + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9178,53 +10306,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9233,18 +10367,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_dlopen=no + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9257,40 +10392,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9299,19 +10446,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9324,40 +10472,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9366,19 +10526,20 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_svld_dlopen=no + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9391,40 +10552,52 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9433,14 +10606,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_dld_link=no + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -9480,8 +10654,8 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9491,7 +10665,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9591,7 +10765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -9698,13 +10872,13 @@ fi # Report which library types will actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -9724,15 +10898,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -10224,11 +11398,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -10282,7 +11456,7 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10401,18 +11575,18 @@ if test "$GXX" = yes; then # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -10441,11 +11615,11 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10478,17 +11652,17 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10502,8 +11676,8 @@ case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -10553,8 +11727,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -10666,24 +11840,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10697,8 +11883,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10728,24 +11916,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -10759,8 +11959,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11491,8 +12693,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -11631,8 +12833,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -11905,16 +13107,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11931,11 +13133,11 @@ else -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:11934: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13136: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11938: \$? = $ac_status" >&5 + echo "$as_me:13140: \$? = $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. @@ -11948,8 +13150,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -11976,8 +13178,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12004,8 +13206,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } if test x"$lt_prog_compiler_static_works_CXX" = xyes; then : @@ -12014,8 +13216,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12035,11 +13237,11 @@ else -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:12038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13240: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12042: \$? = $ac_status" >&5 + echo "$as_me:13244: \$? = $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 @@ -12061,23 +13263,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -12087,8 +13289,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -12112,8 +13314,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -12133,8 +13335,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -12171,16 +13373,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -12567,10 +13769,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 13776 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12767,8 +13990,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -12776,8 +13999,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -12801,8 +14024,8 @@ else # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -13327,13 +14550,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -13352,15 +14575,15 @@ aix4* | aix5*) fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -13369,8 +14592,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -13579,16 +14802,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13605,11 +14828,11 @@ else -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:13608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14831: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13612: \$? = $ac_status" >&5 + echo "$as_me:14835: \$? = $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. @@ -13622,8 +14845,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -13650,8 +14873,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13678,8 +14901,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } if test x"$lt_prog_compiler_static_works_F77" = xyes; then : @@ -13688,8 +14911,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13709,11 +14932,11 @@ else -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:13712: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14935: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13716: \$? = $ac_status" >&5 + echo "$as_me:14939: \$? = $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 @@ -13735,23 +14958,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -13761,8 +14984,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -14167,24 +15390,36 @@ _LT_EOF end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14198,8 +15433,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14218,24 +15455,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_f77_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14249,8 +15498,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -14699,8 +15950,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no # @@ -14720,8 +15971,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -14758,16 +16009,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -15154,10 +16405,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 16412 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15354,8 +16626,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -15363,8 +16635,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -15388,8 +16660,8 @@ else # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -15826,7 +17098,6 @@ CC="$lt_save_CC" if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -15894,8 +17165,8 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15912,11 +17183,11 @@ else -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:15915: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17186: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15919: \$? = $ac_status" >&5 + echo "$as_me:17190: \$? = $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. @@ -15929,8 +17200,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -15944,8 +17215,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -16154,16 +17425,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16180,11 +17451,11 @@ else -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:16183: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17454: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16187: \$? = $ac_status" >&5 + echo "$as_me:17458: \$? = $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. @@ -16197,8 +17468,8 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -16225,8 +17496,8 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16253,8 +17524,8 @@ else LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then : @@ -16263,8 +17534,8 @@ else fi -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16284,11 +17555,11 @@ else -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:16287: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17558: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16291: \$? = $ac_status" >&5 + echo "$as_me:17562: \$? = $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 @@ -16310,23 +17581,23 @@ else $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16336,8 +17607,8 @@ else need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -16752,24 +18023,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -16783,8 +18066,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16813,24 +18098,36 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -16844,8 +18141,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17294,8 +18593,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no # @@ -17315,8 +18614,8 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -17353,16 +18652,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -17749,10 +19048,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 19055 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17949,8 +19269,8 @@ uts4*) dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -17958,8 +19278,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -17983,8 +19303,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported @@ -18420,7 +19740,6 @@ CC="$lt_save_CC" RC) - # Source file extension for RC test sources. ac_ext=rc @@ -18957,8 +20276,8 @@ for ac_prog in gm4 m4 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_M4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18971,39 +20290,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_M4="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi M4=$ac_cv_prog_M4 if test -n "$M4"; then - echo "$as_me:$LINENO: result: $M4" >&5 -echo "${ECHO_T}$M4" >&6 + { echo "$as_me:$LINENO: result: $M4" >&5 +echo "${ECHO_T}$M4" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$M4" && break done test -n "$M4" || M4="m4" if test "$M4" = "m4"; then - echo "$as_me:$LINENO: checking whether m4 is GNU m4" >&5 -echo $ECHO_N "checking whether m4 is GNU m4... $ECHO_C" >&6 - if $M4 --version /dev/null | grep '^GNU m4 ' >/dev/null ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: checking whether m4 is GNU m4" >&5 +echo $ECHO_N "checking whether m4 is GNU m4... $ECHO_C" >&6; } + if $M4 --version /dev/null | grep '^GNU Mm4 ' >/dev/null ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } if test "$host_vendor" = "sun"; then { { echo "$as_me:$LINENO: error: SUN m4 does not work for building gtkmm. Please install GNU m4." >&5 @@ -19016,14 +20337,14 @@ fi -echo "$as_me:$LINENO: checking whether make is GNU Make" >&5 -echo $ECHO_N "checking whether make is GNU Make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether make is GNU Make" >&5 +echo $ECHO_N "checking whether make is GNU Make... $ECHO_C" >&6; } if ${MAKE-make} --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } if test "$host_vendor" = "sun" ; then { { echo "$as_me:$LINENO: error: SUN make does not work for building gtkmm. Please install GNU make." >&5 @@ -19041,8 +20362,8 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PERL_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19057,27 +20378,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL_PATH="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PERL_PATH=$ac_cv_path_PERL_PATH - if test -n "$PERL_PATH"; then - echo "$as_me:$LINENO: result: $PERL_PATH" >&5 -echo "${ECHO_T}$PERL_PATH" >&6 + { echo "$as_me:$LINENO: result: $PERL_PATH" >&5 +echo "${ECHO_T}$PERL_PATH" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$PERL_PATH" && break done test -n "$PERL_PATH" || PERL_PATH="not found" @@ -19085,8 +20407,8 @@ test -n "$PERL_PATH" || PERL_PATH="not found" if test "x$PERL_PATH" != "xnot found"; then { - echo "$as_me:$LINENO: checking whether Perl is new enough" >&5 -echo $ECHO_N "checking whether Perl is new enough... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether Perl is new enough" >&5 +echo $ECHO_N "checking whether Perl is new enough... $ECHO_C" >&6; } if test "${glibmm_cv_perl_version_5_6_0+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19095,8 +20417,8 @@ else "$PERL_PATH" -e "require v5.6.0; exit 0;" >/dev/null 2>&1 && glibmm_cv_perl_version_5_6_0=yes fi -echo "$as_me:$LINENO: result: $glibmm_cv_perl_version_5_6_0" >&5 -echo "${ECHO_T}$glibmm_cv_perl_version_5_6_0" >&6 +{ echo "$as_me:$LINENO: result: $glibmm_cv_perl_version_5_6_0" >&5 +echo "${ECHO_T}$glibmm_cv_perl_version_5_6_0" >&6; } test "x${glibmm_cv_perl_version_5_6_0}" = xyes && glibmm_perl_result=yes } else @@ -19133,9 +20455,9 @@ echo "$as_me: error: for ac_func in flockfile funlockfile getc_unlocked mkfifo do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -19161,53 +20483,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19216,13 +20544,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -19236,7 +20566,7 @@ done # Dependancy checks ######################################################################### gtkmm_min_sigc_version=2.0.0 -gtkmm_min_glib_version=2.9.0 +gtkmm_min_glib_version=2.14.0 @@ -19244,8 +20574,8 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19260,34 +20590,35 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19302,28 +20633,42 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - PKG_CONFIG=$ac_pt_PKG_CONFIG + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi else PKG_CONFIG="$ac_cv_path_PKG_CONFIG" fi @@ -19331,22 +20676,22 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } PKG_CONFIG="" fi fi pkg_failed=no -echo "$as_me:$LINENO: checking for GLIBMM" >&5 -echo $ECHO_N "checking for GLIBMM... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for GLIBMM" >&5 +echo $ECHO_N "checking for GLIBMM... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$GLIBMM_CFLAGS"; then @@ -19450,8 +20795,8 @@ See \`config.log' for more details." >&2;} else GLIBMM_CFLAGS=$pkg_cv_GLIBMM_CFLAGS GLIBMM_LIBS=$pkg_cv_GLIBMM_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi @@ -19460,8 +20805,8 @@ fi # gthread isn't a requirement, but we should use its CFLAGS if available. pkg_failed=no -echo "$as_me:$LINENO: checking for GTHREAD" >&5 -echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for GTHREAD" >&5 +echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6; } if test -n "$PKG_CONFIG"; then if test -n "$GTHREAD_CFLAGS"; then @@ -19517,14 +20862,16 @@ fi # Put the nasty error message in config.log where it belongs echo "$GTHREAD_PKG_ERRORS" >&5 - GTHREAD_CFLAGS=''; GTHREAD_LIBS='' + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + GTHREAD_CFLAGS=''; GTHREAD_LIBS='' elif test $pkg_failed = untried; then GTHREAD_CFLAGS=''; GTHREAD_LIBS='' else GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : fi @@ -19534,18 +20881,22 @@ fi ######################################################################### # C++ checks ######################################################################### -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19558,36 +20909,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19600,55 +20953,85 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19671,24 +21054,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19697,24 +21092,28 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -19730,24 +21129,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -19756,12 +21167,131 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -19777,112 +21307,6 @@ else CXXFLAGS= fi fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19891,8 +21315,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19956,6 +21380,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -19981,13 +21406,11 @@ else fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -20000,8 +21423,8 @@ fi # Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE in the header. -echo "$as_me:$LINENO: checking whether we are using SUN CC compiler" >&5 -echo $ECHO_N "checking whether we are using SUN CC compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using SUN CC compiler" >&5 +echo $ECHO_N "checking whether we are using SUN CC compiler... $ECHO_C" >&6; } if test "${ac_cv_prog_sun_cxx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20017,8 +21440,8 @@ else fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_sun_cxx" >&5 -echo "${ECHO_T}$ac_cv_prog_sun_cxx" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_sun_cxx" >&5 +echo "${ECHO_T}$ac_cv_prog_sun_cxx" >&6; } if test "x${ac_cv_prog_sun_cxx}" = "xyes"; then { @@ -20038,8 +21461,8 @@ _ACEOF if test x"$os_win32" = xyes; then if test x"$GCC" = xyes -a x"$GXX" = xyes; then msnative_struct='' - echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 -echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } if test -z "$ac_cv_prog_CC"; then our_gcc="$CC" else @@ -20058,19 +21481,19 @@ echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6 ;; esac if test x"$msnative_struct" = x ; then - echo "$as_me:$LINENO: result: no way" >&5 -echo "${ECHO_T}no way" >&6 + { echo "$as_me:$LINENO: result: no way" >&5 +echo "${ECHO_T}no way" >&6; } { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} else CXXFLAGS="$CXXFLAGS $msnative_struct" - echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 -echo "${ECHO_T}${msnative_struct}" >&6 + { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +echo "${ECHO_T}${msnative_struct}" >&6; } fi fi fi -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -20078,8 +21501,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5 -echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5 +echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20102,31 +21525,43 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cxx_bool=yes - echo "$as_me:$LINENO: result: $ac_cxx_bool" >&5 -echo "${ECHO_T}$ac_cxx_bool" >&6 + { echo "$as_me:$LINENO: result: $ac_cxx_bool" >&5 +echo "${ECHO_T}$ac_cxx_bool" >&6; } else @@ -20135,16 +21570,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_bool=no - echo "$as_me:$LINENO: result: $ac_cxx_bool" >&5 -echo "${ECHO_T}$ac_cxx_bool" >&6 + { echo "$as_me:$LINENO: result: $ac_cxx_bool" >&5 +echo "${ECHO_T}$ac_cxx_bool" >&6; } config_error=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking if C++ compiler supports namespaces" >&5 -echo $ECHO_N "checking if C++ compiler supports namespaces... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if C++ compiler supports namespaces" >&5 +echo $ECHO_N "checking if C++ compiler supports namespaces... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20167,31 +21603,43 @@ A a; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cxx_namespaces=yes - echo "$as_me:$LINENO: result: $ac_cxx_namespaces" >&5 -echo "${ECHO_T}$ac_cxx_namespaces" >&6 + { echo "$as_me:$LINENO: result: $ac_cxx_namespaces" >&5 +echo "${ECHO_T}$ac_cxx_namespaces" >&6; } else @@ -20200,16 +21648,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_namespaces=no - echo "$as_me:$LINENO: result: $ac_cxx_namespaces" >&5 -echo "${ECHO_T}$ac_cxx_namespaces" >&6 + { echo "$as_me:$LINENO: result: $ac_cxx_namespaces" >&5 +echo "${ECHO_T}$ac_cxx_namespaces" >&6; } config_error=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking if C++ compiler supports mutable" >&5 -echo $ECHO_N "checking if C++ compiler supports mutable... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if C++ compiler supports mutable" >&5 +echo $ECHO_N "checking if C++ compiler supports mutable... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20233,31 +21682,43 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cxx_mutable=yes - echo "$as_me:$LINENO: result: $ac_cxx_mutable" >&5 -echo "${ECHO_T}$ac_cxx_mutable" >&6 + { echo "$as_me:$LINENO: result: $ac_cxx_mutable" >&5 +echo "${ECHO_T}$ac_cxx_mutable" >&6; } else @@ -20266,29 +21727,30 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_mutable=no - echo "$as_me:$LINENO: result: $ac_cxx_mutable" >&5 -echo "${ECHO_T}$ac_cxx_mutable" >&6 + { echo "$as_me:$LINENO: result: $ac_cxx_mutable" >&5 +echo "${ECHO_T}$ac_cxx_mutable" >&6; } config_error=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking if C++ environment provides all required features" >&5 -echo $ECHO_N "checking if C++ environment provides all required features... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if C++ environment provides all required features" >&5 +echo $ECHO_N "checking if C++ environment provides all required features... $ECHO_C" >&6; } if test "x$config_error" = xyes ; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { { echo "$as_me:$LINENO: error: Your compiler is not powerful enough to compile gtkmm. If it should be, see config.log for more information of why it failed." >&5 echo "$as_me: error: Your compiler is not powerful enough to compile gtkmm. If it should be, see config.log for more information of why it failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } - echo "$as_me:$LINENO: checking whether C++ library symbols are declared in namespace std" >&5 -echo $ECHO_N "checking whether C++ library symbols are declared in namespace std... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether C++ library symbols are declared in namespace std" >&5 +echo $ECHO_N "checking whether C++ library symbols are declared in namespace std... $ECHO_C" >&6; } if test "${gtkmm_cv_cxx_has_namespace_std+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20322,24 +21784,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20348,14 +21822,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gtkmm_cv_cxx_has_namespace_std="no" + gtkmm_cv_cxx_has_namespace_std="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_namespace_std" >&5 -echo "${ECHO_T}$gtkmm_cv_cxx_has_namespace_std" >&6 +{ echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_namespace_std" >&5 +echo "${ECHO_T}$gtkmm_cv_cxx_has_namespace_std" >&6; } if test "x${gtkmm_cv_cxx_has_namespace_std}" = "xyes"; then { @@ -20370,8 +21845,8 @@ _ACEOF - echo "$as_me:$LINENO: checking whether the C++ library supports std::iterator_traits" >&5 -echo $ECHO_N "checking whether the C++ library supports std::iterator_traits... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C++ library supports std::iterator_traits" >&5 +echo $ECHO_N "checking whether the C++ library supports std::iterator_traits... $ECHO_C" >&6; } if test "${gtkmm_cv_cxx_has_std_iterator_traits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20399,24 +21874,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20425,14 +21912,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gtkmm_cv_cxx_has_std_iterator_traits="no" + gtkmm_cv_cxx_has_std_iterator_traits="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_std_iterator_traits" >&5 -echo "${ECHO_T}$gtkmm_cv_cxx_has_std_iterator_traits" >&6 +{ echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_std_iterator_traits" >&5 +echo "${ECHO_T}$gtkmm_cv_cxx_has_std_iterator_traits" >&6; } if test "x${gtkmm_cv_cxx_has_std_iterator_traits}" = "xyes"; then { @@ -20447,8 +21935,8 @@ _ACEOF - echo "$as_me:$LINENO: checking for non-standard Sun libCstd reverse_iterator" >&5 -echo $ECHO_N "checking for non-standard Sun libCstd reverse_iterator... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-standard Sun libCstd reverse_iterator" >&5 +echo $ECHO_N "checking for non-standard Sun libCstd reverse_iterator... $ECHO_C" >&6; } if test "${gtkmm_cv_cxx_has_sun_reverse_iterator+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20476,24 +21964,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20502,14 +22002,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gtkmm_cv_cxx_has_sun_reverse_iterator="no" + gtkmm_cv_cxx_has_sun_reverse_iterator="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_sun_reverse_iterator" >&5 -echo "${ECHO_T}$gtkmm_cv_cxx_has_sun_reverse_iterator" >&6 +{ echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_sun_reverse_iterator" >&5 +echo "${ECHO_T}$gtkmm_cv_cxx_has_sun_reverse_iterator" >&6; } if test "x${gtkmm_cv_cxx_has_sun_reverse_iterator}" = "xyes"; then { @@ -20524,8 +22025,8 @@ _ACEOF - echo "$as_me:$LINENO: checking whether STL containers have templated sequence constructors" >&5 -echo $ECHO_N "checking whether STL containers have templated sequence constructors... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether STL containers have templated sequence constructors" >&5 +echo $ECHO_N "checking whether STL containers have templated sequence constructors... $ECHO_C" >&6; } if test "${gtkmm_cv_cxx_has_template_sequence_ctors+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20559,24 +22060,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20585,14 +22098,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gtkmm_cv_cxx_has_template_sequence_ctors="no" + gtkmm_cv_cxx_has_template_sequence_ctors="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_template_sequence_ctors" >&5 -echo "${ECHO_T}$gtkmm_cv_cxx_has_template_sequence_ctors" >&6 +{ echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_template_sequence_ctors" >&5 +echo "${ECHO_T}$gtkmm_cv_cxx_has_template_sequence_ctors" >&6; } if test "x${gtkmm_cv_cxx_has_template_sequence_ctors}" = "xyes"; then { @@ -20605,8 +22119,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking if C++ compiler allows member functions to refer to member templates" >&5 -echo $ECHO_N "checking if C++ compiler allows member functions to refer to member templates... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if C++ compiler allows member functions to refer to member templates" >&5 +echo $ECHO_N "checking if C++ compiler allows member functions to refer to member templates... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20655,24 +22169,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20683,8 +22209,8 @@ cat >>confdefs.h <<\_ACEOF #define GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES 1 _ACEOF - echo "$as_me:$LINENO: result: $glibmm_cxx_member_functions_member_templates" >&5 -echo "${ECHO_T}$glibmm_cxx_member_functions_member_templates" >&6 + { echo "$as_me:$LINENO: result: $glibmm_cxx_member_functions_member_templates" >&5 +echo "${ECHO_T}$glibmm_cxx_member_functions_member_templates" >&6; } else echo "$as_me: failed program was:" >&5 @@ -20696,17 +22222,18 @@ sed 's/^/| /' conftest.$ac_ext >&5 #define GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES 0 _ACEOF - echo "$as_me:$LINENO: result: $glibmm_cxx_member_functions_member_templates" >&5 -echo "${ECHO_T}$glibmm_cxx_member_functions_member_templates" >&6 + { echo "$as_me:$LINENO: result: $glibmm_cxx_member_functions_member_templates" >&5 +echo "${ECHO_T}$glibmm_cxx_member_functions_member_templates" >&6; } fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: checking whether the compiler finds it ambiguous to have both const and non-const template specializations" >&5 -echo $ECHO_N "checking whether the compiler finds it ambiguous to have both const and non-const template specializations... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the compiler finds it ambiguous to have both const and non-const template specializations" >&5 +echo $ECHO_N "checking whether the compiler finds it ambiguous to have both const and non-const template specializations... $ECHO_C" >&6; } if test "${glibmm_cv_cxx_can_disambiguate_const_template_specializations+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20764,24 +22291,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20790,14 +22329,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -glibmm_cv_cxx_can_disambiguate_const_template_specializations="no" + glibmm_cv_cxx_can_disambiguate_const_template_specializations="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_disambiguate_const_template_specializations" >&5 -echo "${ECHO_T}$glibmm_cv_cxx_can_disambiguate_const_template_specializations" >&6 +{ echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_disambiguate_const_template_specializations" >&5 +echo "${ECHO_T}$glibmm_cv_cxx_can_disambiguate_const_template_specializations" >&6; } if test "x${glibmm_cv_cxx_can_disambiguate_const_template_specializations}" = "xyes"; then { @@ -20810,8 +22350,8 @@ _ACEOF fi - echo "$as_me:$LINENO: checking whether the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined" >&5 -echo $ECHO_N "checking whether the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined" >&5 +echo $ECHO_N "checking whether the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined... $ECHO_C" >&6; } if test "${glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20851,24 +22391,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20877,14 +22429,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition="no" + glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition" >&5 -echo "${ECHO_T}$glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition" >&6 +{ echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition" >&5 +echo "${ECHO_T}$glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition" >&6; } if test "x${glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition}" = "xyes"; then { @@ -20897,8 +22450,8 @@ _ACEOF fi - echo "$as_me:$LINENO: checking whether the the compilerallows us to use a non-extern \"C\" function for an extern \"C\" function pointer." >&5 -echo $ECHO_N "checking whether the the compilerallows us to use a non-extern \"C\" function for an extern \"C\" function pointer.... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the the compilerallows us to use a non-extern \"C\" function for an extern \"C\" function pointer." >&5 +echo $ECHO_N "checking whether the the compilerallows us to use a non-extern \"C\" function for an extern \"C\" function pointer.... $ECHO_C" >&6; } if test "${glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20936,24 +22489,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -20962,14 +22527,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks="no" + glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks" >&5 -echo "${ECHO_T}$glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks" >&6 +{ echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks" >&5 +echo "${ECHO_T}$glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks" >&6; } if test "x${glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks}" = "xyes"; then { @@ -20982,8 +22548,8 @@ _ACEOF fi - echo "$as_me:$LINENO: checking whether the compiler uses namespace declarations inside extern \"C\" blocks." >&5 -echo $ECHO_N "checking whether the compiler uses namespace declarations inside extern \"C\" blocks.... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the compiler uses namespace declarations inside extern \"C\" blocks." >&5 +echo $ECHO_N "checking whether the compiler uses namespace declarations inside extern \"C\" blocks.... $ECHO_C" >&6; } if test "${glibmm_cv_cxx_can_use_namespaces_inside_externc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21035,24 +22601,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21061,14 +22639,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -glibmm_cv_cxx_can_use_namespaces_inside_externc="no" + glibmm_cv_cxx_can_use_namespaces_inside_externc="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_use_namespaces_inside_externc" >&5 -echo "${ECHO_T}$glibmm_cv_cxx_can_use_namespaces_inside_externc" >&6 +{ echo "$as_me:$LINENO: result: $glibmm_cv_cxx_can_use_namespaces_inside_externc" >&5 +echo "${ECHO_T}$glibmm_cv_cxx_can_use_namespaces_inside_externc" >&6; } if test "x${glibmm_cv_cxx_can_use_namespaces_inside_externc}" = "xyes"; then { @@ -21083,8 +22662,8 @@ _ACEOF - echo "$as_me:$LINENO: checking whether the compiler allows a static member variable to be initialized inline to std::string::npos" >&5 -echo $ECHO_N "checking whether the compiler allows a static member variable to be initialized inline to std::string::npos... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the compiler allows a static member variable to be initialized inline to std::string::npos" >&5 +echo $ECHO_N "checking whether the compiler allows a static member variable to be initialized inline to std::string::npos... $ECHO_C" >&6; } if test "${gtkmm_cv_cxx_has_allows_static_inline_npos+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21118,24 +22697,36 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21144,14 +22735,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gtkmm_cv_cxx_has_allows_static_inline_npos="no" + gtkmm_cv_cxx_has_allows_static_inline_npos="no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_allows_static_inline_npos" >&5 -echo "${ECHO_T}$gtkmm_cv_cxx_has_allows_static_inline_npos" >&6 +{ echo "$as_me:$LINENO: result: $gtkmm_cv_cxx_has_allows_static_inline_npos" >&5 +echo "${ECHO_T}$gtkmm_cv_cxx_has_allows_static_inline_npos" >&6; } if test "x${gtkmm_cv_cxx_has_allows_static_inline_npos}" = "xyes"; then { @@ -21164,6 +22756,99 @@ _ACEOF fi + { echo "$as_me:$LINENO: checking whether time_t is not equivalent to gint32, meaning that it can be used for a method overload" >&5 +echo $ECHO_N "checking whether time_t is not equivalent to gint32, meaning that it can be used for a method overload... $ECHO_C" >&6; } +if test "${gtkmm_cv_c_std_time_t_is_not_int32+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + typedef signed int gint32; + class Test + { + void something(gint32 val) + {} + + void something(time_t val) + {} + }; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gtkmm_cv_c_std_time_t_is_not_int32="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gtkmm_cv_c_std_time_t_is_not_int32="no" + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $gtkmm_cv_c_std_time_t_is_not_int32" >&5 +echo "${ECHO_T}$gtkmm_cv_c_std_time_t_is_not_int32" >&6; } + + if test "x${gtkmm_cv_c_std_time_t_is_not_int32}" = "xyes"; then + { + +cat >>confdefs.h <<\_ACEOF +#define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1 +_ACEOF + + } + fi + + # Create a list of input directories for Doxygen. @@ -21184,19 +22869,19 @@ done -echo "$as_me:$LINENO: checking whether to merge C reference docs into generated headers" >&5 -echo $ECHO_N "checking whether to merge C reference docs into generated headers... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to merge C reference docs into generated headers" >&5 +echo $ECHO_N "checking whether to merge C reference docs into generated headers... $ECHO_C" >&6; } -# Check whether --enable-fulldocs or --disable-fulldocs was given. +# Check whether --enable-fulldocs was given. if test "${enable_fulldocs+set}" = set; then - enableval="$enable_fulldocs" - gtkmm_enable_fulldocs=$enableval + enableval=$enable_fulldocs; gtkmm_enable_fulldocs=$enableval else gtkmm_enable_fulldocs=$USE_MAINTAINER_MODE -fi; +fi -echo "$as_me:$LINENO: result: ${gtkmm_enable_fulldocs}" >&5 -echo "${ECHO_T}${gtkmm_enable_fulldocs}" >&6 + +{ echo "$as_me:$LINENO: result: ${gtkmm_enable_fulldocs}" >&5 +echo "${ECHO_T}${gtkmm_enable_fulldocs}" >&6; } GTKMMPROC_MERGECDOCS= @@ -21219,8 +22904,8 @@ echo "$as_me: WARNING: } fi - echo "$as_me:$LINENO: checking whether the XML::Parser module is available" >&5 -echo $ECHO_N "checking whether the XML::Parser module is available... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the XML::Parser module is available" >&5 +echo $ECHO_N "checking whether the XML::Parser module is available... $ECHO_C" >&6; } if test "${gtkmm_cv_have_xml_parser+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21229,8 +22914,8 @@ else "$PERL_PATH" -e 'use strict; use XML::Parser; exit 0;' >&5 2>&5 && gtkmm_cv_have_xml_parser=yes fi -echo "$as_me:$LINENO: result: $gtkmm_cv_have_xml_parser" >&5 -echo "${ECHO_T}$gtkmm_cv_have_xml_parser" >&6 +{ echo "$as_me:$LINENO: result: $gtkmm_cv_have_xml_parser" >&5 +echo "${ECHO_T}$gtkmm_cv_have_xml_parser" >&6; } if test "x$gtkmm_cv_have_xml_parser" = xno; then { @@ -21251,13 +22936,13 @@ fi # Check whether --enable-debug-refcounting was given. - # Check whether --enable-debug-refcounting or --disable-debug-refcounting was given. + # Check whether --enable-debug-refcounting was given. if test "${enable_debug_refcounting+set}" = set; then - enableval="$enable_debug_refcounting" - glibmm_debug_refcounting="$enableval" + enableval=$enable_debug_refcounting; glibmm_debug_refcounting="$enableval" else glibmm_debug_refcounting='no' -fi; +fi + if test "x$glibmm_debug_refcounting" = "xyes"; then { @@ -21272,16 +22957,16 @@ _ACEOF # Evaluate the --enable-warnings=level option. - # Check whether --enable-warnings or --disable-warnings was given. + # Check whether --enable-warnings was given. if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" - gtkmm_enable_warnings="$enableval" + enableval=$enable_warnings; gtkmm_enable_warnings="$enableval" else gtkmm_enable_warnings='minimum' -fi; +fi - echo "$as_me:$LINENO: checking for compiler warning flags to use" >&5 -echo $ECHO_N "checking for compiler warning flags to use... $ECHO_C" >&6 + + { echo "$as_me:$LINENO: checking for compiler warning flags to use" >&5 +echo $ECHO_N "checking for compiler warning flags to use... $ECHO_C" >&6; } gtkmm_warning_flags='' @@ -21325,18 +23010,18 @@ echo $ECHO_N "checking for compiler warning flags to use... $ECHO_C" >&6 gtkmm_use_flags='none' fi - echo "$as_me:$LINENO: result: $gtkmm_use_flags" >&5 -echo "${ECHO_T}$gtkmm_use_flags" >&6 + { echo "$as_me:$LINENO: result: $gtkmm_use_flags" >&5 +echo "${ECHO_T}$gtkmm_use_flags" >&6; } # Add an --enable-use-deprecations configure option: -# Check whether --enable-deprecations or --disable-deprecations was given. +# Check whether --enable-deprecations was given. if test "${enable_deprecations+set}" = set; then - enableval="$enable_deprecations" - + enableval=$enable_deprecations; else enable_deprecations=no -fi; +fi + if test "x$enable_use_deprecations" = "xyes"; then DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED" @@ -21346,13 +23031,13 @@ fi #Offer the ability to omit some API from the library, #to reduce the code size: - # Check whether --enable-deprecated-api or --disable-deprecated-api was given. + # Check whether --enable-deprecated-api was given. if test "${enable_deprecated_api+set}" = set; then - enableval="$enable_deprecated_api" - glibmm_enable_api_deprecated="$enableval" + enableval=$enable_deprecated_api; glibmm_enable_api_deprecated="$enableval" else glibmm_enable_api_deprecated='yes' -fi; +fi + if test "x$glibmm_enable_api_deprecated" = "xyes"; then { @@ -21369,13 +23054,13 @@ echo "$as_me: WARNING: Deprecated API will not be built, breaking backwards-comp fi - # Check whether --enable-api-exceptions or --disable-api-exceptions was given. + # Check whether --enable-api-exceptions was given. if test "${enable_api_exceptions+set}" = set; then - enableval="$enable_api_exceptions" - glibmm_enable_api_exceptions="$enableval" + enableval=$enable_api_exceptions; glibmm_enable_api_exceptions="$enableval" else glibmm_enable_api_exceptions='yes' -fi; +fi + if test "x$glibmm_enable_api_exceptions" = "xyes"; then { @@ -21388,13 +23073,13 @@ _ACEOF fi - # Check whether --enable-api-properties or --disable-api-properties was given. + # Check whether --enable-api-properties was given. if test "${enable_api_properties+set}" = set; then - enableval="$enable_api_properties" - glibmm_enable_api_properties="$enableval" + enableval=$enable_api_properties; glibmm_enable_api_properties="$enableval" else glibmm_enable_api_properties='yes' -fi; +fi + if test "x$glibmm_enable_api_properties" = "xyes"; then { @@ -21407,13 +23092,13 @@ _ACEOF fi - # Check whether --enable-api-vfuncs or --disable-api-vfuncs was given. + # Check whether --enable-api-vfuncs was given. if test "${enable_api_vfuncs+set}" = set; then - enableval="$enable_api_vfuncs" - glibmm_enable_api_vfuncs="$enableval" + enableval=$enable_api_vfuncs; glibmm_enable_api_vfuncs="$enableval" else glibmm_enable_api_vfuncs='yes' -fi; +fi + if test "x$glibmm_enable_api_vfuncs" = "xyes"; then { @@ -21429,13 +23114,13 @@ _ACEOF # Offer the ability to omit some API from the library, # to reduce the code size: - # Check whether --enable-api-default-signal-handlers or --disable-api-default-signal-handlers was given. + # Check whether --enable-api-default-signal-handlers was given. if test "${enable_api_default_signal_handlers+set}" = set; then - enableval="$enable_api_default_signal_handlers" - glibmm_enable_api_default_signal_handlers="$enableval" + enableval=$enable_api_default_signal_handlers; glibmm_enable_api_default_signal_handlers="$enableval" else glibmm_enable_api_default_signal_handlers='yes' -fi; +fi + if test "x$glibmm_enable_api_default_signal_handlers" = "xyes"; then { @@ -21450,9 +23135,7 @@ _ACEOF # Dummy conditional just to make automake-1.4 happy. # We need an always-false condition in docs/Makefile.am. - - -if false; then + if false; then GTKMM_FALSE_TRUE= GTKMM_FALSE_FALSE='#' else @@ -21466,13 +23149,13 @@ fi AUTOHEADER=':' - ac_config_files="$ac_config_files Makefile glib/Makefile glib/glibmm-2.4.pc glib/src/Makefile glib/glibmm/Makefile glib/glibmm/private/Makefile tools/Makefile tools/gmmproc tools/generate_wrap_init.pl tools/m4/Makefile tools/pm/Makefile tools/extra_defs_gen/Makefile" +ac_config_files="$ac_config_files Makefile glib/Makefile glib/glibmm-2.4.pc glib/src/Makefile glib/glibmm/Makefile glib/glibmm/private/Makefile tools/Makefile tools/gmmproc tools/generate_wrap_init.pl tools/m4/Makefile tools/pm/Makefile tools/extra_defs_gen/Makefile" - ac_config_files="$ac_config_files tests/Makefile tests/glibmm_value/Makefile examples/Makefile examples/markup/Makefile examples/options/Makefile examples/thread/Makefile examples/iochannel_stream/Makefile examples/child_watch/Makefile scripts/Makefile docs/Makefile docs/images/Makefile docs/reference/Makefile docs/reference/Doxyfile docs/reference/beautify_docs.pl docs/internal/Makefile" +ac_config_files="$ac_config_files tests/Makefile tests/glibmm_value/Makefile examples/Makefile examples/markup/Makefile examples/options/Makefile examples/thread/Makefile examples/iochannel_stream/Makefile examples/child_watch/Makefile examples/regex/Makefile scripts/Makefile docs/Makefile docs/images/Makefile docs/reference/Makefile docs/reference/Doxyfile docs/reference/beautify_docs.pl docs/internal/Makefile" - ac_config_files="$ac_config_files MSVC_Net2003/Makefile MSVC_Net2003/gendef/Makefile MSVC_Net2003/glibmm/Makefile MSVC_Net2003/glibmm/glibmm.rc MSVC_Net2003/examples/Makefile MSVC_Net2003/examples/dispatcher/Makefile MSVC_Net2003/examples/dispatcher2/Makefile MSVC_Net2003/examples/markup/Makefile MSVC_Net2003/examples/options/Makefile MSVC_Net2003/examples/thread/Makefile MSVC_Net2003/examples/thread_pool/Makefile MSVC_Net2003/tests/Makefile MSVC_Net2003/tests/glibmm_value/Makefile" +ac_config_files="$ac_config_files MSVC_Net2003/Makefile MSVC_Net2003/gendef/Makefile MSVC_Net2003/glibmm/Makefile MSVC_Net2003/glibmm/glibmm.rc MSVC_Net2003/examples/Makefile MSVC_Net2003/examples/dispatcher/Makefile MSVC_Net2003/examples/dispatcher2/Makefile MSVC_Net2003/examples/markup/Makefile MSVC_Net2003/examples/options/Makefile MSVC_Net2003/examples/thread/Makefile MSVC_Net2003/examples/thread_pool/Makefile MSVC_Net2003/tests/Makefile MSVC_Net2003/tests/glibmm_value/Makefile" cat >confcache <<\_ACEOF @@ -21493,39 +23176,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -21534,32 +23236,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -21653,66 +23341,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. +# PATH needs CR # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -21733,126 +23370,198 @@ if test "${PATH_SEPARATOR+set}" != set; then rm -f conf$$.sh fi +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done +IFS=$as_save_IFS - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + + as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -21861,7 +23570,19 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -21870,31 +23591,14 @@ 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'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21902,30 +23606,20 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -21952,19 +23646,22 @@ Configuration commands: $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.60, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -21975,39 +23672,24 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -22017,18 +23699,24 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -22044,77 +23732,90 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "glib/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/Makefile" ;; - "glib/glibmm-2.4.pc" ) CONFIG_FILES="$CONFIG_FILES glib/glibmm-2.4.pc" ;; - "glib/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/src/Makefile" ;; - "glib/glibmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/glibmm/Makefile" ;; - "glib/glibmm/private/Makefile" ) CONFIG_FILES="$CONFIG_FILES glib/glibmm/private/Makefile" ;; - "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "tools/gmmproc" ) CONFIG_FILES="$CONFIG_FILES tools/gmmproc" ;; - "tools/generate_wrap_init.pl" ) CONFIG_FILES="$CONFIG_FILES tools/generate_wrap_init.pl" ;; - "tools/m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/m4/Makefile" ;; - "tools/pm/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/pm/Makefile" ;; - "tools/extra_defs_gen/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/extra_defs_gen/Makefile" ;; - "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "tests/glibmm_value/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/glibmm_value/Makefile" ;; - "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/markup/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/markup/Makefile" ;; - "examples/options/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/options/Makefile" ;; - "examples/thread/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/thread/Makefile" ;; - "examples/iochannel_stream/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/iochannel_stream/Makefile" ;; - "examples/child_watch/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/child_watch/Makefile" ;; - "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; - "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/images/Makefile" ;; - "docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; - "docs/reference/Doxyfile" ) CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; - "docs/reference/beautify_docs.pl" ) CONFIG_FILES="$CONFIG_FILES docs/reference/beautify_docs.pl" ;; - "docs/internal/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/internal/Makefile" ;; - "MSVC_Net2003/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/Makefile" ;; - "MSVC_Net2003/gendef/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gendef/Makefile" ;; - "MSVC_Net2003/glibmm/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/glibmm/Makefile" ;; - "MSVC_Net2003/glibmm/glibmm.rc" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/glibmm/glibmm.rc" ;; - "MSVC_Net2003/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/Makefile" ;; - "MSVC_Net2003/examples/dispatcher/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dispatcher/Makefile" ;; - "MSVC_Net2003/examples/dispatcher2/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dispatcher2/Makefile" ;; - "MSVC_Net2003/examples/markup/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/markup/Makefile" ;; - "MSVC_Net2003/examples/options/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/options/Makefile" ;; - "MSVC_Net2003/examples/thread/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/thread/Makefile" ;; - "MSVC_Net2003/examples/thread_pool/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/thread_pool/Makefile" ;; - "MSVC_Net2003/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/tests/Makefile" ;; - "MSVC_Net2003/tests/glibmm_value/Makefile" ) CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/tests/glibmm_value/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "glib/glibmmconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS glib/glibmmconfig.h" ;; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "glib/glibmmconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS glib/glibmmconfig.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "glib/Makefile") CONFIG_FILES="$CONFIG_FILES glib/Makefile" ;; + "glib/glibmm-2.4.pc") CONFIG_FILES="$CONFIG_FILES glib/glibmm-2.4.pc" ;; + "glib/src/Makefile") CONFIG_FILES="$CONFIG_FILES glib/src/Makefile" ;; + "glib/glibmm/Makefile") CONFIG_FILES="$CONFIG_FILES glib/glibmm/Makefile" ;; + "glib/glibmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES glib/glibmm/private/Makefile" ;; + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "tools/gmmproc") CONFIG_FILES="$CONFIG_FILES tools/gmmproc" ;; + "tools/generate_wrap_init.pl") CONFIG_FILES="$CONFIG_FILES tools/generate_wrap_init.pl" ;; + "tools/m4/Makefile") CONFIG_FILES="$CONFIG_FILES tools/m4/Makefile" ;; + "tools/pm/Makefile") CONFIG_FILES="$CONFIG_FILES tools/pm/Makefile" ;; + "tools/extra_defs_gen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/extra_defs_gen/Makefile" ;; + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "tests/glibmm_value/Makefile") CONFIG_FILES="$CONFIG_FILES tests/glibmm_value/Makefile" ;; + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "examples/markup/Makefile") CONFIG_FILES="$CONFIG_FILES examples/markup/Makefile" ;; + "examples/options/Makefile") CONFIG_FILES="$CONFIG_FILES examples/options/Makefile" ;; + "examples/thread/Makefile") CONFIG_FILES="$CONFIG_FILES examples/thread/Makefile" ;; + "examples/iochannel_stream/Makefile") CONFIG_FILES="$CONFIG_FILES examples/iochannel_stream/Makefile" ;; + "examples/child_watch/Makefile") CONFIG_FILES="$CONFIG_FILES examples/child_watch/Makefile" ;; + "examples/regex/Makefile") CONFIG_FILES="$CONFIG_FILES examples/regex/Makefile" ;; + "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "docs/images/Makefile") CONFIG_FILES="$CONFIG_FILES docs/images/Makefile" ;; + "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; + "docs/reference/Doxyfile") CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; + "docs/reference/beautify_docs.pl") CONFIG_FILES="$CONFIG_FILES docs/reference/beautify_docs.pl" ;; + "docs/internal/Makefile") CONFIG_FILES="$CONFIG_FILES docs/internal/Makefile" ;; + "MSVC_Net2003/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/Makefile" ;; + "MSVC_Net2003/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gendef/Makefile" ;; + "MSVC_Net2003/glibmm/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/glibmm/Makefile" ;; + "MSVC_Net2003/glibmm/glibmm.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/glibmm/glibmm.rc" ;; + "MSVC_Net2003/examples/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/Makefile" ;; + "MSVC_Net2003/examples/dispatcher/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dispatcher/Makefile" ;; + "MSVC_Net2003/examples/dispatcher2/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dispatcher2/Makefile" ;; + "MSVC_Net2003/examples/markup/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/markup/Makefile" ;; + "MSVC_Net2003/examples/options/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/options/Makefile" ;; + "MSVC_Net2003/examples/thread/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/thread/Makefile" ;; + "MSVC_Net2003/examples/thread_pool/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/thread_pool/Makefile" ;; + "MSVC_Net2003/tests/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/tests/Makefile" ;; + "MSVC_Net2003/tests/glibmm_value/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/tests/glibmm_value/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -22126,384 +23827,492 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@GLIBMM_MAJOR_VERSION@,$GLIBMM_MAJOR_VERSION,;t t -s,@GLIBMM_MINOR_VERSION@,$GLIBMM_MINOR_VERSION,;t t -s,@GLIBMM_MICRO_VERSION@,$GLIBMM_MICRO_VERSION,;t t -s,@GLIBMM_VERSION@,$GLIBMM_VERSION,;t t -s,@GLIBMM_RELEASE@,$GLIBMM_RELEASE,;t t -s,@LIBGLIBMM_SO_VERSION@,$LIBGLIBMM_SO_VERSION,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t -s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t -s,@MAINT@,$MAINT,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@PLATFORM_WIN32_TRUE@,$PLATFORM_WIN32_TRUE,;t t -s,@PLATFORM_WIN32_FALSE@,$PLATFORM_WIN32_FALSE,;t t -s,@OS_WIN32_TRUE@,$OS_WIN32_TRUE,;t t -s,@OS_WIN32_FALSE@,$OS_WIN32_FALSE,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@ac_ct_AS@,$ac_ct_AS,;t t -s,@OBJDUMP@,$OBJDUMP,;t t -s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@M4@,$M4,;t t -s,@PERL_PATH@,$PERL_PATH,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t -s,@GLIBMM_CFLAGS@,$GLIBMM_CFLAGS,;t t -s,@GLIBMM_LIBS@,$GLIBMM_LIBS,;t t -s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t -s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t -s,@GTKMM_DOXYGEN_INPUT@,$GTKMM_DOXYGEN_INPUT,;t t -s,@GTKMMPROC_MERGECDOCS@,$GTKMMPROC_MERGECDOCS,;t t -s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t -s,@DISABLE_DEPRECATED_API_CFLAGS@,$DISABLE_DEPRECATED_API_CFLAGS,;t t -s,@GTKMM_FALSE_TRUE@,$GTKMM_FALSE_TRUE,;t t -s,@GTKMM_FALSE_FALSE@,$GTKMM_FALSE_FALSE,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF +if test -n "$CONFIG_FILES"; then _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +GLIBMM_MAJOR_VERSION!$GLIBMM_MAJOR_VERSION$ac_delim +GLIBMM_MINOR_VERSION!$GLIBMM_MINOR_VERSION$ac_delim +GLIBMM_MICRO_VERSION!$GLIBMM_MICRO_VERSION$ac_delim +GLIBMM_VERSION!$GLIBMM_VERSION$ac_delim +GLIBMM_RELEASE!$GLIBMM_RELEASE$ac_delim +LIBGLIBMM_SO_VERSION!$LIBGLIBMM_SO_VERSION$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +CPP!$CPP$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim +PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim +OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim +OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +DLLTOOL!$DLLTOOL$ac_delim +AS!$AS$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +M4!$M4$ac_delim +PERL_PATH!$PERL_PATH$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +GLIBMM_CFLAGS!$GLIBMM_CFLAGS$ac_delim +GLIBMM_LIBS!$GLIBMM_LIBS$ac_delim +GTHREAD_CFLAGS!$GTHREAD_CFLAGS$ac_delim +GTHREAD_LIBS!$GTHREAD_LIBS$ac_delim +GTKMM_DOXYGEN_INPUT!$GTKMM_DOXYGEN_INPUT$ac_delim +GTKMMPROC_MERGECDOCS!$GTKMMPROC_MERGECDOCS$ac_delim +DISABLE_DEPRECATED_CFLAGS!$DISABLE_DEPRECATED_CFLAGS$ac_delim +DISABLE_DEPRECATED_API_CFLAGS!$DISABLE_DEPRECATED_API_CFLAGS$ac_delim +GTKMM_FALSE_TRUE!$GTKMM_FALSE_TRUE$ac_delim +GTKMM_FALSE_FALSE!$GTKMM_FALSE_FALSE$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF fi # test -n "$CONFIG_FILES" -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; esac - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } _ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -22511,248 +24320,131 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - + ;; + :H) + # + # CONFIG_HEADER + # _ACEOF -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' -# This sed command replaces #undef with comments. This is necessary, for +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi + rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. _am_stamp_count=1 for _am_header in $config_headers :; do @@ -22763,135 +24455,39 @@ for _am_header in $config_headers :; do _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X$ac_file : 'X\(//\)[^/]' \| \ X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X$ac_file : 'X\(/\)' \| . 2>/dev/null || echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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. @@ -22899,20 +24495,32 @@ echo "$as_me: executing $ac_dest commands" >&6;} # 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. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + # 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -22934,53 +24542,79 @@ echo X"$mf" | sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; - esac -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF + esac +done # for ac_tag + { (exit 0); exit 0; } _ACEOF diff --git a/libs/glibmm2/configure.in b/libs/glibmm2/configure.in index 90218e1f7a..f9103dbeba 100644 --- a/libs/glibmm2/configure.in +++ b/libs/glibmm2/configure.in @@ -18,8 +18,8 @@ AC_PREREQ(2.50) # Version and initialization ######################################################################### GLIBMM_MAJOR_VERSION=2 -GLIBMM_MINOR_VERSION=13 -GLIBMM_MICRO_VERSION=3 +GLIBMM_MINOR_VERSION=14 +GLIBMM_MICRO_VERSION=2 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION AC_DEFINE_UNQUOTED([GLIBMM_MAJOR_VERSION], $GLIBMM_MAJOR_VERSION, [Major Version]) @@ -120,7 +120,7 @@ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo]) # Dependancy checks ######################################################################### gtkmm_min_sigc_version=2.0.0 -gtkmm_min_glib_version=2.9.0 +gtkmm_min_glib_version=2.14.0 PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version}) AC_SUBST(GLIBMM_CFLAGS) @@ -198,6 +198,7 @@ GLIBMM_CXX_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION() GLIBMM_CXX_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS() GLIBMM_CXX_CAN_USE_NAMESPACES_INSIDE_EXTERNC() GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS() +GLIBMM_C_STD_TIME_T_IS_NOT_INT32() # Create a list of input directories for Doxygen. @@ -271,6 +272,7 @@ AC_CONFIG_FILES([ examples/thread/Makefile examples/iochannel_stream/Makefile examples/child_watch/Makefile + examples/regex/Makefile scripts/Makefile diff --git a/libs/glibmm2/docs/Makefile.am b/libs/glibmm2/docs/Makefile.am deleted file mode 100644 index 556283f3bc..0000000000 --- a/libs/glibmm2/docs/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## Copyright (c) 2001 -## The gtkmm development team. - -SUBDIRS = images reference internal - -EXTRA_DIST = Makefile_web.am_fragment - -gtkmm_doc_DATA = - -include $(top_srcdir)/docs/Makefile_web.am_fragment - -# Post to the website. - -post-html-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \ - done - -post-html-local: - scp $$SSH_OPT $^ $$USER@$(web_host):$(web_path_docs) - -post-html: post-html-recursive post-html-local - -doc-clean-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) doc-clean); \ - done - -doc-clean: doc-clean-recursive - -doc-rebuild: doc-clean all - -.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild - diff --git a/libs/glibmm2/docs/Makefile_web.am_fragment b/libs/glibmm2/docs/Makefile_web.am_fragment deleted file mode 100644 index 14ecd2aa55..0000000000 --- a/libs/glibmm2/docs/Makefile_web.am_fragment +++ /dev/null @@ -1,8 +0,0 @@ -web_host = gtkmm.org -web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.4/ -#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.4/ -web_path_docs = $(web_path_gtkmm)docs/ -rsync_args = -vz --rsh ssh --delete --delete-after - -gtkmm_docdir = $(datadir)/doc/glibmm-2.4/docs - diff --git a/libs/glibmm2/docs/images/Makefile.am b/libs/glibmm2/docs/images/Makefile.am deleted file mode 100644 index 6bbfd7a44b..0000000000 --- a/libs/glibmm2/docs/images/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ - -EXTRA_DIST = gtkmm_logo.gif top.gif - -# Post to the website. -include $(top_srcdir)/docs/Makefile_web.am_fragment - -imagesdir = $(gtkmm_docdir)/images -images_DATA = gtkmm_logo.gif top.gif - -post-html: gtkmm_logo.gif top.gif - rsync $(rsync_args) $^ $$USER@$(web_host):$(web_path_docs)images/ - -doc-clean: - -.PHONY: post-html doc-clean - diff --git a/libs/glibmm2/docs/images/Makefile.in b/libs/glibmm2/docs/images/Makefile.in deleted file mode 100644 index b2d35be468..0000000000 --- a/libs/glibmm2/docs/images/Makefile.in +++ /dev/null @@ -1,398 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/docs/Makefile_web.am_fragment -subdir = docs/images -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(imagesdir)" -imagesDATA_INSTALL = $(INSTALL_DATA) -DATA = $(images_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = gtkmm_logo.gif top.gif -web_host = gtkmm.org -web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.4/ -#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.4/ -web_path_docs = $(web_path_gtkmm)docs/ -rsync_args = -vz --rsh ssh --delete --delete-after -gtkmm_docdir = $(datadir)/doc/glibmm-2.4/docs - -# Post to the website. -imagesdir = $(gtkmm_docdir)/images -images_DATA = gtkmm_logo.gif top.gif -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docs/Makefile_web.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/images/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/images/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-imagesDATA: $(images_DATA) - @$(NORMAL_INSTALL) - test -z "$(imagesdir)" || $(mkdir_p) "$(DESTDIR)$(imagesdir)" - @list='$(images_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \ - $(imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \ - done - -uninstall-imagesDATA: - @$(NORMAL_UNINSTALL) - @list='$(images_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \ - rm -f "$(DESTDIR)$(imagesdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../docs - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(imagesdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-imagesDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-imagesDATA uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-imagesDATA install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-imagesDATA uninstall-info-am - - -post-html: gtkmm_logo.gif top.gif - rsync $(rsync_args) $^ $$USER@$(web_host):$(web_path_docs)images/ - -doc-clean: - -.PHONY: post-html doc-clean -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/docs/images/gtkmm_logo.gif b/libs/glibmm2/docs/images/gtkmm_logo.gif deleted file mode 100644 index 30b502c4f4..0000000000 Binary files a/libs/glibmm2/docs/images/gtkmm_logo.gif and /dev/null differ diff --git a/libs/glibmm2/docs/images/top.gif b/libs/glibmm2/docs/images/top.gif deleted file mode 100644 index 85d395c5b4..0000000000 Binary files a/libs/glibmm2/docs/images/top.gif and /dev/null differ diff --git a/libs/glibmm2/docs/internal/Makefile.am b/libs/glibmm2/docs/internal/Makefile.am deleted file mode 100644 index 7281296fbf..0000000000 --- a/libs/glibmm2/docs/internal/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -EXTRA_DIST = gtk_entry.dia \ - documentation_generation.txt gmmproc_internals.txt using_gmmproc.txt - -post-html: - -doc-clean: - -.PHONY: post-html doc-clean - diff --git a/libs/glibmm2/docs/internal/documentation_generation.txt b/libs/glibmm2/docs/internal/documentation_generation.txt deleted file mode 100644 index df94dfbcef..0000000000 --- a/libs/glibmm2/docs/internal/documentation_generation.txt +++ /dev/null @@ -1,41 +0,0 @@ -*** Reference documentation. -- Type "make" in docs/reference to generate HTML docs - from the source code. -- We use Doxygen. - Doxygen comments: Use either - - /// This does something. - void something() - - or - - /** This does something - * It does it like so. - * @param foo The foo to be somethinged. - */ - void something(Foo& foo); - - Rememeber to actually look at the documentation before adding these - comments to the .hg files. It might not be necessary because - gtkmmproc might do it for you - see the next section. - -- Reuse of GTK+ documentation: - When gtkmmproc generates the .h/.cc files from the .hg/.ccg files, - it inserts doxygen comments based on the gtk-doc comments in the - GTK+ source code. - gtkmmproc does this by looking at gtk/src/gtk_docs.xml, which is - generated occasionally by the pygtk/codegen/docextract_to_xml.py - python script, in the gnome-python cvs module. - -- Overriding the GTK documentation: - Sometimes the GTK documentation for a functoin is not appropriate - for the gtkmm method that wraps it. If so, you should add a - section to gtk/src/gtk_docs_override.xml - - -*** Book -- The "Programming with gtkmmproc" book is in DocBook XML 4 format. -- Type make in docs/tutorial to build the HTML. - - - diff --git a/libs/glibmm2/docs/internal/gmmproc_internals.txt b/libs/glibmm2/docs/internal/gmmproc_internals.txt deleted file mode 100644 index bd4e71a695..0000000000 --- a/libs/glibmm2/docs/internal/gmmproc_internals.txt +++ /dev/null @@ -1,135 +0,0 @@ -How it works ------------- -Gtkmmproc is a 3 pass process. -1. Parse .hg/.ccg files and generate meta m4 macros in a tmp file (e.g. gtkmmproc5466.g1) -2. run m4 to expand macro text (to get e.g. (e.g. gtkmmproc5466.g2) -3. snip file into pieces. (.h .private_h, .cc) - -1. -The first pass is to escape anything which may cause problems -with m4 processing of a file. This pass is performed in perl. -It also implements meta macros which are macros in which -a C++ declaration must be broken into an argument list. -Commands marked with are implmented at this -level. - -TODO: ? Is this still true? murrayc - -At this point there is a file (e.g. /tmp/gtkmmproc5466.g1) -which contains text and m4 code. This m4 code is our m4 -macros which will be expanded in the next pass. - -2. -The second pass does both expansion and rearrangement of -code. The entire file including both the .hg headers and the -.ccg source files are processed as one piece. This is because -some macros expand into multiple sections. Commands marked -with are implemented at this level. - -3. -The third pass is to take the M4 output and snip it into -the actually header and implementation files for use. -There are no commands which communicate directly with this layer, -though any raw C++ code from the .hg/.ccg files will of course be -carried through to here. - -All macros are in capitals and are proceed by an underscore. - - -Output files -------------- - -gtkmmproc generates 3 output files. One is the header for inclusion -in user code. The other is the implementation including implementing -all the macro built functions. The last is a private header. The -private header contains all the functions which are necessary to -derive a C object in the gtk+ object system from this widget. -The private header is not for user consumption. - - -Sectioning ------------ - -Much of the magic of gtkmmproc happens at the m4 level. -This includes sectioning. Sectioning is method in which a macro -can create pieces of text after or before the expansion of the -macro. Sectioning is done with the m4 divert command. -The macros _SECTION(), _PUSH() and _POP() are used to -control what section is being writen. - -It is important to understand how the sections of a class -are assembled. - -Example: - - something.hg: - #include - - namespace Gtk { - - class SomeThing - { - WRAP_CLASS(...) - public: - // my methods - void do(); - }; - } - - something.cmm: - void Gtk::SomeThing::do() {} - -This will be broken up into the following sections -<<>> represents a include section. * marks macro expansions. -(Names don't match current code look at m4 file to see what current -name is.) - - something.h: -* #ifndef SOMETHING_H -* #define SOMETHING_H - #include - <> - namespace Gtk { - class SomeThing { - { -* public: -* typedef ... -* .... - public: - // my methods - void do(); - - <> - }; - - } - #endif - - something.cc: - void Gtk::SomeThing::do() {} - -* void gtkmm_something_init_type( -* .... - <> - <> - <> - - something_p.h: -* class SomeThing_Class { - <> -* }; - - -If you, for example, need to place something in PRIVATE for this -class, you would do - - class SomeThing { - .... - _SECTION(PRIVATE) - my stuff - _SECTION(CLASS) - } - - -In order to improve clarity the m4 template is expanded into -multiple files, one for each type of macro processed. diff --git a/libs/glibmm2/docs/internal/gtk_entry.dia b/libs/glibmm2/docs/internal/gtk_entry.dia deleted file mode 100644 index a08ddffe51..0000000000 Binary files a/libs/glibmm2/docs/internal/gtk_entry.dia and /dev/null differ diff --git a/libs/glibmm2/docs/internal/using_gmmproc.txt b/libs/glibmm2/docs/internal/using_gmmproc.txt deleted file mode 100644 index 78d1f10d3e..0000000000 --- a/libs/glibmm2/docs/internal/using_gmmproc.txt +++ /dev/null @@ -1,323 +0,0 @@ - -Command Summary -================== - #m4 (meta) one line m4 escape - #m4begin (meta) multi line m4 escape - #m4end (meta) end of multi line escape - _CTOR_CAST (class) implement the cast constructor automatically - _CTOR_DEFAULT (class) implement a constructor taking no arguments - _DTOR (class) implement the dtor automatically - _MEMBER (class) implement a member - _POP (base) save current section and switch to another - _PINCLUDE (base) specify the parents private header name - _PUSH (base) restore current section - _SECTION (base) change sections - _WRAP (meta) wrap various C types - _DEFS (meta) load a defs file - _IGNORE (?) tells gtkmmproc not to complain this function not wrapped - _CLASS_GOBJECT (meta) derive from GObject - _CLASS_GTKOBJECT (meta) derive from GtkObject - - -M4 macro escaping ------------------ -At times it is useful to be able to issue commands directly to -m4 preprocessor underneith gtkmmproc. However, for safety -the single quote and backtick were hiden. Thus you must -enter a special environment to be about to issue m4 commands -without interpretation. - -single line m4 statements are any line proceed with a #m4. - #m4 don't eat my `backticks' - -Multiline m4 statements can be done with #m4begin/#m4end - - #m4begin - define(`convert', `dnl - gtkmm_convert($1,$2->obj); - ') - #m4end - -_DEFS (module name, definition filename) ----------------------------------------- -Takes two arguments, a module name (e.g., gtkmm, gnomemm, ...) and the -filename of an API definition file sans ".defs" extension. - -Debugging ---------- -If you see m4 errors, you can set the GTKMMPROC_DEBUG environment variable like so: -# export GTKMMPROC_DEBUG=1 -This will ensure that the intermediate m4 files are not deleted, so that you can examine them. - - -_WRAP_METHOD( C++ declaration, C function name ) ------------------------------------------------- - -e.g. From entry.hg: -_WRAP_METHOD(void set_text(const string &text),gtk_entry_set_text) - -The C function (e.g. gtk_entry_set_text) is described in gtk/src/gtk.defs, -which is generated automatically by the h2defs.py script from pygtk. (see below) - -There are some optional extra arguments: -refreturn: Do an extra reference() on the return value, in case the C function does not provide a reference. -deprecated: Puts the generated code in #ifdef blocks. -constversion: Just call the non-const version of the same function, instead of generating almost duplicate code. - -_WRAP_METHOD_DOCS_ONLY( C function name ) ------------------------------------------------- - -e.g. From treestore.hg: -_WRAP_METHOD_DOCS_ONLY(gtk_list_store_insert) - -Linke _WRAP_METHOD_DOCS_ONLY(), but only outputs the doxygen documentation comments, based on -the gtk_docs.xml and gtk_docs_override.xml files. Use this when you must hand-code the method, -but you want to use the documentation that would be generated if the method was generated. - -_WRAP_SIGNAL( C++ handler declaration, "signal name" ) ------------------------------------------------------- - -e.g. From button.hg: -_WRAP_SIGNAL(void clicked(),"clicked") - -Signals are function pointers in the GTK Class struct, with a -corresponding enum value. and a gtk_signal_new. - -from gtkbutton.h: - -struct _GtkButtonClass -{ -  GtkBinClass        parent_class; -  -  void (* pressed)  (GtkButton *button); -  void (* released) (GtkButton *button); -  void (* clicked)  (GtkButton *button); -  ... -}; - -from gtkbutton.c: - -enum { -  PRESSED, -  RELEASED, -  CLICKED, -  ENTER, -  LEAVE, -  ACTIVATE, -  LAST_SIGNAL -}; - -and - -button_signals[CLICKED] = -    gtk_signal_new ("clicked", -                    GTK_RUN_FIRST | GTK_RUN_ACTION, -                    GTK_CLASS_TYPE (object_class), -                    GTK_SIGNAL_OFFSET (GtkButtonClass, clicked), -                    gtk_marshal_VOID__VOID, -    GTK_TYPE_NONE, 0); - - -The signals are described in gtk_signals.defs using the define-signal -command. This file was created by the tools/extra_defs_gen utility. -You might need to modify the defs slightly. - -You might find a similarly named method. Just wrap it separately as a -method, and don't worry about the names clashing. -e.g _WRAP_METHOD(void clicked(), gtk_button_clicked) - - -_MEMBER_GET(gtkmm name, gtk+ name, C++ type, C type) ----------------------------------------------------- - -e.g. from window.hg: -_MEMBER_GET(window_type, type, GtkWindowType, GtkWindowType) - -In GTK+, you're sometimes supposed to read from an object data field directly. -This macro creates a get_*() method for use with C++. - - -_MEMBER_SET(gtkmm name, gtk+ name, C++ type, C type) ----------------------------------------------------- - -e.g. from buttonbox.hg: -_MEMBER_SET(child_min_width, child_min_width, int, gint) - -In GTK+, you're sometimes supposed to write to an object data field directly. -This macro creates a set_*() method for use with C++. - - -_MEMBER_GET_PTR(gtkmm name, gtk+ name, C++ pointer type, C pointer type) ------------------------------------------------------------------------- - -e.g. from progress.hg: -_MEMBER_GET_PTR(adjustment, adjustment, Gtk::Adjustment*, GtkAdjustment*) - -Similar to _MEMBER_GET(), but this macro create two access methods: -A non-const method that returns a pointer to a writable object, and -a const method returning a pointer to a read-only object. - - -_MEMBER_GET_GOBJECT(gtkmm name, gtk+ name, C++ type, C pointer type) --------------------------------------------------------------------- - -e.g. from window.hg: -_MEMBER_GET_GOBJECT(frame, frame, Gdk::Window, GdkWindow*) - -Similar to _MEMBER_GET_PTR(), this macro creates two access methods. -The difference is that the return types will actually be -Glib::RefPtr and Glib::RefPtr. - -Also, the methods call object->reference() before -returning it to the caller. - - -_WRAP_PROPERTY("property name", C++ type) ------------------------------------------ - -e.g. From Widget.hg: -_WRAP_PROPERTY("name", Glib::ustring) - -The properties are described in gtk_signals.defs using the -define-property command. This file was created by the -tools/extra_defs_gen utility. You might need to modify the defs -slightly. - -Properties have enum values in the .c file. e.g from gtkwidget.c: - -enum { - PROP_0, - PROP_NAME, - PROP_PARENT, -... - -These enums are used in a call to g_object_class_install_property(). -e.g. from gtkwidget.c: - - g_object_class_install_property (gobject_class, - PROP_NAME, - g_param_spec_string ("name", - _("Widget name"), - _("The name of the widget"), - NULL, - G_PARAM_READWRITE)); - -This sometimes shows the type of the property, but sometimes you -need to look for the use of the property enum to see what type -of values are being used with it. For instance, from gtkwidget.c: - -static void -gtk_widget_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GtkWidget *widget; - - widget = GTK_WIDGET (object); - - switch (prop_id) - { - gint *eventp; - GdkExtensionMode *modep; - - case PROP_NAME: - if (widget->name) -... - -By looking at GtkWidget::name you can see the type. - -The defs file also shows the types of the properties, but -when the type is an enum, flag, or object, it doesn't show -the exact type. - - -_WRAP_VFUNC( C++ declaration, vfunc C name ) --------------------------------------------- - -e.g. From checkbutton.hg: -_WRAP_VFUNC(void draw_indicator(GdkRectangle* area),"draw_indicator") - -These are quite unusual, but you'll probably find one or two. They -are function pointers in the GTK Class struct, which have no -gtk_signal_new(). - -For instance, from gtkcheckbutton.h: - -struct _GtkCheckButtonClass -{ -  GtkToggleButtonClass parent_class; - -  void (* draw_indicator) (GtkCheckButton *check_button, -   GdkRectangle   *area); -}; - -And from gtkcheckbutton.c: - -class->draw_indicator = gtk_real_check_button_draw_indicator; - -The virtual functions are described in gtk_vfuncs.defs using the -define-vfunc command. This file was created manually so you will -need to add a section to it for each new virtual function that you find. - - -_CLASS_GOBJECT( C++ class, C class, C casting macro, C++ base class, C base class ) ------------------------------------------------------------------------------------ - -e.g. From accelgroup.hg: -_CLASS_GOBJECT(AccelGroup, GtkAccelGroup, GTK_ACCEL_GROUP,Glib::Object,GObject) - -FIXME (2002-09-18 chrisime) text goes here. - - -_CLASS_GTKOBJECT( C++ class, C class, C casting macro, C++ base class, C base class ) -------------------------------------------------------------------------------------- - -e.g. From button.hg: -_CLASS_GTKOBJECT(Button,GtkButton,GTK_BUTTON,Gtk::Bin,GtkBin) - -Button is the class which derives from Gtk::Bin in gtkmm. -GtkButton is the class which derives from GtkBin in gtk+. -GTK_BUTTON is the casting macro in gtk+: - -GtkWidget *button; -... GTK_BUTTON (button); - - -Boxed Types: ----------------------- - -_CLASS_BOXEDTYPE() -For non-GObject structs, registed with g_boxed_type_register_static(). -For example, Gdk::Color. - -_CLASS_BOXEDTYPE_STATIC() -For simple assignable structs like GdkRectangle. Similar to _CLASS_BOXEDTYPE, -but the C struct is not allocated dynamically. - -_CLASS_OPAQUE_COPYABLE() -For opaque structs with corresponding copy/free functions. -Very similar to _CLASS_BOXEDTYPE, but without a get_type() method. - -_CLASS_OPAQUE_REFCOUNTED() -For reference-counted opaque structs. The C++ wrappers can not be -instantiated and can only be used with Glib::RefPtr<>. - -_CLASS_GENERIC() -To wrap structs which don't fit into any specialized category. Currently, -it is only needed to wrap PangoLayoutIter. - - -Re-generating the gtk_methods.defs interface definition files. ------------------------------------------------------- - -Use h2defs.py from the pygtk module in gnome cvs. e.g.: - -./h2def.py /gnome/head/cvs/gtk+/gtk/*.h > gtk_methods.defs - -The tools/enums.pl script works in the same way. - -Use your tools/extra_defs_gen utility to generate the .defs for the signals and properties. - - - diff --git a/libs/glibmm2/docs/reference/Doxyfile.in b/libs/glibmm2/docs/reference/Doxyfile.in deleted file mode 100644 index a153812b1e..0000000000 --- a/libs/glibmm2/docs/reference/Doxyfile.in +++ /dev/null @@ -1,1090 +0,0 @@ -# Doxyfile 1.3.4 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = "glibmm 2.4" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, -# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en -# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, -# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited -# members of a class in the documentation of that class as if those members were -# ordinary class members. Constructors, destructors and assignment operators of -# the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. It is allowed to use relative paths in the argument list. - -STRIP_FROM_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explict @brief command for a brief description. - -JAVADOC_AUTOBRIEF = YES - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# reimplements. - -INHERIT_DOCS = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = "newin2p2=\xrefitem newin2p2s \"Since glibmm 2.2\" \"New API since glibmm 2.2\"" -ALIASES += "newin2p4=\xrefitem newin2p4s \"Since glibmm 2.4\" \"New API since glibmm 2.4\"" -ALIASES += "newin2p6=\xrefitem newin2p6s \"Since glibmm 2.6\" \"New API since glibmm 2.6\"" -ALIASES += "newin2p8=\xrefitem newin2p8s \"Since glibmm 2.8\" \"New API since glibmm 2.8\"" -ALIASES += "newin2p10=\xrefitem newin2p10s \"Since glibmm 2.10\" \"New API since glibmm 2.10\"" - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = @GTKMM_DOXYGEN_INPUT@ - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp -# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc - -FILE_PATTERNS = *.h - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories -# that are symbolic links (a Unix filesystem feature) are excluded from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. - -EXCLUDE_PATTERNS = */wrap_init.h - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = @top_srcdir@/examples - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = *.h \ - *.cc - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = YES - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = $(DOXYGEN_IMAGE_PATH) - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. - -INPUT_FILTER = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = NO - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = YES - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = glibmm_header.html_fragment - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = glibmm_footer.html_fragment - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output dir. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = YES - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 1 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimised for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assigments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = YES - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. - -EXPAND_ONLY_PREDEF = YES - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = NO - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. - -PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \ - GTKMM_USING_STD(x)= \ - GTKMM_API \ - GTKMM_ATKMM_ENABLED \ - GLIBMM_VFUNCS_ENABLED \ - GLIBMM_PROPERTIES_ENABLED \ - GLIBMM_EXCEPTIONS_ENABLED \ - GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse the -# parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = "libstdc++.tag.xml = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen" - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = glibmm_doxygen_tags - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = YES - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = @PERL_PATH@ - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or -# super classes. Setting the tag to NO turns the diagrams off. Note that this -# option is superceded by the HAVE_DOT option below. This is only a fallback. It is -# recommended to install and use dot, since it yields more powerful graphs. - -CLASS_DIAGRAMS = YES - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = NO - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = NO - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similiar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = NO - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found on the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes that -# lay further from the root node will be omitted. Note that setting this option to -# 1 or 2 may greatly reduce the computation time needed for large code bases. Also -# note that a graph may be further truncated if the graph's image dimensions are -# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). -# If 0 is used for the depth value (the default), the graph is not depth-constrained. - -MAX_DOT_GRAPH_DEPTH = 0 - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/libs/glibmm2/docs/reference/Makefile.am b/libs/glibmm2/docs/reference/Makefile.am deleted file mode 100644 index ba5a0b8bcc..0000000000 --- a/libs/glibmm2/docs/reference/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -doxygen_configfile = Doxyfile -doxygen_configfile_source = $(srcdir)/Doxyfile.in -beautify_docs_source = $(srcdir)/beautify_docs.pl.in -beautify_docs = $(srcdir)/beautify_docs.pl - -include $(top_srcdir)/docs/Makefile_web.am_fragment -web_path_reference = $(web_path_docs)reference - -EXTRA_DIST = README Doxyfile.in \ - glibmm_header.html_fragment glibmm_footer.html_fragment beautify_docs.pl \ - html glibmm_doxygen_tags libstdc++.tag.xml -#Ideally, libstdc++.tag.xml would be installed by gcc, instead of being copied into every project. - -html/index.html: $(doxygen_configfile_source) $(beautify_docs_source) $(top_srcdir)/glib/glibmm/*.h - -rm -rf html - image_path=""; \ - dir="`pkg-config --silence-errors --variable=prefix gtk+-2.0`/share/gtk-doc/html/gtk"; \ - test -d "$$dir" && image_path="$$dir"; \ - dir="$(top_srcdir)/../gtk+/gtk/stock-icons"; \ - test -d "$$dir" && image_path="$$image_path $$dir"; \ - DOXYGEN_IMAGE_PATH="$${DOXYGEN_IMAGE_PATH:=$$image_path}" doxygen $(doxygen_configfile) - $(PERL_PATH) $(beautify_docs) html - - -glibmm-reference-html.tar.gz: html/index.html - tar cf - html | gzip -c --best >$@ - -glibmm-reference-html.tar.bz2: html/index.html - tar cf - html | bzip2 -c >$@ - -post-html: html/index.html - rsync $(rsync_args) -r html/ $$USER@$(web_host):$(web_path_reference)/html/ - -doc-clean: - -rm -rf html - -rm -f glibmm_doxygen_tags - -rm -f glibmm-reference-html.tar.gz glibmm-reference-html.tar.bz2 - -referencedir = $(gtkmm_docdir)/reference/html - -install-reference: html/index.html - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(referencedir) - @dir='$($@ - -glibmm-reference-html.tar.bz2: html/index.html - tar cf - html | bzip2 -c >$@ - -post-html: html/index.html - rsync $(rsync_args) -r html/ $$USER@$(web_host):$(web_path_reference)/html/ - -doc-clean: - -rm -rf html - -rm -f glibmm_doxygen_tags - -rm -f glibmm-reference-html.tar.gz glibmm-reference-html.tar.bz2 - -install-reference: html/index.html - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(referencedir) - @dir='$() - { - if(/)template<\b/$1template </; - } - - push(@outbuf, $_); - } - - open(FILE, '>', $file); - - # write the whole buffer back - print FILE "$_" foreach(@outbuf); - - close(FILE); -} - diff --git a/libs/glibmm2/docs/reference/beautify_docs.pl.in b/libs/glibmm2/docs/reference/beautify_docs.pl.in deleted file mode 100755 index 28df9e11af..0000000000 --- a/libs/glibmm2/docs/reference/beautify_docs.pl.in +++ /dev/null @@ -1,81 +0,0 @@ -#! @PERL_PATH@ -# -# @configure_input@ -# - -#sub main() -{ - my $directory = "."; - $directory = $ARGV[0] unless scalar(@ARGV) == 0; - print "processing directory $directory...\n" unless $directory =~ /^\.?$/; - - foreach(`find "$directory" -type f -name '*.html'`) - { - chomp; - /([^\/]+)$/; - print "processing $1...\n"; - &process($_); - } - - exit 0; -} - -sub process($) -{ - my ($file) = @_; - my @outbuf; - - open(FILE, '<', $file); - - while() - { - if(/)template<\b/$1template </; - } - - push(@outbuf, $_); - } - - open(FILE, '>', $file); - - # write the whole buffer back - print FILE "$_" foreach(@outbuf); - - close(FILE); -} - diff --git a/libs/glibmm2/docs/reference/glibmm_footer.html_fragment b/libs/glibmm2/docs/reference/glibmm_footer.html_fragment deleted file mode 100644 index d66fd995fe..0000000000 --- a/libs/glibmm2/docs/reference/glibmm_footer.html_fragment +++ /dev/null @@ -1,5 +0,0 @@ -
-Generated for $projectname by -Doxygen $doxygenversion © 1997-2001
- - diff --git a/libs/glibmm2/docs/reference/glibmm_header.html_fragment b/libs/glibmm2/docs/reference/glibmm_header.html_fragment deleted file mode 100644 index d6e842076f..0000000000 --- a/libs/glibmm2/docs/reference/glibmm_header.html_fragment +++ /dev/null @@ -1,20 +0,0 @@ - - -$title - - - - - - - - -
logotop
-
- Main Page   - Widgets   - glibmm Namespaces   - Book   -
-
- diff --git a/libs/glibmm2/examples/Makefile.am b/libs/glibmm2/examples/Makefile.am deleted file mode 100644 index 79d9c73a9c..0000000000 --- a/libs/glibmm2/examples/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -example_dirs = markup options thread iochannel_stream child_watch - -# These use gtkmm stuff: -# thread - -SUBDIRS = $(example_dirs) -EXTRA_DIST = README Makefile.am_fragment - -#Web upload: -include $(top_srcdir)/docs/Makefile_web.am_fragment - -web_path = $(web_path_gtkmm)examples - -#rsync --cvs-exclude ignores *.o and anything in .cvsignore and some more: -rsync_options = -vzr --rsh ssh --cvs-exclude --delete-excluded --exclude=.libs --exclude=.deps --exclude=core --exclude=.cvsignore --exclude=a.out --exclude=Makefile --exclude=Makefile.in - -post-html: - rsync $(rsync_options) $(example_dirs) $$USER@$(web_host):$(web_path) - -.PHONY: post-html - diff --git a/libs/glibmm2/examples/Makefile.am_fragment b/libs/glibmm2/examples/Makefile.am_fragment deleted file mode 100644 index 83433390c6..0000000000 --- a/libs/glibmm2/examples/Makefile.am_fragment +++ /dev/null @@ -1,40 +0,0 @@ - -local_glibmm_lib = $(top_builddir)/glib/glibmm/libglibmm-2.4.la - -LIBS = $(local_glibmm_lib) $(GLIBMM_LIBS) - -all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \ - $(GLIBMM_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) - -DEFS = @DEFS@ -DEFAULT_INCLUDES = -INCLUDES = -I. -I$(srcdir) $(strip $(all_includes)) - -glibmm_docdir = $(datadir)/doc/glibmm-2.4 - -install-example-src: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(glibmm_docdir)/$(subdir) - for p in $(srcdir)/*.cc $(srcdir)/*.h; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f; \ - fi; \ - done - -uninstall-example-src: - @$(NORMAL_UNINSTALL) - for p in $(srcdir)/*.cc $(srcdir)/*.h; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f"; \ - rm -f $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f; \ - fi; \ - done - -install-data-local: install-example-src - -uninstall-local: uninstall-example-src - -.PHONY: install-example-src uninstall-example-src diff --git a/libs/glibmm2/examples/README b/libs/glibmm2/examples/README deleted file mode 100644 index 8b13789179..0000000000 --- a/libs/glibmm2/examples/README +++ /dev/null @@ -1 +0,0 @@ - diff --git a/libs/glibmm2/examples/child_watch/Makefile.am b/libs/glibmm2/examples/child_watch/Makefile.am deleted file mode 100644 index b819ac2e37..0000000000 --- a/libs/glibmm2/examples/child_watch/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_srcdir)/examples/Makefile.am_fragment - -# fork() does not work on win32 -if OS_WIN32 -else - -#Build the executable, but don't install it. -noinst_PROGRAMS = child_watch -child_watch_SOURCES = main.cc - -endif diff --git a/libs/glibmm2/examples/child_watch/main.cc b/libs/glibmm2/examples/child_watch/main.cc deleted file mode 100644 index 5c0e793a64..0000000000 --- a/libs/glibmm2/examples/child_watch/main.cc +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright (C) 2005 The glibmm Development Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include -#include -#include - -using namespace std; - -class ChildWatch : public sigc::trackable -{ -public: - ChildWatch(const Glib::RefPtr& mainLoop) - : m_mainLoop(mainLoop) - {} - - void on_child_exited(GPid pid,int status); - void run(); // fork a child and call signal_child_watch - -private: - Glib::RefPtr m_mainLoop; -}; - -void ChildWatch::run() -{ - GPid pid = fork(); - - if(pid==0) - { - sleep(5); - exit(0); - } - - std:: cout << "Child " << pid << " created" << std::endl; - - Glib::signal_child_watch().connect(sigc::mem_fun(*this, &ChildWatch::on_child_exited), pid); -} - -void ChildWatch::on_child_exited(GPid pid, int status) -{ - std::cout << "Child " << pid << " exited with status " << status << std::endl; - m_mainLoop->quit(); -} - -int main() -{ - Glib::RefPtr mainLoop = Glib::MainLoop::create(); - - ChildWatch cwatch(mainLoop); - cwatch.run(); - mainLoop->run(); - - return 0; -} diff --git a/libs/glibmm2/examples/iochannel_stream/Makefile.am b/libs/glibmm2/examples/iochannel_stream/Makefile.am deleted file mode 100644 index 8c877e9be1..0000000000 --- a/libs/glibmm2/examples/iochannel_stream/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_srcdir)/examples/Makefile.am_fragment - -#Build the executable, but don't install it. - -# Don't build natively (mingw32) on win32 as mkfifo is -# not supported (TODO: implement with CreateNamedPipe). -if OS_WIN32 -else -noinst_PROGRAMS = example -example_SOURCES = main.cc fdstream.h fdstream.cc -endif diff --git a/libs/glibmm2/examples/iochannel_stream/fdstream.cc b/libs/glibmm2/examples/iochannel_stream/fdstream.cc deleted file mode 100644 index bc46a3db45..0000000000 --- a/libs/glibmm2/examples/iochannel_stream/fdstream.cc +++ /dev/null @@ -1,402 +0,0 @@ -/* Copyright (C) 2004 The glibmm Development Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include "fdstream.h" - -#include - -fdstreambuf::fdstreambuf() -{ - reset(); -} - -fdstreambuf::fdstreambuf(int fd, bool manage) -{ - create_iochannel(fd, manage); -} - -fdstreambuf::~fdstreambuf() -{ - sync(); -} - -void fdstreambuf::reset() -{ - setg(putback_buffer + 1, putback_buffer + 1, putback_buffer + 1); - error_condition.error = false; -} - -void fdstreambuf::create_iochannel(int fd, bool manage) -{ - sync(); - reset(); - - if(fd >= 0) - { - iochannel_ = Glib::IOChannel::create_from_fd(fd); - - #ifdef GLIBMM_EXCEPTIONS_ENABLED - iochannel_->set_encoding(""); - #else - std::auto_ptr ex; - iochannel_->set_encoding("", ex); - #endif //GLIBMM_EXCEPTIONS_ENABLED - - iochannel_->set_buffered(true); - iochannel_->set_close_on_unref(manage); - } -} - -void fdstreambuf::detach_fd() -{ - iochannel_->set_close_on_unref(false); -} - -void fdstreambuf::connect(const sigc::slot& callback, - Glib::IOCondition condition) -{ - Glib::signal_io().connect(callback, iochannel_, condition); -} - -fdstream_error fdstreambuf::get_error() const -{ - return error_condition; -} - -// the standard requires sync to return 0 for success and -1 for error -int fdstreambuf::sync() -{ - if (!iochannel_) - return -1; - - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - iochannel_->flush(); - } - catch(Glib::IOChannelError& io_error) - { - error_condition.error = true; - error_condition.code = io_error.code(); - return -1; - } - #else - std::auto_ptr io_error; - iochannel_->flush(io_error); - if(io_error.get()) - { - error_condition.error = true; - error_condition.code = (Glib::IOChannelError::Code)io_error->code(); - return -1; - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - - return 0; -} - -void fdstreambuf::close_iochannel() -{ - iochannel_->set_close_on_unref(false); - reset(); - - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - iochannel_->close(true); - } - catch(Glib::IOChannelError& io_error) - { - error_condition.error = true; - error_condition.code = io_error.code(); - } - #else - std::auto_ptr io_error; - iochannel_->close(true, io_error); - if(io_error.get()) - { - error_condition.error = true; - error_condition.code = (Glib::IOChannelError::Code)io_error->code(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - -} - -// the standard requires this to return either the character -// written on overflow or traits_type::eof() (= EOF with char_type == char) -fdstreambuf::traits_type::int_type fdstreambuf::overflow(int_type c) -{ - if(!traits_type::eq_int_type(c, traits_type::eof())) - { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - gsize result = 0; - char write_char = c; - iochannel_->write(&write_char, 1, result); - } - catch(Glib::IOChannelError& io_error) - { - error_condition.error = true; - error_condition.code = io_error.code(); - return traits_type::eof(); - } - #else - std::auto_ptr io_error; - gsize result = 0; - char write_char = c; - iochannel_->write(&write_char, 1, result, io_error); - if(io_error.get()) - { - error_condition.error = true; - error_condition.code = (Glib::IOChannelError::Code)io_error->code(); - return traits_type::eof();; - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - } - return traits_type::not_eof(c); -} - -// the standard requires this to return the number of characters written -// (which will be 0 for stream failure - it is not correct to return EOF) -std::streamsize fdstreambuf::xsputn(const char* source, std::streamsize num) -{ - gsize result = 0; - - // the documentation for Glib::IOChannel indicates that Glib::IOChannel::write() - // will only do a short write in the event of stream failure, so there is no - // need to check result and have a second bite (byte) at it as would be - // necessary with Unix write() - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - iochannel_->write(source, num, result); - } - catch(Glib::IOChannelError& io_error) - { - error_condition.error = true; - error_condition.code = io_error.code(); - result = 0; - } - #else - std::auto_ptr io_error; - iochannel_->write(source, num, result, io_error); - if(io_error.get()) - { - error_condition.error = true; - error_condition.code = (Glib::IOChannelError::Code)io_error->code(); - result = 0; - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - - return result; -} - -// the standard requires this to return the first character available -// on underflow or traits_type::eof() (= EOF with char_type == char) -fdstreambuf::traits_type::int_type fdstreambuf::underflow() -{ - if(gptr() < egptr()) - return traits_type::to_int_type(*gptr()); - - // copy the character in bump position (if any) to putback position - if(gptr() - eback()) - *putback_buffer = *(gptr() - 1); - - // now insert a character into the bump position - gsize result = 0; - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - iochannel_->read(putback_buffer + 1, 1, result); - } - catch(Glib::IOChannelError& io_error) - { - error_condition.error = true; - error_condition.code = io_error.code(); - return traits_type::eof(); - } - #else - std::auto_ptr io_error; - iochannel_->read(putback_buffer + 1, 1, result, io_error); - if(io_error.get()) - { - error_condition.error = true; - error_condition.code = (Glib::IOChannelError::Code)io_error->code(); - return traits_type::eof(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - - // some other error - is this possible? In case it is, cater for it - if (result == 0) - return traits_type::eof(); - - // reset buffer pointers - setg(putback_buffer, - putback_buffer + 1, - putback_buffer + 2); - - // return character in bump/peek position - return traits_type::to_int_type(*gptr()); // == *(putback_buffer + 1) -} - -// the standard requires this to return the number of characters fetched -// (which will be 0 for stream failure - it is not correct to return EOF) -std::streamsize fdstreambuf::xsgetn(char* dest, std::streamsize num) -{ - std::streamsize chars_read = 0; - - // available would normally be 0, but could be up to 2 if there - // have been putbacks or a peek and a putback - std::streamsize available = egptr() - gptr(); - - // if num is less than or equal to the characters already in the - // putback buffer, extract from buffer - if (num <= available) - { - traits_type::copy(dest, gptr(), num); - gbump(num); - chars_read = num; - } - else - { - // first copy out putback buffer - if (available) - { - traits_type::copy(dest, gptr(), available); - chars_read = available; - } - - // read up to everything else we need with Glib::IOChannel::read() - gsize result = 0; - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - #else - std::auto_ptr io_error; - #endif //GLIBMM_EXCEPTIONS_ENABLED - do - { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - iochannel_->read(dest + chars_read, - num - chars_read, - result); - #else - iochannel_->read(dest + chars_read, - num - chars_read, - result, io_error); - #endif //GLIBMM_EXCEPTIONS_ENABLED - - if (result > 0) - chars_read += result; - } - while (result > 0 && result < static_cast(num - chars_read)); - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(Glib::IOChannelError& io_error) - #else - if(io_error.get()) - #endif //GLIBMM_EXCEPTIONS_ENABLED - { - error_condition.error = true; - - #ifdef GLIBMM_EXCEPTIONS_ENABLED - error_condition.code = io_error.code(); - #else - error_condition.code = (Glib::IOChannelError::Code)io_error->code(); - #endif //GLIBMM_EXCEPTIONS_ENABLED - return chars_read; - } - - if(chars_read) - { - // now mimic extraction of all characters by sbumpc() by putting - // two characters into the buffer (if available) and resetting the - // buffer pointers - int putback_count = 0; - if(chars_read >= 2) - { - *putback_buffer = *(dest + (chars_read - 2)); - putback_count = 2; - } - else - { // if we have reached here then we have only fetched - // one character and it must have been read with - // Glib::IOChannel::read() and not taken from the - // putback buffer - otherwise we would have ended - // at the first if block in this method - // - and this also means that gptr() == egptr() - if(gptr() - eback()) - { - *putback_buffer = *(gptr() - 1); - putback_count = 2; - } - else putback_count = 1; - } - - *(putback_buffer + 1) = *(dest + (chars_read - 1)); - - // reset buffer pointers - this->setg(putback_buffer + (2 - putback_count), - putback_buffer + 2, - putback_buffer + 2); - } - } - return chars_read; -} - -fdstream::fdstream(int fd, bool manage) -: std::istream(0), - std::ostream(0), - buf(fd, manage) -{ - std::istream::rdbuf(&buf); - std::ostream::rdbuf(&buf); -} - -fdstream::fdstream() -: std::istream(0), - std::ostream(0) -{ - std::istream::rdbuf(&buf); - std::ostream::rdbuf(&buf); -} - -void fdstream::attach(int fd, bool manage) -{ - buf.create_iochannel(fd, manage); -} - -void fdstream::detach() -{ - buf.detach_fd(); -} - -void fdstream::close() -{ - buf.close_iochannel(); -} - -void fdstream::connect(const sigc::slot& callback, - Glib::IOCondition condition) -{ - buf.connect(callback, condition); -} - -fdstream_error fdstream::get_error() const -{ - return buf.get_error(); -} diff --git a/libs/glibmm2/examples/iochannel_stream/fdstream.h b/libs/glibmm2/examples/iochannel_stream/fdstream.h deleted file mode 100644 index 3dad22f126..0000000000 --- a/libs/glibmm2/examples/iochannel_stream/fdstream.h +++ /dev/null @@ -1,121 +0,0 @@ -/* Copyright (C) 2004 The glibmm Development Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* - * The fdstream/fdstreambuf example classes provide a streambuffer - * interface for Glib::IOChannel, so that standard iostreams can be - * used with fifos, pipes and sockets, with safe temporary files - * opened with mkstemp() and with files opened with other system - * functions such as Unix open(). - * - * It does not make use of the Glib::IOChannel automatic charset code - * conversion facilities (which when enabled will convert from UTF-8 - * to the locale codeset when writing out, and vice-versa when reading - * in). Such automatic codeset conversion is usually undesirable as - * it makes the target file unportable - a file written out in the - * locale charset can only be used by those expecting the same locale - * codeset. It is also unnecessary as the <<() and >>() operators for - * Glib::ustring already carry out this codeset conversion (to avoid - * this use Glib::ustring::raw() when writing out to a stream via - * operator <<(), and read in via a std::string object with operator - * >>()). - * - * If an automatic codeset conversion option is thought to be - * valuable, it would be possible to provide this by having a read - * buffer in fdstreambuf large enough to take and putback six bytes - * (the largest space occupied by a UTF-8 character). This would - * require rewriting fdstreambuf::underflow(), but in compensation - * fdstreambuf::xsgetn() could be omitted, as if a read buffer were - * provided then std::streambuf::xsgetn() would be adequate for the - * purpose by itself. - * - * A serious implementation would probably also provide separate - * read-only ifdstream classes and write-only ofdstream classes, as - * fdstream provides both read and write facilities. -*/ - - -#ifndef GLIBMMEXAMPLE_FDSTREAM_H -#define GLIBMMEXAMPLE_FDSTREAM_H - -#include -#include -#include -#include - -struct fdstream_error -{ - bool error; - Glib::IOChannelError::Code code; -}; - -class fdstreambuf: public std::streambuf -{ -public: - fdstreambuf(int fd, bool manage); - fdstreambuf(); - ~fdstreambuf(); - - void create_iochannel(int fd, bool manage); - void detach_fd(); - void close_iochannel(); - void connect(const sigc::slot& callback, Glib::IOCondition condition); - fdstream_error get_error() const; - -protected: - virtual int_type underflow(); - virtual std::streamsize xsgetn(char* dest, std::streamsize num); - virtual int sync(); - virtual int_type overflow(int_type c); - virtual std::streamsize xsputn(const char* source, std::streamsize num); - -private: - Glib::RefPtr iochannel_; - fdstream_error error_condition; - - // putback_buffer does not do any buffering: it reserves one character - // for putback and one character for a peek() and/or for bumping - // with sbumpc/uflow() - char putback_buffer[2]; - - void reset(); -}; - -class fdstream : - public std::istream, - public std::ostream -{ -public: - - explicit fdstream(int fd, bool manage = true); - fdstream(); - - // If fdstream is managing a file descriptor, attaching a new - // one will close the old one - call detach() to unmanage it - void attach(int fd, bool manage = true); - void detach(); - - void close(); - void connect(const sigc::slot& callback, - Glib::IOCondition condition); - fdstream_error get_error() const; - -private: - fdstreambuf buf; -}; - -#endif /*GLIBMMEXAMPLE_FDSTREAM_H*/ diff --git a/libs/glibmm2/examples/iochannel_stream/main.cc b/libs/glibmm2/examples/iochannel_stream/main.cc deleted file mode 100644 index 873f989cc5..0000000000 --- a/libs/glibmm2/examples/iochannel_stream/main.cc +++ /dev/null @@ -1,102 +0,0 @@ -/* Copyright (C) 2004 The glibmm Development Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fdstream.h" - -fdstream input_stream; -Glib::RefPtr mainloop; - -/* - send to the fifo with: - echo "Hello" > testfifo - - quit the program with: - echo "Q" > testfifo -*/ - -// this will be our signal handler for read operations -// it will print out the message sent to the fifo -// and quit the program if the message was, or began -// with, 'Q' -bool MyCallback(Glib::IOCondition io_condition) -{ - if ((io_condition & Glib::IO_IN) == 0) - { - std::cerr << "Invalid fifo response" << std::endl; - } - else - { - // stream for stdout (does the same as std::cout - // - this is an example of using fdstream for output) - fdstream out(1, false); - std::string text; - input_stream >> text; - out << text << std::endl; - - if (text[0] == 'Q') - mainloop->quit(); - } - - return true; -} - - -int main( /* int argc, char *argv[] */) -{ - Glib::init(); - - // the usual Glib::Main object - mainloop = Glib::MainLoop::create(); - - if(access("testfifo", F_OK) == -1) - { - // fifo doesn't exit - create it - if (mkfifo("testfifo", 0666) != 0) - { - std::cerr << "error creating fifo" << std::endl; - return -1; - } - } - - int read_fd = open("testfifo", O_RDONLY); - if(read_fd == -1) - { - std::cerr << "error opening fifo" << std::endl; - return -1; - } - - input_stream.attach(read_fd); - input_stream.connect(sigc::ptr_fun(MyCallback), Glib::IO_IN); - - // and last but not least - run the application main loop - mainloop->run(); - - // now remove the temporary fifo - if(unlink("testfifo")) - std::cerr << "error removing fifo" << std::endl; - - return 0; -} diff --git a/libs/glibmm2/examples/markup/parser.cc b/libs/glibmm2/examples/markup/parser.cc deleted file mode 100644 index c9286f6c0b..0000000000 --- a/libs/glibmm2/examples/markup/parser.cc +++ /dev/null @@ -1,176 +0,0 @@ -/* Copyright (C) 2002 The gtkmm Development Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#include -#include -#include - - -namespace -{ - -#ifndef GLIBMM_EXCEPTIONS_ENABLED -//This is an alternative, to use when we have disabled exceptions: -std::auto_ptr processing_error; -#endif //GLIBMM_EXCEPTIONS_ENABLED - -void file_get_contents(const std::string& filename, Glib::ustring& contents) -{ - #ifdef GLIBMM_EXCEPTIONS_ENABLED - const Glib::RefPtr channel = Glib::IOChannel::create_from_file(filename, "r"); - channel->read_to_end(contents); - #else - const Glib::RefPtr channel = Glib::IOChannel::create_from_file(filename, "r", processing_error); - channel->read_to_end(contents, processing_error); - #endif //GLIBMM_EXCEPTIONS_ENABLED -} - -Glib::ustring trim_whitespace(const Glib::ustring& text) -{ - Glib::ustring::const_iterator pbegin (text.begin()); - Glib::ustring::const_iterator pend (text.end()); - - while(pbegin != pend && Glib::Unicode::isspace(*pbegin)) - ++pbegin; - - Glib::ustring::const_iterator temp (pend); - - while(pbegin != temp && Glib::Unicode::isspace(*--temp)) - pend = temp; - - return Glib::ustring(pbegin, pend); -} - - -class DumpParser : public Glib::Markup::Parser -{ -public: - DumpParser(); - virtual ~DumpParser(); - -protected: - virtual void on_start_element(Glib::Markup::ParseContext& context, - const Glib::ustring& element_name, - const AttributeMap& attributes); - - virtual void on_end_element(Glib::Markup::ParseContext& context, - const Glib::ustring& element_name); - - virtual void on_text(Glib::Markup::ParseContext& context, const Glib::ustring& text); - -private: - int parse_depth_; - - void indent(); -}; - -DumpParser::DumpParser() -: - parse_depth_ (0) -{} - -DumpParser::~DumpParser() -{} - -void DumpParser::on_start_element(Glib::Markup::ParseContext&, - const Glib::ustring& element_name, - const AttributeMap& attributes) -{ - indent(); - std::cout << '<' << element_name; - - for(AttributeMap::const_iterator p = attributes.begin(); p != attributes.end(); ++p) - { - std::cout << ' ' << p->first << "=\"" << p->second << '"'; - } - - std::cout << ">\n"; - - ++parse_depth_; -} - -void DumpParser::on_end_element(Glib::Markup::ParseContext&, const Glib::ustring& element_name) -{ - --parse_depth_; - - indent(); - std::cout << "\n"; -} - -void DumpParser::on_text(Glib::Markup::ParseContext&, const Glib::ustring& text) -{ - const Glib::ustring trimmed_text = trim_whitespace(text); - - if(!trimmed_text.empty()) - { - indent(); - std::cout << trimmed_text << '\n'; - } -} - -void DumpParser::indent() -{ - if(parse_depth_ > 0) - { - std::cout << std::setw(4 * parse_depth_) - /* gcc 2.95.3 doesn't like this: << std::right */ - << ' '; - } -} - -} // anonymous namespace - - -int main(int argc, char** argv) -{ - if(argc < 2) - { - std::cerr << "Usage: parser filename\n"; - return 1; - } - - DumpParser parser; - Glib::Markup::ParseContext context (parser); - - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - #endif //GLIBMM_EXCEPTIONS_ENABLED - Glib::ustring contents; - file_get_contents(argv[1], contents); - - context.parse(contents); - context.end_parse(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(const Glib::Error& error) - { - std::cerr << argv[1] << ": " << error.what() << std::endl; - return 1; - } - #else - if(processing_error.get()) - { - std::cerr << argv[1] << ": " << processing_error->what() << std::endl; - return 1; - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - - - return 0; -} - diff --git a/libs/glibmm2/examples/markup/test.xml b/libs/glibmm2/examples/markup/test.xml deleted file mode 100644 index 890f08cc37..0000000000 --- a/libs/glibmm2/examples/markup/test.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - basic libglademm example - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - 2 - True - False - 0 - - - - 5 - True - GTK_BUTTONBOX_END - 10 - - - - True - True - True - gtk-quit - True - GTK_RELIEF_NORMAL - 0 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - This is a basic libglademm example - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - diff --git a/libs/glibmm2/examples/thread/Makefile.am b/libs/glibmm2/examples/thread/Makefile.am deleted file mode 100644 index 4360557086..0000000000 --- a/libs/glibmm2/examples/thread/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -include $(top_srcdir)/examples/Makefile.am_fragment - -INCLUDES += $(GTHREAD_CFLAGS) - -## Build the executable, but don't install it. -noinst_PROGRAMS = dispatcher dispatcher2 thread threadpool - -dispatcher_SOURCES = dispatcher.cc -dispatcher_LDFLAGS = $(GTHREAD_LIBS) - -dispatcher2_SOURCES = dispatcher2.cc -dispatcher2_LDFLAGS = $(GTHREAD_LIBS) - -thread_SOURCES = thread.cc -thread_LDFLAGS = $(GTHREAD_LIBS) - -threadpool_SOURCES = threadpool.cc -threadpool_LDFLAGS = $(GTHREAD_LIBS) - diff --git a/libs/glibmm2/examples/thread/Makefile.in b/libs/glibmm2/examples/thread/Makefile.in deleted file mode 100644 index d4b6a2aef7..0000000000 --- a/libs/glibmm2/examples/thread/Makefile.in +++ /dev/null @@ -1,523 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/examples/Makefile.am_fragment -noinst_PROGRAMS = dispatcher$(EXEEXT) dispatcher2$(EXEEXT) \ - thread$(EXEEXT) threadpool$(EXEEXT) -subdir = examples/thread -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -PROGRAMS = $(noinst_PROGRAMS) -am_dispatcher_OBJECTS = dispatcher.$(OBJEXT) -dispatcher_OBJECTS = $(am_dispatcher_OBJECTS) -dispatcher_LDADD = $(LDADD) -am_dispatcher2_OBJECTS = dispatcher2.$(OBJEXT) -dispatcher2_OBJECTS = $(am_dispatcher2_OBJECTS) -dispatcher2_LDADD = $(LDADD) -am_thread_OBJECTS = thread.$(OBJEXT) -thread_OBJECTS = $(am_thread_OBJECTS) -thread_LDADD = $(LDADD) -am_threadpool_OBJECTS = threadpool.$(OBJEXT) -threadpool_OBJECTS = $(am_threadpool_OBJECTS) -threadpool_LDADD = $(LDADD) -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(dispatcher_SOURCES) $(dispatcher2_SOURCES) \ - $(thread_SOURCES) $(threadpool_SOURCES) -DIST_SOURCES = $(dispatcher_SOURCES) $(dispatcher2_SOURCES) \ - $(thread_SOURCES) $(threadpool_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ -LIBOBJS = @LIBOBJS@ -LIBS = $(local_glibmm_lib) $(GLIBMM_LIBS) -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -local_glibmm_lib = $(top_builddir)/glib/glibmm/libglibmm-2.4.la -all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \ - $(GLIBMM_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) - -DEFAULT_INCLUDES = -INCLUDES = -I. -I$(srcdir) $(strip $(all_includes)) $(GTHREAD_CFLAGS) -glibmm_docdir = $(datadir)/doc/glibmm-2.4 -dispatcher_SOURCES = dispatcher.cc -dispatcher_LDFLAGS = $(GTHREAD_LIBS) -dispatcher2_SOURCES = dispatcher2.cc -dispatcher2_LDFLAGS = $(GTHREAD_LIBS) -thread_SOURCES = thread.cc -thread_LDFLAGS = $(GTHREAD_LIBS) -threadpool_SOURCES = threadpool.cc -threadpool_LDFLAGS = $(GTHREAD_LIBS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/examples/Makefile.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/thread/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/thread/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -dispatcher$(EXEEXT): $(dispatcher_OBJECTS) $(dispatcher_DEPENDENCIES) - @rm -f dispatcher$(EXEEXT) - $(CXXLINK) $(dispatcher_LDFLAGS) $(dispatcher_OBJECTS) $(dispatcher_LDADD) $(LIBS) -dispatcher2$(EXEEXT): $(dispatcher2_OBJECTS) $(dispatcher2_DEPENDENCIES) - @rm -f dispatcher2$(EXEEXT) - $(CXXLINK) $(dispatcher2_LDFLAGS) $(dispatcher2_OBJECTS) $(dispatcher2_LDADD) $(LIBS) -thread$(EXEEXT): $(thread_OBJECTS) $(thread_DEPENDENCIES) - @rm -f thread$(EXEEXT) - $(CXXLINK) $(thread_LDFLAGS) $(thread_OBJECTS) $(thread_LDADD) $(LIBS) -threadpool$(EXEEXT): $(threadpool_OBJECTS) $(threadpool_DEPENDENCIES) - @rm -f threadpool$(EXEEXT) - $(CXXLINK) $(threadpool_LDFLAGS) $(threadpool_OBJECTS) $(threadpool_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dispatcher.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dispatcher2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadpool.Po@am__quote@ - -.cc.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../examples - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-data-local - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-local - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am uninstall-local - - -install-example-src: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(glibmm_docdir)/$(subdir) - for p in $(srcdir)/*.cc $(srcdir)/*.h; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f; \ - fi; \ - done - -uninstall-example-src: - @$(NORMAL_UNINSTALL) - for p in $(srcdir)/*.cc $(srcdir)/*.h; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f"; \ - rm -f $(DESTDIR)$(glibmm_docdir)/$(subdir)/$$f; \ - fi; \ - done - -install-data-local: install-example-src - -uninstall-local: uninstall-example-src - -.PHONY: install-example-src uninstall-example-src -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/examples/thread/dispatcher.cc b/libs/glibmm2/examples/thread/dispatcher.cc deleted file mode 100644 index ca74d05db9..0000000000 --- a/libs/glibmm2/examples/thread/dispatcher.cc +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Glib::Dispatcher example -- cross thread signalling - * by Daniel Elstner - * - * modified to only use glibmm - * by J. Abelardo Gutierrez - * - * Copyright (c) 2002-2003 Free Software Foundation - */ - -#include - -#include -#include -#include -#include -#include - - -namespace -{ - -class ThreadProgress : public sigc::trackable -{ -public: - explicit ThreadProgress(int id); - virtual ~ThreadProgress(); - - void launch(); - void join(); - - sigc::signal& signal_finished(); - int id() const; - - virtual void reference() const { ++ref_count_; } - virtual void unreference() const { if (!(--ref_count_)) delete this; } - -private: - Glib::Thread* thread_; - int id_; - unsigned int progress_; - Glib::Dispatcher signal_increment_; - sigc::signal signal_finished_; - - void progress_increment(); - void thread_function(); - - mutable int ref_count_; - -}; - -class Application : public sigc::trackable -{ -public: - Application(); - virtual ~Application(); - - void launch_threads(); - void run(); - -private: - Glib::RefPtr main_loop_; - std::list progress_list_; - std::list > progress_ref_list_; - - void on_progress_finished(ThreadProgress* thread_progress); -}; - - -ThreadProgress::ThreadProgress(int id) -: - thread_ (0), - id_ (id), - progress_ (0), - ref_count_(0) -{ - // Increment the reference count - reference(); - // Connect to the cross-thread signal. - signal_increment_.connect(sigc::mem_fun(*this, &ThreadProgress::progress_increment)); -} - -ThreadProgress::~ThreadProgress() -{} - -void ThreadProgress::launch() -{ - // Create a joinable thread. - thread_ = Glib::Thread::create(sigc::mem_fun(*this, &ThreadProgress::thread_function), true); -} - -void ThreadProgress::join() -{ - thread_->join(); -} - -sigc::signal& ThreadProgress::signal_finished() -{ - return signal_finished_; -} - -int ThreadProgress::id() const -{ - return id_; -} - -void ThreadProgress::progress_increment() -{ - // Use an integer because floating point arithmetic is inaccurate -- - // we want to finish *exactly* after the 100th increment. - ++progress_; - - std::cout << "Thread " << id_ << ": " << progress_ << '%' << std::endl; - - if(progress_ >= 100) - signal_finished_(); -} - -void ThreadProgress::thread_function() -{ - Glib::Rand rand; - int usecs = 5000; - - for(int i = 0; i < 100; ++i) - { - usecs = rand.get_int_range(std::max(0, usecs - 1000 - i), std::min(20000, usecs + 1000 + i)); - Glib::usleep(usecs); - - // Tell the main thread to increment the progress value. - signal_increment_(); - } -} - -Application::Application() -: - main_loop_ (Glib::MainLoop::create()) -{ - std::cout << "Thread Dispatcher Example." << std::endl; - - for(int i = 1; i <= 5; ++i) - { - ThreadProgress* progress=new ThreadProgress(i); - progress_list_.push_back(progress); - progress_ref_list_.push_back(Glib::RefPtr(progress)); - - progress->signal_finished().connect( - sigc::bind<1>(sigc::mem_fun(*this, &Application::on_progress_finished), progress)); - } -} - -Application::~Application() -{ -} - -void Application::launch_threads() -{ - std::for_each(progress_list_.begin(), progress_list_.end(), - std::mem_fun(&ThreadProgress::launch)); -} - -void Application::run() -{ - main_loop_->run(); -} - -void Application::on_progress_finished(ThreadProgress* thread_progress) -{ - { - progress_list_.remove(thread_progress); - thread_progress->join(); - - std::cout << "Thread " << thread_progress->id() - << ": finished." << std::endl; - } - - if(progress_list_.empty()) - main_loop_->quit(); -} - -} // anonymous namespace - - -int main(int, char**) -{ - Glib::thread_init(); - - Application application; - - // Install a one-shot idle handler to launch the threads - Glib::signal_idle().connect( - sigc::bind_return(sigc::mem_fun(application, &Application::launch_threads), false)); - - application.run(); - - return 0; -} - diff --git a/libs/glibmm2/examples/thread/dispatcher2.cc b/libs/glibmm2/examples/thread/dispatcher2.cc deleted file mode 100644 index fd7379e39c..0000000000 --- a/libs/glibmm2/examples/thread/dispatcher2.cc +++ /dev/null @@ -1,232 +0,0 @@ -/* - * original Glib::Dispatcher example -- cross thread signalling - * by Daniel Elstner - * - * Modified by Stephan Puchegger - * to contain 2 mainloops in 2 different threads, that communicate - * via cross thread signalling in both directions. The timer thread - * sends the UI thread a cross thread signal every second, which in turn - * updates the label stating how many seconds have passed since the start - * of the program. - * - * Modified by J. Abelardo Gutierrez - * to cast all gtkmm out and make it glimm only - * - * Note: This example is special stuff that's seldomly needed by the - * vast majority of applications. Don't bother working out what this - * code does unless you know for sure you need 2 main loops running in - * 2 distinct main contexts. - * - * Copyright (c) 2002-2003 Free Software Foundation - */ - -#include -#include -#include - - -namespace -{ -Glib::RefPtr main_loop; - -class ThreadTimer : public sigc::trackable -{ -public: - ThreadTimer(); - ~ThreadTimer(); - - void launch(); - void signal_finished_emit(); - void print() const; - - typedef sigc::signal type_signal_end; - static type_signal_end& signal_end(); - -private: - unsigned int time_; - Glib::Dispatcher signal_increment_; - Glib::Dispatcher* signal_finished_ptr_; - - Glib::Mutex startup_mutex_; - Glib::Cond startup_cond_; - Glib::Thread* thread_; - - static type_signal_end signal_end_; - - void timer_increment(); - bool timeout_handler(); - static void finished_handler(Glib::RefPtr mainloop); - void thread_function(); -}; - -//TODO: Rename to avoid confusion with Glib::Dispatcher. murrayc -class Dispatcher : public sigc::trackable -{ -public: - Dispatcher(); - - void launch_thread(); - void end(); - -private: - ThreadTimer* timer_; -}; - -ThreadTimer::ThreadTimer() -: - time_ (0), - // Create a new dispatcher that is attached to the default main context, - signal_increment_ (), - // This pointer will be initialized later by the 2nd thread. - signal_finished_ptr_ (NULL) -{ - // Connect the cross-thread signal. - signal_increment_.connect(sigc::mem_fun(*this, &ThreadTimer::timer_increment)); -} - -ThreadTimer::~ThreadTimer() -{} - -void ThreadTimer::launch() -{ - // Unfortunately, the thread creation has to be fully synchronized in - // order to access the Dispatcher object instantiated by the 2nd thread. - // So, let's do some kind of hand-shake using a mutex and a condition - // variable. - Glib::Mutex::Lock lock (startup_mutex_); - - // Create a joinable thread -- it needs to be joined, otherwise it's a memory leak. - thread_ = Glib::Thread::create( - sigc::mem_fun(*this, &ThreadTimer::thread_function), true); - - // Wait for the 2nd thread's startup notification. - while(signal_finished_ptr_ == NULL) - startup_cond_.wait(startup_mutex_); -} - -void ThreadTimer::signal_finished_emit() -{ - // Cause the 2nd thread's main loop to quit. - signal_finished_ptr_->emit(); - - // wait for the thread to join - if(thread_ != NULL) - thread_->join(); - - signal_finished_ptr_ = NULL; -} - -void ThreadTimer::print() const -{ - std::cout << time_ << " seconds since start" << std::endl; -} - -sigc::signal< void >& ThreadTimer::signal_end() -{ - return signal_end_; -} - -void ThreadTimer::timer_increment() -{ - // another second has passed since the start of the program - ++time_; - print(); - - if(time_ >= 10) - signal_finished_emit(); -} - -// static -void ThreadTimer::finished_handler(Glib::RefPtr mainloop) -{ - // quit the timer thread mainloop - mainloop->quit(); - std::cout << "timer thread mainloop finished" << std::endl; - ThreadTimer::signal_end().emit(); -} - -bool ThreadTimer::timeout_handler() -{ - // inform the printing thread that another second has passed - signal_increment_(); - - // this timer should stay alive - return true; -} - -void ThreadTimer::thread_function() -{ - // create a new Main Context - Glib::RefPtr context = Glib::MainContext::create(); - // create a new Main Loop - Glib::RefPtr mainloop = Glib::MainLoop::create(context, true); - - // attach a timeout handler, that is called every second, to the - // newly created MainContext - context->signal_timeout().connect(sigc::mem_fun(*this, &ThreadTimer::timeout_handler), 1000); - - // We need to lock while creating the Dispatcher instance, - // in order to ensure memory visibility. - Glib::Mutex::Lock lock (startup_mutex_); - - // create a new dispatcher, that is connected to the newly - // created MainContext - Glib::Dispatcher signal_finished (context); - - signal_finished.connect(sigc::bind(sigc::ptr_fun(&ThreadTimer::finished_handler), mainloop)); - - signal_finished_ptr_ = &signal_finished; - - // Tell the launcher thread that everything is in place now. - startup_cond_.signal(); - lock.release(); - - // start the mainloop - mainloop->run(); -} - -// initialize static member: -ThreadTimer::type_signal_end ThreadTimer::signal_end_; - -Dispatcher::Dispatcher() -: - timer_ (NULL) -{ - std::cout << "Thread Dispatcher Example #2" << std::endl; - - timer_ = new ThreadTimer(); - timer_->signal_end().connect(sigc::mem_fun(*this, &Dispatcher::end)); - timer_->print(); -} - -void Dispatcher::launch_thread() -{ - // launch the timer thread - timer_->launch(); -} - -void Dispatcher::end() -{ - // quit the main mainloop - main_loop->quit(); -} - -} // anonymous namespace - - -int main(int, char**) -{ - Glib::thread_init(); - main_loop = Glib::MainLoop::create(); - - Dispatcher dispatcher; - - // Install a one-shot idle handler to launch the threads - Glib::signal_idle().connect( - sigc::bind_return(sigc::mem_fun(dispatcher, &Dispatcher::launch_thread), false)); - - main_loop->run(); - - return 0; -} - diff --git a/libs/glibmm2/examples/thread/thread.cc b/libs/glibmm2/examples/thread/thread.cc deleted file mode 100644 index d1882069dd..0000000000 --- a/libs/glibmm2/examples/thread/thread.cc +++ /dev/null @@ -1,113 +0,0 @@ - -#include -#include -#include -#include -#include - - -namespace -{ - -class MessageQueue : public sigc::trackable -{ -public: - MessageQueue(); - ~MessageQueue(); - - void producer(); - void consumer(); - -private: - Glib::Mutex mutex_; - Glib::Cond cond_push_; - Glib::Cond cond_pop_; - std::queue queue_; -}; - - -MessageQueue::MessageQueue() -{} - -MessageQueue::~MessageQueue() -{} - -void MessageQueue::producer() -{ - Glib::Rand rand (1234); - - for(int i = 0; i < 200; ++i) - { - { - Glib::Mutex::Lock lock (mutex_); - - while(queue_.size() >= 64) - cond_pop_.wait(mutex_); - - queue_.push(i); - std::cout << '*'; - std::cout.flush(); - - cond_push_.signal(); - } - - if(rand.get_bool()) - continue; - - Glib::usleep(rand.get_int_range(0, 100000)); - } -} - -void MessageQueue::consumer() -{ - Glib::Rand rand (4567); - - for(;;) - { - { - Glib::Mutex::Lock lock (mutex_); - - while(queue_.empty()) - cond_push_.wait(mutex_); - - const int i = queue_.front(); - queue_.pop(); - std::cout << "\x08 \x08"; - std::cout.flush(); - - cond_pop_.signal(); - - if(i >= 199) - break; - } - - if(rand.get_bool()) - continue; - - Glib::usleep(rand.get_int_range(10000, 200000)); - } -} - -} - - -int main(int, char**) -{ - Glib::thread_init(); - - MessageQueue queue; - - Glib::Thread *const producer = Glib::Thread::create( - sigc::mem_fun(queue, &MessageQueue::producer), true); - - Glib::Thread *const consumer = Glib::Thread::create( - sigc::mem_fun(queue, &MessageQueue::consumer), true); - - producer->join(); - consumer->join(); - - std::cout << std::endl; - - return 0; -} - diff --git a/libs/glibmm2/examples/thread/threadpool.cc b/libs/glibmm2/examples/thread/threadpool.cc deleted file mode 100644 index 8b36277d04..0000000000 --- a/libs/glibmm2/examples/thread/threadpool.cc +++ /dev/null @@ -1,49 +0,0 @@ - -#include -#include -#include -#include -#include - - -namespace -{ - -Glib::StaticMutex mutex = GLIBMM_STATIC_MUTEX_INIT; - -void print_char(char c) -{ - Glib::Rand rand; - - for(int i = 0; i < 100; ++i) - { - { - Glib::Mutex::Lock lock (mutex); - std::cout << c; - std::cout.flush(); - } - Glib::usleep(rand.get_int_range(10000, 100000)); - } -} - -} // anonymous namespace - - -int main(int, char**) -{ - Glib::thread_init(); - - Glib::ThreadPool pool (10); - - for(char c = 'a'; c <= 'z'; ++c) - { - pool.push(sigc::bind<1>(sigc::ptr_fun(&print_char), c)); - } - - pool.shutdown(); - - std::cout << std::endl; - - return 0; -} - diff --git a/libs/glibmm2/glib/Makefile b/libs/glibmm2/glib/Makefile deleted file mode 100644 index 2839f31952..0000000000 --- a/libs/glibmm2/glib/Makefile +++ /dev/null @@ -1,609 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# glib/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - - -srcdir = . -top_srcdir = .. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = glib -DIST_COMMON = README $(glibmm_include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/glibmm-2.4.pc.in \ - $(srcdir)/glibmmconfig.h.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h glibmmconfig.h -CONFIG_CLEAN_FILES = glibmm-2.4.pc -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(glibmm_configdir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(glibmm_includedir)" -glibmm_configDATA_INSTALL = $(INSTALL_DATA) -pkgconfigDATA_INSTALL = $(INSTALL_DATA) -DATA = $(glibmm_config_DATA) $(pkgconfig_DATA) -glibmm_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(glibmm_include_HEADERS) -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -SUBDIRS = src glibmm -EXTRA_DIST = README glibmmconfig.h.in glibmm-2.4.pc.in -glibmm_includedir = $(includedir)/glibmm-2.4 -glibmm_include_HEADERS = glibmm.h -glibmm_configdir = $(libdir)/glibmm-2.4/include -glibmm_config_DATA = glibmmconfig.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = glibmm-2.4.pc -all: glibmmconfig.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glib/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu glib/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -glibmmconfig.h: stamp-h2 - @if test ! -f $@; then \ - rm -f stamp-h2; \ - $(MAKE) stamp-h2; \ - else :; fi - -stamp-h2: $(srcdir)/glibmmconfig.h.in $(top_builddir)/config.status - @rm -f stamp-h2 - cd $(top_builddir) && $(SHELL) ./config.status glib/glibmmconfig.h -$(srcdir)/glibmmconfig.h.in: # $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h2 - touch $@ - -distclean-hdr: - -rm -f glibmmconfig.h stamp-h2 -glibmm-2.4.pc: $(top_builddir)/config.status $(srcdir)/glibmm-2.4.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-glibmm_configDATA: $(glibmm_config_DATA) - @$(NORMAL_INSTALL) - test -z "$(glibmm_configdir)" || $(mkdir_p) "$(DESTDIR)$(glibmm_configdir)" - @list='$(glibmm_config_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(glibmm_configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(glibmm_configdir)/$$f'"; \ - $(glibmm_configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(glibmm_configdir)/$$f"; \ - done - -uninstall-glibmm_configDATA: - @$(NORMAL_UNINSTALL) - @list='$(glibmm_config_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(glibmm_configdir)/$$f'"; \ - rm -f "$(DESTDIR)$(glibmm_configdir)/$$f"; \ - done -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done -install-glibmm_includeHEADERS: $(glibmm_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(glibmm_includedir)" || $(mkdir_p) "$(DESTDIR)$(glibmm_includedir)" - @list='$(glibmm_include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(glibmm_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(glibmm_includedir)/$$f'"; \ - $(glibmm_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(glibmm_includedir)/$$f"; \ - done - -uninstall-glibmm_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(glibmm_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(glibmm_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(glibmm_includedir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) glibmmconfig.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) glibmmconfig.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) glibmmconfig.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) glibmmconfig.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(DATA) $(HEADERS) glibmmconfig.h -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(glibmm_configdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(glibmm_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-glibmm_configDATA \ - install-glibmm_includeHEADERS install-pkgconfigDATA - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-glibmm_configDATA \ - uninstall-glibmm_includeHEADERS uninstall-info-am \ - uninstall-pkgconfigDATA - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-glibmm_configDATA install-glibmm_includeHEADERS \ - install-info install-info-am install-man install-pkgconfigDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-glibmm_configDATA uninstall-glibmm_includeHEADERS \ - uninstall-info-am uninstall-pkgconfigDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/glib/Makefile.in b/libs/glibmm2/glib/Makefile.in index 7962637034..8eda5aef52 100644 --- a/libs/glibmm2/glib/Makefile.in +++ b/libs/glibmm2/glib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -42,8 +38,8 @@ DIST_COMMON = README $(glibmm_include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/glibmm-2.4.pc.in \ $(srcdir)/glibmmconfig.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -58,10 +54,11 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -75,13 +72,13 @@ pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(glibmm_config_DATA) $(pkgconfig_DATA) glibmm_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(glibmm_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -119,12 +116,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -138,13 +135,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -154,27 +148,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -186,28 +171,39 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = src glibmm EXTRA_DIST = README glibmmconfig.h.in glibmm-2.4.pc.in glibmm_includedir = $(includedir)/glibmm-2.4 @@ -253,7 +249,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) glibmmconfig.h: stamp-h2 @if test ! -f $@; then \ rm -f stamp-h2; \ - $(MAKE) stamp-h2; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \ else :; fi stamp-h2: $(srcdir)/glibmmconfig.h.in $(top_builddir)/config.status @@ -274,13 +270,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-glibmm_configDATA: $(glibmm_config_DATA) @$(NORMAL_INSTALL) - test -z "$(glibmm_configdir)" || $(mkdir_p) "$(DESTDIR)$(glibmm_configdir)" + test -z "$(glibmm_configdir)" || $(MKDIR_P) "$(DESTDIR)$(glibmm_configdir)" @list='$(glibmm_config_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -297,7 +289,7 @@ uninstall-glibmm_configDATA: done install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -314,7 +306,7 @@ uninstall-pkgconfigDATA: done install-glibmm_includeHEADERS: $(glibmm_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(glibmm_includedir)" || $(mkdir_p) "$(DESTDIR)$(glibmm_includedir)" + test -z "$(glibmm_includedir)" || $(MKDIR_P) "$(DESTDIR)$(glibmm_includedir)" @list='$(glibmm_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -361,8 +353,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -463,22 +454,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -492,7 +482,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -500,6 +490,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -510,7 +502,7 @@ all-am: Makefile $(DATA) $(HEADERS) glibmmconfig.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(glibmm_configdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(glibmm_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -542,8 +534,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags dvi: dvi-recursive @@ -558,12 +549,20 @@ info-am: install-data-am: install-glibmm_configDATA \ install-glibmm_includeHEADERS install-pkgconfigDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -583,26 +582,27 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-glibmm_configDATA \ - uninstall-glibmm_includeHEADERS uninstall-info-am \ - uninstall-pkgconfigDATA + uninstall-glibmm_includeHEADERS uninstall-pkgconfigDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-recursive distclean-tags distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-glibmm_configDATA install-glibmm_includeHEADERS \ - install-info install-info-am install-man install-pkgconfigDATA \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-glibmm_configDATA \ + install-glibmm_includeHEADERS install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-glibmm_configDATA uninstall-glibmm_includeHEADERS \ - uninstall-info-am uninstall-pkgconfigDATA + uninstall-pkgconfigDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libs/glibmm2/glib/glibmm-2.4.pc b/libs/glibmm2/glib/glibmm-2.4.pc index 61cc46ca19..c50ae1e78b 100644 --- a/libs/glibmm2/glib/glibmm-2.4.pc +++ b/libs/glibmm2/glib/glibmm-2.4.pc @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: GLibmm Description: C++ wrapper for GLib Requires: gobject-2.0 sigc++-2.0 -Version: 2.13.3 +Version: 2.14.2 Libs: -L${libdir} -lglibmm-2.4 Cflags: -I${includedir}/glibmm-2.4 -I${libdir}/glibmm-2.4/include diff --git a/libs/glibmm2/glib/glibmm.h b/libs/glibmm2/glib/glibmm.h index f7bd36512b..af82e057d4 100644 --- a/libs/glibmm2/glib/glibmm.h +++ b/libs/glibmm2/glib/glibmm.h @@ -1,4 +1,4 @@ -/* $Id: glibmm.h,v 1.5 2006/09/19 20:36:41 murrayc Exp $ */ +/* $Id: glibmm.h 417 2007-06-12 13:38:39Z murrayc $ */ /* glibmm - a C++ wrapper for the GLib toolkit * @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include diff --git a/libs/glibmm2/glib/glibmm/.deps/class.Plo b/libs/glibmm2/glib/glibmm/.deps/class.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/class.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/containers.Plo b/libs/glibmm2/glib/glibmm/.deps/containers.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/containers.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/convert.Plo b/libs/glibmm2/glib/glibmm/.deps/convert.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/convert.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/date.Plo b/libs/glibmm2/glib/glibmm/.deps/date.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/date.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/debug.Plo b/libs/glibmm2/glib/glibmm/.deps/debug.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/debug.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/dispatcher.Plo b/libs/glibmm2/glib/glibmm/.deps/dispatcher.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/dispatcher.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/error.Plo b/libs/glibmm2/glib/glibmm/.deps/error.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/error.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/exception.Plo b/libs/glibmm2/glib/glibmm/.deps/exception.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/exception.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/exceptionhandler.Plo b/libs/glibmm2/glib/glibmm/.deps/exceptionhandler.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/exceptionhandler.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/fileutils.Plo b/libs/glibmm2/glib/glibmm/.deps/fileutils.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/fileutils.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/init.Plo b/libs/glibmm2/glib/glibmm/.deps/init.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/init.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/interface.Plo b/libs/glibmm2/glib/glibmm/.deps/interface.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/interface.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/iochannel.Plo b/libs/glibmm2/glib/glibmm/.deps/iochannel.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/iochannel.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/keyfile.Plo b/libs/glibmm2/glib/glibmm/.deps/keyfile.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/keyfile.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/main.Plo b/libs/glibmm2/glib/glibmm/.deps/main.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/main.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/markup.Plo b/libs/glibmm2/glib/glibmm/.deps/markup.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/markup.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/miscutils.Plo b/libs/glibmm2/glib/glibmm/.deps/miscutils.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/miscutils.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/module.Plo b/libs/glibmm2/glib/glibmm/.deps/module.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/module.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/object.Plo b/libs/glibmm2/glib/glibmm/.deps/object.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/object.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/objectbase.Plo b/libs/glibmm2/glib/glibmm/.deps/objectbase.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/objectbase.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/optioncontext.Plo b/libs/glibmm2/glib/glibmm/.deps/optioncontext.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/optioncontext.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/optionentry.Plo b/libs/glibmm2/glib/glibmm/.deps/optionentry.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/optionentry.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/optiongroup.Plo b/libs/glibmm2/glib/glibmm/.deps/optiongroup.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/optiongroup.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/pattern.Plo b/libs/glibmm2/glib/glibmm/.deps/pattern.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/pattern.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/property.Plo b/libs/glibmm2/glib/glibmm/.deps/property.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/property.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/propertyproxy.Plo b/libs/glibmm2/glib/glibmm/.deps/propertyproxy.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/propertyproxy.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/propertyproxy_base.Plo b/libs/glibmm2/glib/glibmm/.deps/propertyproxy_base.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/propertyproxy_base.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/quark.Plo b/libs/glibmm2/glib/glibmm/.deps/quark.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/quark.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/random.Plo b/libs/glibmm2/glib/glibmm/.deps/random.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/random.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/shell.Plo b/libs/glibmm2/glib/glibmm/.deps/shell.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/shell.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/signalproxy.Plo b/libs/glibmm2/glib/glibmm/.deps/signalproxy.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/signalproxy.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/signalproxy_connectionnode.Plo b/libs/glibmm2/glib/glibmm/.deps/signalproxy_connectionnode.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/signalproxy_connectionnode.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/spawn.Plo b/libs/glibmm2/glib/glibmm/.deps/spawn.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/spawn.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/streamiochannel.Plo b/libs/glibmm2/glib/glibmm/.deps/streamiochannel.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/streamiochannel.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/stringutils.Plo b/libs/glibmm2/glib/glibmm/.deps/stringutils.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/stringutils.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/thread.Plo b/libs/glibmm2/glib/glibmm/.deps/thread.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/thread.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/threadpool.Plo b/libs/glibmm2/glib/glibmm/.deps/threadpool.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/threadpool.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/timer.Plo b/libs/glibmm2/glib/glibmm/.deps/timer.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/timer.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/timeval.Plo b/libs/glibmm2/glib/glibmm/.deps/timeval.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/timeval.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/unicode.Plo b/libs/glibmm2/glib/glibmm/.deps/unicode.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/unicode.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/ustring.Plo b/libs/glibmm2/glib/glibmm/.deps/ustring.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/ustring.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/utility.Plo b/libs/glibmm2/glib/glibmm/.deps/utility.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/utility.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/value.Plo b/libs/glibmm2/glib/glibmm/.deps/value.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/value.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/value_basictypes.Plo b/libs/glibmm2/glib/glibmm/.deps/value_basictypes.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/value_basictypes.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/value_custom.Plo b/libs/glibmm2/glib/glibmm/.deps/value_custom.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/value_custom.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/wrap.Plo b/libs/glibmm2/glib/glibmm/.deps/wrap.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/wrap.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/.deps/wrap_init.Plo b/libs/glibmm2/glib/glibmm/.deps/wrap_init.Plo deleted file mode 100644 index 9ce06a81ea..0000000000 --- a/libs/glibmm2/glib/glibmm/.deps/wrap_init.Plo +++ /dev/null @@ -1 +0,0 @@ -# dummy diff --git a/libs/glibmm2/glib/glibmm/Makefile b/libs/glibmm2/glib/glibmm/Makefile deleted file mode 100644 index 99bc990a73..0000000000 --- a/libs/glibmm2/glib/glibmm/Makefile +++ /dev/null @@ -1,908 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# glib/glibmm/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = $(am__sublib_include_HEADERS_DIST) \ - $(srcdir)/../src/Makefile_list_of_hg.am_fragment \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build_shared/Makefile_build.am_fragment \ - $(top_srcdir)/build_shared/Makefile_build_extra.am_fragment \ - $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment \ - $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment -subdir = glib/glibmm -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(sublib_includedir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libglibmm_2_4_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__libglibmm_2_4_la_SOURCES_DIST = convert.cc date.cc fileutils.cc \ - iochannel.cc keyfile.cc markup.cc module.cc optioncontext.cc \ - optionentry.cc optiongroup.cc shell.cc spawn.cc thread.cc \ - unicode.cc wrap_init.cc value_basictypes.cc class.cc \ - containers.cc debug.cc dispatcher.cc error.cc exception.cc \ - exceptionhandler.cc init.cc interface.cc main.cc miscutils.cc \ - object.cc objectbase.cc pattern.cc property.cc \ - propertyproxy.cc propertyproxy_base.cc quark.cc random.cc \ - signalproxy.cc signalproxy_connectionnode.cc \ - streamiochannel.cc stringutils.cc threadpool.cc timer.cc \ - timeval.cc ustring.cc utility.cc value.cc value_custom.cc \ - wrap.cc -am__objects_1 = convert.lo date.lo fileutils.lo iochannel.lo \ - keyfile.lo markup.lo module.lo optioncontext.lo optionentry.lo \ - optiongroup.lo shell.lo spawn.lo thread.lo unicode.lo -am__objects_2 = $(am__objects_1) wrap_init.lo value_basictypes.lo -am__objects_3 = class.lo containers.lo debug.lo dispatcher.lo error.lo \ - exception.lo exceptionhandler.lo init.lo interface.lo main.lo \ - miscutils.lo object.lo objectbase.lo pattern.lo property.lo \ - propertyproxy.lo propertyproxy_base.lo quark.lo random.lo \ - signalproxy.lo signalproxy_connectionnode.lo \ - streamiochannel.lo stringutils.lo threadpool.lo timer.lo \ - timeval.lo ustring.lo utility.lo value.lo value_custom.lo \ - wrap.lo -am__objects_4 = -am__objects_5 = $(am__objects_3) $(am__objects_4) -#am__objects_5 = $(am__objects_3) $(am__objects_4) -am__objects_6 = $(am__objects_5) -am__objects_7 = $(am__objects_2) $(am__objects_6) -am__objects_8 = $(am__objects_4) -am__objects_9 = $(am__objects_8) -am_libglibmm_2_4_la_OBJECTS = $(am__objects_7) \ - $(am__objects_9) -#am_libglibmm_2_4_la_OBJECTS = $(am__objects_7) \ -# $(am__objects_9) -libglibmm_2_4_la_OBJECTS = $(am_libglibmm_2_4_la_OBJECTS) -depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libglibmm_2_4_la_SOURCES) -DIST_SOURCES = $(am__libglibmm_2_4_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -am__sublib_include_HEADERS_DIST = convert.h date.h fileutils.h \ - iochannel.h keyfile.h markup.h module.h optioncontext.h \ - optionentry.h optiongroup.h shell.h spawn.h thread.h unicode.h \ - signalproxy.h value_basictypes.h arrayhandle.h class.h \ - containerhandle_shared.h containers.h debug.h dispatcher.h \ - error.h exception.h exceptionhandler.h helperlist.h init.h \ - i18n.h interface.h listhandle.h main.h miscutils.h object.h \ - objectbase.h pattern.h property.h propertyproxy.h \ - propertyproxy_base.h quark.h random.h refptr.h sarray.h \ - signalproxy_connectionnode.h slisthandle.h streamiochannel.h \ - stringutils.h threadpool.h timer.h timeval.h ustring.h \ - utility.h value.h value_custom.h wrap.h wrap_init.h -sublib_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(sublib_include_HEADERS) -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H $(strip $(extra_defines)) -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -SUBDIRS = private -sublib_name = glibmm -sublib_libname = glibmm-2.4 -sublib_namespace = Glib -sublib_cflags = $(GLIBMM_CFLAGS) -sublib_files_extra_posix_cc = -sublib_files_extra_win32_cc = -sublib_files_extra_general_cc = \ - class.cc \ - containers.cc \ - debug.cc \ - dispatcher.cc \ - error.cc \ - exception.cc \ - exceptionhandler.cc \ - init.cc \ - interface.cc \ - main.cc \ - miscutils.cc \ - object.cc \ - objectbase.cc \ - pattern.cc \ - property.cc \ - propertyproxy.cc \ - propertyproxy_base.cc \ - quark.cc \ - random.cc \ - signalproxy.cc \ - signalproxy_connectionnode.cc \ - streamiochannel.cc \ - stringutils.cc \ - threadpool.cc \ - timer.cc \ - timeval.cc \ - ustring.cc \ - utility.cc \ - value.cc \ - value_custom.cc \ - wrap.cc - -sublib_files_extra_posix_h = -sublib_files_extra_win32_h = -sublib_files_extra_general_h = \ - arrayhandle.h \ - class.h \ - containerhandle_shared.h \ - containers.h \ - debug.h \ - dispatcher.h \ - error.h \ - exception.h \ - exceptionhandler.h \ - helperlist.h \ - init.h \ - i18n.h \ - interface.h \ - iochannel.h \ - keyfile.h \ - listhandle.h \ - main.h \ - miscutils.h \ - object.h \ - objectbase.h \ - pattern.h \ - property.h \ - propertyproxy.h \ - propertyproxy_base.h \ - quark.h \ - random.h \ - refptr.h \ - sarray.h \ - signalproxy_connectionnode.h \ - slisthandle.h \ - streamiochannel.h \ - stringutils.h \ - threadpool.h \ - timer.h \ - timeval.h \ - ustring.h \ - utility.h \ - value.h \ - value_custom.h \ - wrap.h - -files_posix_hg = -files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg -files_all_hg = $(files_general_hg) $(files_posix_hg) $(files_win32_hg) -files_hg = $(files_general_hg) $(files_posix_hg) -#files_hg = $(files_general_hg) $(files_win32_hg) -files_built_general_cc = $(files_general_hg:.hg=.cc) wrap_init.cc \ - value_basictypes.cc -files_built_general_h = $(files_general_hg:.hg=.h) signalproxy.h \ - value_basictypes.h -files_built_posix_cc = $(files_posix_hg:.hg=.cc) -files_built_posix_h = $(files_posix_hg:.hg=.h) -files_built_win32_cc = $(files_win32_hg:.hg=.cc) -files_built_win32_h = $(files_win32_hg:.hg=.h) -files_built_all_cc = $(files_built_general_cc) \ - $(files_built_posix_cc) \ - $(files_built_win32_cc) - -files_built_all_h = $(files_built_general_h) \ - $(files_built_posix_h) \ - $(files_built_win32_h) - -files_extra_cc_tmp = $(sublib_files_extra_general_cc) $(sublib_files_extra_posix_cc) -#files_extra_cc_tmp = $(sublib_files_extra_general_cc) $(sublib_files_extra_win32_cc) -files_extra_h_tmp = $(sublib_files_extra_general_h) $(sublib_files_extra_posix_h) -#files_extra_h_tmp = $(sublib_files_extra_general_h) $(sublib_files_extra_win32_h) -files_extra_cc = $(files_extra_cc_tmp) -files_extra_h = $(files_extra_h_tmp) wrap_init.h -files_extra_all_cc = $(sublib_files_extra_general_cc) $(sublib_files_extra_posix_cc) $(sublib_files_extra_win32_cc) -files_extra_all_h = $(sublib_files_extra_general_h) \ - $(sublib_files_extra_posix_h) $(sublib_files_extra_win32_h) \ - wrap_init.h -files_all_general_cc = $(files_built_general_cc) $(files_extra_cc) -files_all_posix_cc = $(files_built_posix_cc) -files_all_win32_cc = $(files_built_win32_cc) -extra_win32_defines = - -# Support for DLL on mingw using libtool > 1.4 -# When creating DLLs on win32, we need to explicitly add a few extra -# libraries at link time to resolve symbols (remember a dll is like an -# executable). -#extra_win32_defines = \ -# -D$(shell echo $(sublib_name) | tr [:lower:] [:upper:])_BUILD - -no_undefined = -#no_undefined = -no-undefined -Wl,--export-all-symbols -win32_dlls_extra_libs = -#win32_dlls_extra_libs = $(sublib_win32_dlls_libs) -common_ldflags = -version-info $(LIBGLIBMM_SO_VERSION) $(no_undefined) -all_includes = -I$(top_builddir)/glib -I$(top_srcdir)/glib \ - $(sublib_cflags) $(GTHREAD_CFLAGS) - -extra_defines = -DG_LOG_DOMAIN=\"$(sublib_name)\" $(extra_win32_defines) \ - $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) - -dist_sources = $(files_built_all_cc) $(files_extra_all_cc) \ - $(files_built_all_h) $(files_extra_all_h) - -DISTFILES = $(DIST_COMMON) $(dist_sources) $(TEXINFOS) $(EXTRA_DIST) -DEFAULT_INCLUDES = -INCLUDES = $(strip $(all_includes)) -sublib_includedir = $(includedir)/$(sublib_libname)/$(sublib_name) -sublib_include_HEADERS = $(files_built_general_h) \ - $(files_built_posix_h) \ - $(files_extra_h) - -#sublib_include_HEADERS = $(files_built_general_h) \ -# $(files_built_win32_h) \ -# $(files_extra_h) - -lib_LTLIBRARIES = libglibmm-2.4.la -libglibmm_2_4_la_SOURCES = $(files_all_general_cc) $(files_all_posix_cc) -#libglibmm_2_4_la_SOURCES = $(files_all_general_cc) $(files_all_win32_cc) -libglibmm_2_4_la_LDFLAGS = $(common_ldflags) -libglibmm_2_4_la_LIBADD = $(GLIBMM_LIBS) -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(srcdir)/../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment $(top_srcdir)/build_shared/Makefile_build_extra.am_fragment $(top_srcdir)/build_shared/Makefile_build.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glib/glibmm/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu glib/glibmm/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libglibmm-2.4.la: $(libglibmm_2_4_la_OBJECTS) $(libglibmm_2_4_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libglibmm_2_4_la_LDFLAGS) $(libglibmm_2_4_la_OBJECTS) $(libglibmm_2_4_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -include ./$(DEPDIR)/class.Plo -include ./$(DEPDIR)/containers.Plo -include ./$(DEPDIR)/convert.Plo -include ./$(DEPDIR)/date.Plo -include ./$(DEPDIR)/debug.Plo -include ./$(DEPDIR)/dispatcher.Plo -include ./$(DEPDIR)/error.Plo -include ./$(DEPDIR)/exception.Plo -include ./$(DEPDIR)/exceptionhandler.Plo -include ./$(DEPDIR)/fileutils.Plo -include ./$(DEPDIR)/init.Plo -include ./$(DEPDIR)/interface.Plo -include ./$(DEPDIR)/iochannel.Plo -include ./$(DEPDIR)/keyfile.Plo -include ./$(DEPDIR)/main.Plo -include ./$(DEPDIR)/markup.Plo -include ./$(DEPDIR)/miscutils.Plo -include ./$(DEPDIR)/module.Plo -include ./$(DEPDIR)/object.Plo -include ./$(DEPDIR)/objectbase.Plo -include ./$(DEPDIR)/optioncontext.Plo -include ./$(DEPDIR)/optionentry.Plo -include ./$(DEPDIR)/optiongroup.Plo -include ./$(DEPDIR)/pattern.Plo -include ./$(DEPDIR)/property.Plo -include ./$(DEPDIR)/propertyproxy.Plo -include ./$(DEPDIR)/propertyproxy_base.Plo -include ./$(DEPDIR)/quark.Plo -include ./$(DEPDIR)/random.Plo -include ./$(DEPDIR)/shell.Plo -include ./$(DEPDIR)/signalproxy.Plo -include ./$(DEPDIR)/signalproxy_connectionnode.Plo -include ./$(DEPDIR)/spawn.Plo -include ./$(DEPDIR)/streamiochannel.Plo -include ./$(DEPDIR)/stringutils.Plo -include ./$(DEPDIR)/thread.Plo -include ./$(DEPDIR)/threadpool.Plo -include ./$(DEPDIR)/timer.Plo -include ./$(DEPDIR)/timeval.Plo -include ./$(DEPDIR)/unicode.Plo -include ./$(DEPDIR)/ustring.Plo -include ./$(DEPDIR)/utility.Plo -include ./$(DEPDIR)/value.Plo -include ./$(DEPDIR)/value_basictypes.Plo -include ./$(DEPDIR)/value_custom.Plo -include ./$(DEPDIR)/wrap.Plo -include ./$(DEPDIR)/wrap_init.Plo - -.cc.o: - if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(CXXCOMPILE) -c -o $@ $< - -.cc.obj: - if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: - if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ - then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -# source='$<' object='$@' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ -# $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-sublib_includeHEADERS: $(sublib_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(sublib_includedir)" || $(mkdir_p) "$(DESTDIR)$(sublib_includedir)" - @list='$(sublib_include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sublib_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sublib_includedir)/$$f'"; \ - $(sublib_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sublib_includedir)/$$f"; \ - done - -uninstall-sublib_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(sublib_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sublib_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(sublib_includedir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../build_shared $(distdir)/../src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sublib_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-sublib_includeHEADERS - -install-exec-am: install-libLTLIBRARIES - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-sublib_includeHEADERS - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES install-man \ - install-strip install-sublib_includeHEADERS installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-local \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-sublib_includeHEADERS - - -maintainer-clean-local: - (cd $(srcdir) && rm -f $(files_built_all_cc) $(files_built_all_h)) - -cvsignore: - ( \ - echo ".deps"; \ - echo ".libs"; \ - echo "*.la"; \ - echo "*.lo"; \ - echo "Makefile"; \ - echo "Makefile.in"; \ - echo; \ - list='$(strip $(files_built_all_cc) $(files_built_all_h))'; \ - for file in $$list; do \ - echo "$$file"; \ - done \ - ) >$(srcdir)/.cvsignore - ( \ - echo "Makefile"; \ - echo "Makefile.in"; \ - echo; \ - list='$(strip $(files_all_hg:.hg=_p.h))'; \ - for file in $$list; do \ - echo "$$file"; \ - done \ - ) >$(srcdir)/private/.cvsignore - -.PHONY: cvsignore -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/glib/glibmm/Makefile.in b/libs/glibmm2/glib/glibmm/Makefile.in index 6d659914d4..a4cac1958e 100644 --- a/libs/glibmm2/glib/glibmm/Makefile.in +++ b/libs/glibmm2/glib/glibmm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,8 +42,8 @@ DIST_COMMON = $(am__sublib_include_HEADERS_DIST) \ $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment subdir = glib/glibmm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -73,8 +69,8 @@ am__DEPENDENCIES_1 = libglibmm_2_4_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__libglibmm_2_4_la_SOURCES_DIST = convert.cc date.cc fileutils.cc \ iochannel.cc keyfile.cc markup.cc module.cc optioncontext.cc \ - optionentry.cc optiongroup.cc shell.cc spawn.cc thread.cc \ - unicode.cc wrap_init.cc value_basictypes.cc class.cc \ + optionentry.cc optiongroup.cc regex.cc shell.cc spawn.cc \ + thread.cc unicode.cc wrap_init.cc value_basictypes.cc class.cc \ containers.cc debug.cc dispatcher.cc error.cc exception.cc \ exceptionhandler.cc init.cc interface.cc main.cc miscutils.cc \ object.cc objectbase.cc pattern.cc property.cc \ @@ -85,7 +81,7 @@ am__libglibmm_2_4_la_SOURCES_DIST = convert.cc date.cc fileutils.cc \ wrap.cc am__objects_1 = convert.lo date.lo fileutils.lo iochannel.lo \ keyfile.lo markup.lo module.lo optioncontext.lo optionentry.lo \ - optiongroup.lo shell.lo spawn.lo thread.lo unicode.lo + optiongroup.lo regex.lo shell.lo spawn.lo thread.lo unicode.lo am__objects_2 = $(am__objects_1) wrap_init.lo value_basictypes.lo am__objects_3 = class.lo containers.lo debug.lo dispatcher.lo error.lo \ exception.lo exceptionhandler.lo init.lo interface.lo main.lo \ @@ -107,44 +103,49 @@ am__objects_9 = $(am__objects_8) @OS_WIN32_TRUE@am_libglibmm_2_4_la_OBJECTS = $(am__objects_7) \ @OS_WIN32_TRUE@ $(am__objects_9) libglibmm_2_4_la_OBJECTS = $(am_libglibmm_2_4_la_OBJECTS) +libglibmm_2_4_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libglibmm_2_4_la_LDFLAGS) $(LDFLAGS) -o $@ depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libglibmm_2_4_la_SOURCES) DIST_SOURCES = $(am__libglibmm_2_4_la_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__sublib_include_HEADERS_DIST = convert.h date.h fileutils.h \ iochannel.h keyfile.h markup.h module.h optioncontext.h \ - optionentry.h optiongroup.h shell.h spawn.h thread.h unicode.h \ - signalproxy.h value_basictypes.h arrayhandle.h class.h \ - containerhandle_shared.h containers.h debug.h dispatcher.h \ - error.h exception.h exceptionhandler.h helperlist.h init.h \ - i18n.h interface.h listhandle.h main.h miscutils.h object.h \ - objectbase.h pattern.h property.h propertyproxy.h \ - propertyproxy_base.h quark.h random.h refptr.h sarray.h \ - signalproxy_connectionnode.h slisthandle.h streamiochannel.h \ - stringutils.h threadpool.h timer.h timeval.h ustring.h \ - utility.h value.h value_custom.h wrap.h wrap_init.h + optionentry.h optiongroup.h regex.h shell.h spawn.h thread.h \ + unicode.h signalproxy.h value_basictypes.h arrayhandle.h \ + class.h containerhandle_shared.h containers.h debug.h \ + dispatcher.h error.h exception.h exceptionhandler.h \ + helperlist.h init.h i18n.h interface.h listhandle.h main.h \ + miscutils.h object.h objectbase.h pattern.h property.h \ + propertyproxy.h propertyproxy_base.h quark.h random.h refptr.h \ + sarray.h signalproxy_connectionnode.h slisthandle.h \ + streamiochannel.h stringutils.h threadpool.h timer.h timeval.h \ + ustring.h utility.h value.h value_custom.h wrap.h wrap_init.h sublib_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(sublib_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -182,12 +183,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -201,13 +202,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -217,27 +215,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -249,28 +238,39 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = private sublib_name = glibmm sublib_libname = glibmm-2.4 @@ -357,7 +357,7 @@ sublib_files_extra_general_h = \ files_posix_hg = files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg +files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg shell.hg spawn.hg thread.hg unicode.hg files_all_hg = $(files_general_hg) $(files_posix_hg) $(files_win32_hg) @OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) @OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) @@ -465,7 +465,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ @@ -476,7 +476,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ @@ -491,7 +491,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libglibmm-2.4.la: $(libglibmm_2_4_la_OBJECTS) $(libglibmm_2_4_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libglibmm_2_4_la_LDFLAGS) $(libglibmm_2_4_la_OBJECTS) $(libglibmm_2_4_la_LIBADD) $(LIBS) + $(libglibmm_2_4_la_LINK) -rpath $(libdir) $(libglibmm_2_4_la_OBJECTS) $(libglibmm_2_4_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -528,6 +528,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertyproxy_base.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quark.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signalproxy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signalproxy_connectionnode.Plo@am__quote@ @@ -548,22 +549,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrap_init.Plo@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -573,13 +574,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-sublib_includeHEADERS: $(sublib_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(sublib_includedir)" || $(mkdir_p) "$(DESTDIR)$(sublib_includedir)" + test -z "$(sublib_includedir)" || $(MKDIR_P) "$(DESTDIR)$(sublib_includedir)" @list='$(sublib_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -626,8 +623,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -728,23 +724,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../build_shared $(distdir)/../src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -758,7 +752,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -766,6 +760,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -776,7 +772,7 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sublib_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -811,7 +807,7 @@ distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-recursive @@ -825,12 +821,20 @@ info-am: install-data-am: install-sublib_includeHEADERS +install-dvi: install-dvi-recursive + install-exec-am: install-libLTLIBRARIES +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -852,27 +856,27 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-sublib_includeHEADERS +uninstall-am: uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLTLIBRARIES install-man \ - install-strip install-sublib_includeHEADERS installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-local \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-sublib_includeHEADERS installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-sublib_includeHEADERS + uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS maintainer-clean-local: diff --git a/libs/glibmm2/glib/glibmm/arrayhandle.h b/libs/glibmm2/glib/glibmm/arrayhandle.h index 2c346bf884..ab6bda9259 100644 --- a/libs/glibmm2/glib/glibmm/arrayhandle.h +++ b/libs/glibmm2/glib/glibmm/arrayhandle.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_ARRAYHANDLE_H #define _GLIBMM_ARRAYHANDLE_H -/* $Id: arrayhandle.h,v 1.3 2003/04/21 17:39:41 murrayc Exp $ */ +/* $Id: arrayhandle.h 32 2003-04-21 17:39:41Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/class.cc b/libs/glibmm2/glib/glibmm/class.cc index 21021ab63b..0606f431bb 100644 --- a/libs/glibmm2/glib/glibmm/class.cc +++ b/libs/glibmm2/glib/glibmm/class.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: class.cc,v 1.7 2006/10/04 12:04:05 murrayc Exp $ */ +/* $Id: class.cc 336 2006-10-04 12:06:14Z murrayc $ */ /* Copyright (C) 1998-2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/class.h b/libs/glibmm2/glib/glibmm/class.h index 9e4e38402e..96b58b5653 100644 --- a/libs/glibmm2/glib/glibmm/class.h +++ b/libs/glibmm2/glib/glibmm/class.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_CLASS_H #define _GLIBMM_CLASS_H -/* $Id: class.h,v 1.6 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: class.h 291 2006-05-12 08:08:45Z murrayc $ */ /* Copyright 2001 Free Software Foundation * Copyright (C) 1998-2002 The gtkmm Development Team diff --git a/libs/glibmm2/glib/glibmm/containerhandle_shared.h b/libs/glibmm2/glib/glibmm/containerhandle_shared.h index 94c1ea7550..9f31a30dc3 100644 --- a/libs/glibmm2/glib/glibmm/containerhandle_shared.h +++ b/libs/glibmm2/glib/glibmm/containerhandle_shared.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_CONTAINERHANDLE_SHARED_H #define _GLIBMM_CONTAINERHANDLE_SHARED_H -/* $Id: containerhandle_shared.h,v 1.12 2006/09/19 20:36:42 murrayc Exp $ */ +/* $Id: containerhandle_shared.h 322 2006-09-19 20:36:43Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/containers.cc b/libs/glibmm2/glib/glibmm/containers.cc index 98b2d3dfc6..29f5b9aa0b 100644 --- a/libs/glibmm2/glib/glibmm/containers.cc +++ b/libs/glibmm2/glib/glibmm/containers.cc @@ -1,6 +1,6 @@ // -*- c++ -*- -/* $Id: containers.cc,v 1.1.1.1 2003/01/07 16:58:44 murrayc Exp $ */ +/* $Id: containers.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* containers.h * diff --git a/libs/glibmm2/glib/glibmm/containers.h b/libs/glibmm2/glib/glibmm/containers.h index 5e92889f1f..6736e0ecc7 100644 --- a/libs/glibmm2/glib/glibmm/containers.h +++ b/libs/glibmm2/glib/glibmm/containers.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_CONTAINERS_H #define _GLIBMM_CONTAINERS_H -/* $Id: containers.h,v 1.7 2005/11/23 07:22:43 murrayc Exp $ */ +/* $Id: containers.h 229 2005-11-23 07:22:43Z murrayc $ */ /* containers.h * diff --git a/libs/glibmm2/glib/glibmm/date.cc b/libs/glibmm2/glib/glibmm/date.cc index 26ed7309ec..331402dd4b 100644 --- a/libs/glibmm2/glib/glibmm/date.cc +++ b/libs/glibmm2/glib/glibmm/date.cc @@ -71,13 +71,20 @@ void Date::set_parse(const Glib::ustring& str) g_date_set_parse(&gobject_, str.c_str()); } + #ifndef GLIBMM_DISABLE_DEPRECATED + +//Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32) +//That would make the set_time() method overload impossible. +#ifdef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 void Date::set_time(GTime time) { //This method, and the C function that it wraps, are deprecated. g_date_set_time(&gobject_, time); } +#endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 + #endif // GLIBMM_DISABLE_DEPRECATED diff --git a/libs/glibmm2/glib/glibmm/date.h b/libs/glibmm2/glib/glibmm/date.h index 93eacbde62..1efdcd6b62 100644 --- a/libs/glibmm2/glib/glibmm/date.h +++ b/libs/glibmm2/glib/glibmm/date.h @@ -119,8 +119,13 @@ enum DMY */ void set_parse (const Glib::ustring& str); + #ifndef GLIBMM_DISABLE_DEPRECATED + + //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32) + //That would make the set_time() method overload impossible. + #ifdef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 /** Sets the value of a date from a GTime (time_t) value. * * @param time GTime value to set. @@ -128,6 +133,8 @@ enum DMY * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&). */ void set_time(GTime time); + #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 + #endif // GLIBMM_DISABLE_DEPRECATED diff --git a/libs/glibmm2/glib/glibmm/debug.cc b/libs/glibmm2/glib/glibmm/debug.cc index 5164fbf82d..65f3c18719 100644 --- a/libs/glibmm2/glib/glibmm/debug.cc +++ b/libs/glibmm2/glib/glibmm/debug.cc @@ -1,4 +1,4 @@ -/* $Id: debug.cc,v 1.1.1.1 2003/01/07 16:58:44 murrayc Exp $ */ +/* $Id: debug.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/debug.h b/libs/glibmm2/glib/glibmm/debug.h index d61945dbf6..2e7698b17d 100644 --- a/libs/glibmm2/glib/glibmm/debug.h +++ b/libs/glibmm2/glib/glibmm/debug.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_DEBUG_H #define _GLIBMM_DEBUG_H -/* $Id: debug.h,v 1.2 2003/01/22 12:08:52 murrayc Exp $ */ +/* $Id: debug.h 17 2003-01-22 12:09:02Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/dispatcher.cc b/libs/glibmm2/glib/glibmm/dispatcher.cc index f5883e69d6..4cf57b6384 100644 --- a/libs/glibmm2/glib/glibmm/dispatcher.cc +++ b/libs/glibmm2/glib/glibmm/dispatcher.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: dispatcher.cc,v 1.13 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: dispatcher.cc 370 2007-01-20 10:53:28Z daniel $ */ /* Copyright 2002 The gtkmm Development Team * @@ -28,83 +28,76 @@ #include #include -#ifndef G_OS_WIN32 -#include - -#if defined(_tru64) //TODO: Use the real define -//EINTR is not defined on Tru64 -//I have tried including these -//#include -//#include -//#include - #ifndef EINTR - #define EINTR 0 - #endif +#ifdef G_OS_WIN32 +# include +# include +# include +# include +#else +# include #endif -#else -#include -#include -#include -#include -#endif /* G_OS_WIN32 */ - +// EINTR is not defined on Tru64. I have tried including these: +// #include +// #include +// #include +// danielk: I think someone should just do a grep on a Tru64 box. Googling +// for "tru64 EINTR" returns lots of hits telling me that handling EINTR is +// actually a requirement on Tru64. So it must exist. +#if defined(_tru64) && !defined(EINTR) +# define EINTR 0 /* TODO: should use the real define */ +#endif namespace { struct DispatchNotifyData { - unsigned long tag; Glib::Dispatcher* dispatcher; Glib::DispatchNotifier* notifier; DispatchNotifyData() - : tag (0), dispatcher (0), notifier (0) {} + : dispatcher (0), notifier (0) {} - DispatchNotifyData(unsigned long tag_, Glib::Dispatcher* dispatcher_, Glib::DispatchNotifier* notifier_) - : tag (tag_), dispatcher (dispatcher_), notifier (notifier_) {} + DispatchNotifyData(Glib::Dispatcher* d, Glib::DispatchNotifier* n) + : dispatcher (d), notifier (n) {} }; -static void warn_failed_pipe_io(const char* what, int err_no) +static void warn_failed_pipe_io(const char* what) { #ifdef G_OS_WIN32 - const char *const message = g_win32_error_message(err_no); + const char *const message = g_win32_error_message(GetLastError()); #else - const char *const message = g_strerror(err_no); + const char *const message = g_strerror(errno); #endif g_critical("Error in inter-thread communication: %s() failed: %s", what, message); } -#ifndef G_OS_WIN32 -/* - * Try to set the close-on-exec flag of the file descriptor, - * so that it won't be leaked if a new process is spawned. - */ -static void fd_set_close_on_exec(int fd) -{ - const int flags = fcntl(fd, F_GETFD, 0); - g_return_if_fail(flags >= 0); - - fcntl(fd, F_SETFD, flags | FD_CLOEXEC); -} -#endif /* !G_OS_WIN32 */ - -/* - * One word: paranoia. - */ #ifdef G_OS_WIN32 + static void fd_close_and_invalidate(HANDLE& fd) { if(fd != 0) { if(!CloseHandle(fd)) - warn_failed_pipe_io("CloseHandle", GetLastError()); + warn_failed_pipe_io("CloseHandle"); fd = 0; } } #else /* !G_OS_WIN32 */ +/* + * Set the close-on-exec flag on the file descriptor, + * so that it won't be leaked if a new process is spawned. + */ +static void fd_set_close_on_exec(int fd) +{ + const int flags = fcntl(fd, F_GETFD, 0); + + if(flags < 0 || fcntl(fd, F_SETFD, unsigned(flags) | FD_CLOEXEC) < 0) + warn_failed_pipe_io("fcntl"); +} + static void fd_close_and_invalidate(int& fd) { if(fd >= 0) @@ -113,10 +106,10 @@ static void fd_close_and_invalidate(int& fd) do result = close(fd); - while(result < 0 && errno == EINTR); + while(G_UNLIKELY(result < 0) && errno == EINTR); - if(result < 0) - warn_failed_pipe_io("close", errno); + if(G_UNLIKELY(result < 0)) + warn_failed_pipe_io("close"); fd = -1; } @@ -125,7 +118,6 @@ static void fd_close_and_invalidate(int& fd) } // anonymous namespace - namespace Glib { @@ -147,17 +139,16 @@ protected: private: static Glib::StaticPrivate thread_specific_instance_; - Glib::RefPtr context_; - int ref_count_; + long ref_count_; + Glib::RefPtr context_; #ifdef G_OS_WIN32 - HANDLE fd_receiver_; Glib::Mutex mutex_; std::list notify_queue_; + HANDLE fd_receiver_; #else - int fd_receiver_; - int fd_sender_; -#endif /* !G_OS_WIN32 */ - sigc::connection conn_io_handler_; + int fd_receiver_; + int fd_sender_; +#endif void create_pipe(); bool pipe_io_handler(Glib::IOCondition condition); @@ -167,20 +158,20 @@ private: DispatchNotifier& operator=(const DispatchNotifier&); }; - /**** Glib::DispatchNotifier ***********************************************/ +// static Glib::StaticPrivate DispatchNotifier::thread_specific_instance_ = GLIBMM_STATIC_PRIVATE_INIT; DispatchNotifier::DispatchNotifier(const Glib::RefPtr& context) : - context_ (context), ref_count_ (0), + context_ (context), #ifdef G_OS_WIN32 - fd_receiver_ (0), mutex_ (), - notify_queue_ () + notify_queue_ (), + fd_receiver_ (0) #else fd_receiver_ (-1), fd_sender_ (-1) @@ -188,76 +179,86 @@ DispatchNotifier::DispatchNotifier(const Glib::RefPtr& context) { create_pipe(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED +#if defined(GLIBMM_EXCEPTIONS_ENABLED) try +#elif defined(G_OS_WIN32) + if(fd_receiver_) +#else + if(fd_receiver_ >= 0) +#endif { - #endif //GLIBMM_EXCEPTIONS_ENABLED #ifdef G_OS_WIN32 - conn_io_handler_ = context_->signal_io().connect( - sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), - GPOINTER_TO_INT(fd_receiver_), Glib::IO_IN); -#else /* !G_OS_WIN32 */ - conn_io_handler_ = context_->signal_io().connect( - sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), - fd_receiver_, Glib::IO_IN); -#endif /* !G_OS_WIN32 */ - #ifdef GLIBMM_EXCEPTIONS_ENABLED + const int fd = GPOINTER_TO_INT(fd_receiver_); +#else + const int fd = fd_receiver_; +#endif + context_->signal_io().connect(sigc::mem_fun(*this, &DispatchNotifier::pipe_io_handler), + fd, Glib::IO_IN); } +#ifdef GLIBMM_EXCEPTIONS_ENABLED catch(...) { -#ifndef G_OS_WIN32 +# ifndef G_OS_WIN32 fd_close_and_invalidate(fd_sender_); -#endif /* !G_OS_WIN32 */ +# endif fd_close_and_invalidate(fd_receiver_); throw; } - #endif //GLIBMM_EXCEPTIONS_ENABLED +#endif /* GLIBMM_EXCEPTIONS_ENABLED */ } DispatchNotifier::~DispatchNotifier() { - // Disconnect manually because we don't inherit from sigc::trackable - conn_io_handler_.disconnect(); - #ifndef G_OS_WIN32 fd_close_and_invalidate(fd_sender_); -#endif /* !G_OS_WIN32 */ +#endif fd_close_and_invalidate(fd_receiver_); } void DispatchNotifier::create_pipe() { #ifdef G_OS_WIN32 - // On Win32 we are using synchronization object instead of pipe - // thus storing its handle as fd_receiver_. - fd_receiver_ = CreateEvent(0, FALSE, FALSE, 0); - if(!fd_receiver_) + // On Win32, create a synchronization object instead of a pipe and store + // its handle as fd_receiver_. Use a manual-reset event object, so that + // we can closely match the behavior on Unix in pipe_io_handler(). + const HANDLE event = CreateEvent(0, TRUE, FALSE, 0); + + if(!event) { -#ifdef GLIBMM_EXCEPTIONS_ENABLED +# ifdef GLIBMM_EXCEPTIONS_ENABLED GError* const error = g_error_new(G_FILE_ERROR, G_FILE_ERROR_FAILED, "Failed to create event for inter-thread communication: %s", g_win32_error_message(GetLastError())); throw Glib::FileError(error); -#else - return; //TODO: Provide an alternative to the exception. -#endif //GLIBMM_EXCEPTIONS_ENABLED +# else + warn_failed_pipe_io("CreateEvent"); // TODO: see below + return; +# endif } + fd_receiver_ = event; + #else /* !G_OS_WIN32 */ + int filedes[2] = { -1, -1 }; if(pipe(filedes) < 0) { -#ifdef GLIBMM_EXCEPTIONS_ENABLED +# ifdef GLIBMM_EXCEPTIONS_ENABLED GError* const error = g_error_new(G_FILE_ERROR, g_file_error_from_errno(errno), "Failed to create pipe for inter-thread communication: %s", g_strerror(errno)); throw Glib::FileError(error); -#else - return; //TODO: Provide an alternative to the exception. -#endif //GLIBMM_EXCEPTIONS_ENABLED +# else + // TODO: Provide an alternative to the exception. This is not trivial + // from within a constructor, though. One possibility would be to add + // a Glib::Dispatcher::valid() method which returns whether construction + // was successful. + warn_failed_pipe_io("pipe"); + return; +# endif } fd_set_close_on_exec(filedes[0]); @@ -265,6 +266,7 @@ void DispatchNotifier::create_pipe() fd_receiver_ = filedes[0]; fd_sender_ = filedes[1]; + #endif /* !G_OS_WIN32 */ } @@ -301,7 +303,7 @@ void DispatchNotifier::unreference_instance(DispatchNotifier* notifier) { g_return_if_fail(instance->ref_count_ == 0); // could be < 0 if messed up - // This will cause deletion of the notifier object. + // This causes deletion of the notifier object. thread_specific_instance_.set(0); } } @@ -310,121 +312,121 @@ void DispatchNotifier::send_notification(Dispatcher* dispatcher) { #ifdef G_OS_WIN32 { - Glib::Mutex::Lock lock (mutex_); - notify_queue_.push_back(DispatchNotifyData(0xdeadbeef, dispatcher, this)); - } + const Mutex::Lock lock (mutex_); - // Send notification event to GUI-thread. - if(!SetEvent(fd_receiver_)) - { - warn_failed_pipe_io("SetEvent", GetLastError()); - return; + const bool was_empty = notify_queue_.empty(); + notify_queue_.push_back(DispatchNotifyData(dispatcher, this)); + + if(was_empty) + { + // The event will stay in signaled state until it is reset + // in pipe_io_handler() after processing the last queued event. + if(!SetEvent(fd_receiver_)) + warn_failed_pipe_io("SetEvent"); + } } #else /* !G_OS_WIN32 */ - DispatchNotifyData data (0xdeadbeef, dispatcher, this); + + DispatchNotifyData data (dispatcher, this); gssize n_written; do n_written = write(fd_sender_, &data, sizeof(data)); - while(n_written < 0 && errno == EINTR); + while(G_UNLIKELY(n_written < 0) && errno == EINTR); - if(n_written < 0) - { - warn_failed_pipe_io("write", errno); - return; - } - - // All data must be written in a single call to write(), otherwise we can't + // All data must be written in a single call to write(), otherwise we cannot // guarantee reentrancy since another thread might be scheduled between two - // write() calls. The manpage is a bit unclear about this -- but I hope - // it's safe to assume immediate success for the tiny amount of data we're - // writing. - g_return_if_fail(n_written == sizeof(data)); + // write() calls. From the glibc manual: + // + // "Reading or writing pipe data is atomic if the size of data written is not + // greater than PIPE_BUF. This means that the data transfer seems to be an + // instantaneous unit, in that nothing else in the system can observe a state + // in which it is partially complete. Atomic I/O may not begin right away (it + // may need to wait for buffer space or for data), but once it does begin it + // finishes immediately." + // + // The minimum value allowed by POSIX for PIPE_BUF is 512, so we are on safe + // grounds here. + + if(G_UNLIKELY(n_written != sizeof(data))) + warn_failed_pipe_io("write"); + #endif /* !G_OS_WIN32 */ } bool DispatchNotifier::pipe_io_handler(Glib::IOCondition) { + DispatchNotifyData data; + #ifdef G_OS_WIN32 - DispatchNotifyData data; - - for(;;) { + const Mutex::Lock lock (mutex_); + + // Should never be empty at this point, but let's allow for bogus + // notifications with no data available anyway; just to be safe. + if(notify_queue_.empty()) { - Glib::Mutex::Lock lock (mutex_); + if(!ResetEvent(fd_receiver_)) + warn_failed_pipe_io("ResetEvent"); - if(notify_queue_.empty()) - break; - - data = notify_queue_.front(); - notify_queue_.pop_front(); - } - - g_return_val_if_fail(data.tag == 0xdeadbeef, true); - g_return_val_if_fail(data.notifier == this, true); - - // Actually, we wouldn't need the try/catch block because the Glib::Source - // C callback already does it for us. However, we do it anyway because the - // default return value is 'false', which is not what we want. - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - #endif //GLIBMM_EXCEPTIONS_ENABLED - data.dispatcher->signal_(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - } -#else /* !G_OS_WIN32 */ - DispatchNotifyData data; - gsize n_read = 0; - - do - { - void * const buffer = reinterpret_cast(&data) + n_read; - const gssize result = read(fd_receiver_, buffer, sizeof(data) - n_read); - - if(result < 0) - { - if(errno == EINTR) - continue; - - warn_failed_pipe_io("read", errno); return true; } - n_read += result; + data = notify_queue_.front(); + notify_queue_.pop_front(); + + // Handle only a single event with each invocation of the I/O handler, + // and reset to nonsignaled state only after the last event in the queue + // has been processed. This matches the behavior on Unix. + if(notify_queue_.empty()) + { + if(!ResetEvent(fd_receiver_)) + warn_failed_pipe_io("ResetEvent"); + } } - while(n_read < sizeof(data)); +#else /* !G_OS_WIN32 */ - g_return_val_if_fail(data.tag == 0xdeadbeef, true); - g_return_val_if_fail(data.notifier == this, true); + gssize n_read; + do + n_read = read(fd_receiver_, &data, sizeof(data)); + while(G_UNLIKELY(n_read < 0) && errno == EINTR); + + // Pipe I/O of a block size not greater than PIPE_BUF should be atomic. + // See the comment on atomicity in send_notification() for details. + if(G_UNLIKELY(n_read != sizeof(data))) + { + // Should probably never be zero, but for safety let's allow for bogus + // notifications when no data is actually available. Although in fact + // the read() should block in that case. + if(n_read != 0) + warn_failed_pipe_io("read"); + + return true; + } +#endif /* !G_OS_WIN32 */ + + g_return_val_if_fail(data.notifier == this, true); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED // Actually, we wouldn't need the try/catch block because the Glib::Source // C callback already does it for us. However, we do it anyway because the // default return value is 'false', which is not what we want. - #ifdef GLIBMM_EXCEPTIONS_ENABLED try +#endif { - #endif //GLIBMM_EXCEPTIONS_ENABLED data.dispatcher->signal_(); // emit - #ifdef GLIBMM_EXCEPTIONS_ENABLED } +#ifdef GLIBMM_EXCEPTIONS_ENABLED catch(...) { Glib::exception_handlers_invoke(); } - #endif //GLIBMM_EXCEPTIONS_ENABLED -#endif /* !G_OS_WIN32 */ +#endif return true; } - /**** Glib::Dispatcher *****************************************************/ Dispatcher::Dispatcher() @@ -451,7 +453,7 @@ void Dispatcher::emit() void Dispatcher::operator()() { - emit(); + notifier_->send_notification(this); } sigc::connection Dispatcher::connect(const sigc::slot& slot) @@ -460,4 +462,3 @@ sigc::connection Dispatcher::connect(const sigc::slot& slot) } } // namespace Glib - diff --git a/libs/glibmm2/glib/glibmm/dispatcher.h b/libs/glibmm2/glib/glibmm/dispatcher.h index ab350f02d7..4f638d7992 100644 --- a/libs/glibmm2/glib/glibmm/dispatcher.h +++ b/libs/glibmm2/glib/glibmm/dispatcher.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_DISPATCHER_H #define _GLIBMM_DISPATCHER_H -/* $Id: dispatcher.h,v 1.4 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: dispatcher.h 370 2007-01-20 10:53:28Z daniel $ */ /* Copyright 2002 The gtkmm Development Team * @@ -24,7 +24,6 @@ #include #include - namespace Glib { @@ -59,6 +58,14 @@ class DispatchNotifier; * @li All Dispatcher instances of a receiver thread share the same pipe. That * is, if you use Glib::Dispatcher only to notify the GUI thread, only one pipe * is created no matter how many Dispatcher objects you have. + * + * Using Glib::Dispatcher on Windows: + * + * Glib::Dispatcher also works on win32-based systems. Unfortunately though, + * the implementation cannot use a pipe on win32 and therefore does have to + * lock a mutex on emission, too. However, the impact on performance is + * likely minor and the notification still happens asynchronously. Apart + * from the additional lock the behavior matches the Unix implementation. */ class Dispatcher { @@ -98,6 +105,4 @@ private: } // namespace Glib - #endif /* _GLIBMM_DISPATCHER_H */ - diff --git a/libs/glibmm2/glib/glibmm/error.cc b/libs/glibmm2/glib/glibmm/error.cc index cc3ba7583a..bbde5f589b 100644 --- a/libs/glibmm2/glib/glibmm/error.cc +++ b/libs/glibmm2/glib/glibmm/error.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: error.cc,v 1.4 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: error.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* error.cc * diff --git a/libs/glibmm2/glib/glibmm/error.h b/libs/glibmm2/glib/glibmm/error.h index 653f7d4619..48472996d4 100644 --- a/libs/glibmm2/glib/glibmm/error.h +++ b/libs/glibmm2/glib/glibmm/error.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_ERROR_H #define _GLIBMM_ERROR_H -/* $Id: error.h,v 1.3 2006/10/04 12:04:05 murrayc Exp $ */ +/* $Id: error.h 336 2006-10-04 12:06:14Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/exception.cc b/libs/glibmm2/glib/glibmm/exception.cc index 255affbace..875c891c31 100644 --- a/libs/glibmm2/glib/glibmm/exception.cc +++ b/libs/glibmm2/glib/glibmm/exception.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: exception.cc,v 1.1.1.1 2003/01/07 16:58:45 murrayc Exp $ */ +/* $Id: exception.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* exception.cc * diff --git a/libs/glibmm2/glib/glibmm/exception.h b/libs/glibmm2/glib/glibmm/exception.h index ce55cdc81c..757ebe80ca 100644 --- a/libs/glibmm2/glib/glibmm/exception.h +++ b/libs/glibmm2/glib/glibmm/exception.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_EXCEPTION_H #define _GLIBMM_EXCEPTION_H -/* $Id: exception.h,v 1.1.1.1 2003/01/07 16:58:45 murrayc Exp $ */ +/* $Id: exception.h 2 2003-01-07 16:59:16Z murrayc $ */ /* exception.h * diff --git a/libs/glibmm2/glib/glibmm/exceptionhandler.cc b/libs/glibmm2/glib/glibmm/exceptionhandler.cc index 0bf1cbd6df..6f4184b9ed 100644 --- a/libs/glibmm2/glib/glibmm/exceptionhandler.cc +++ b/libs/glibmm2/glib/glibmm/exceptionhandler.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: exceptionhandler.cc,v 1.5 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: exceptionhandler.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* exceptionhandler.cc * diff --git a/libs/glibmm2/glib/glibmm/exceptionhandler.h b/libs/glibmm2/glib/glibmm/exceptionhandler.h index af617fab7f..dcf5dc1f95 100644 --- a/libs/glibmm2/glib/glibmm/exceptionhandler.h +++ b/libs/glibmm2/glib/glibmm/exceptionhandler.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_EXCEPTIONHANDLER_H #define _GLIBMM_EXCEPTIONHANDLER_H -/* $Id: exceptionhandler.h,v 1.3 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: exceptionhandler.h 291 2006-05-12 08:08:45Z murrayc $ */ /* exceptionhandler.h * diff --git a/libs/glibmm2/glib/glibmm/fileutils.cc b/libs/glibmm2/glib/glibmm/fileutils.cc index 6a79444819..38850871a0 100644 --- a/libs/glibmm2/glib/glibmm/fileutils.cc +++ b/libs/glibmm2/glib/glibmm/fileutils.cc @@ -5,7 +5,7 @@ #include // -*- c++ -*- -/* $Id: fileutils.ccg,v 1.1.1.1 2003/01/07 16:58:25 murrayc Exp $ */ +/* $Id: fileutils.ccg,v 1.1 2003/01/07 16:58:25 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/helperlist.h b/libs/glibmm2/glib/glibmm/helperlist.h index 71990ced74..b5b91ab9f2 100644 --- a/libs/glibmm2/glib/glibmm/helperlist.h +++ b/libs/glibmm2/glib/glibmm/helperlist.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_HELPERLIST_H #define _GLIBMM_HELPERLIST_H -/* $Id: helperlist.h,v 1.1.1.1 2003/01/07 16:58:46 murrayc Exp $ */ +/* $Id: helperlist.h 386 2007-03-23 17:31:16Z murrayc $ */ /* helperlist.h * @@ -36,8 +36,8 @@ public: : gparent_(0) {} - HelperList(GObject* gparent) - : gparent_(gparent) + HelperList(GObject* gp) //We use gp instead of gparent because that can cause warnings about a shadowed member. + : gparent_(gp) {} virtual ~HelperList() diff --git a/libs/glibmm2/glib/glibmm/i18n.h b/libs/glibmm2/glib/glibmm/i18n.h index e0dfc11c66..04ce3cbbaa 100644 --- a/libs/glibmm2/glib/glibmm/i18n.h +++ b/libs/glibmm2/glib/glibmm/i18n.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_I18N_H #define _GLIBMM_I18N_H -/* $Id: i18n.h,v 1.1 2004/03/02 23:29:56 murrayc Exp $ */ +/* $Id: i18n.h 77 2004-03-02 23:29:57Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/init.cc b/libs/glibmm2/glib/glibmm/init.cc index bda5bcc636..6956663ffc 100644 --- a/libs/glibmm2/glib/glibmm/init.cc +++ b/libs/glibmm2/glib/glibmm/init.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: init.cc,v 1.1 2003/11/03 09:27:31 murrayc Exp $ */ +/* $Id: init.cc 54 2003-11-03 09:27:33Z murrayc $ */ /* Copyright (C) 2003 The glibmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/init.h b/libs/glibmm2/glib/glibmm/init.h index d1ddd11410..21405e7801 100644 --- a/libs/glibmm2/glib/glibmm/init.h +++ b/libs/glibmm2/glib/glibmm/init.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_INIT_H #define _GLIBMM_INIT_H -/* $Id: init.h,v 1.1 2003/11/03 09:27:31 murrayc Exp $ */ +/* $Id: init.h 54 2003-11-03 09:27:33Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/interface.cc b/libs/glibmm2/glib/glibmm/interface.cc index 4db73f354f..ecb925a103 100644 --- a/libs/glibmm2/glib/glibmm/interface.cc +++ b/libs/glibmm2/glib/glibmm/interface.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: interface.cc,v 1.3 2005/03/07 15:42:20 murrayc Exp $ */ +/* $Id: interface.cc 209 2005-03-07 15:42:20Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/interface.h b/libs/glibmm2/glib/glibmm/interface.h index b0ee8088eb..103c940983 100644 --- a/libs/glibmm2/glib/glibmm/interface.h +++ b/libs/glibmm2/glib/glibmm/interface.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_INTERFACE_H #define _GLIBMM_INTERFACE_H -/* $Id: interface.h,v 1.1.1.1 2003/01/07 16:58:46 murrayc Exp $ */ +/* $Id: interface.h 2 2003-01-07 16:59:16Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/iochannel.cc b/libs/glibmm2/glib/glibmm/iochannel.cc index 7a2f086f8d..a1b3fda339 100644 --- a/libs/glibmm2/glib/glibmm/iochannel.cc +++ b/libs/glibmm2/glib/glibmm/iochannel.cc @@ -684,13 +684,13 @@ namespace Glib #ifdef GLIBMM_EXCEPTIONS_ENABLED -IOStatus IOChannel::read(gunichar& unichar) +IOStatus IOChannel::read(gunichar& thechar) #else -IOStatus IOChannel::read(gunichar& unichar, std::auto_ptr& error) +IOStatus IOChannel::read(gunichar& thechar, std::auto_ptr& error) #endif //GLIBMM_EXCEPTIONS_ENABLED { GError* gerror = 0; - IOStatus retvalue = ((IOStatus)(g_io_channel_read_unichar(gobj(), &(unichar), &(gerror)))); + IOStatus retvalue = ((IOStatus)(g_io_channel_read_unichar(gobj(), &(thechar), &(gerror)))); #ifdef GLIBMM_EXCEPTIONS_ENABLED if(gerror) ::Glib::Error::throw_exception(gerror); diff --git a/libs/glibmm2/glib/glibmm/iochannel.h b/libs/glibmm2/glib/glibmm/iochannel.h index 5ecc5cf8c1..0891a78977 100644 --- a/libs/glibmm2/glib/glibmm/iochannel.h +++ b/libs/glibmm2/glib/glibmm/iochannel.h @@ -263,7 +263,7 @@ public: #endif /* defined(G_OS_WIN32) || defined(DOXYGEN_SHOULD_SKIP_THIS) */ /** Read a single UCS-4 character. - * @retval unichar The Unicode character. + * @retval thechar The Unicode character. * @return The status of the operation. * @throw Glib::IOChannelError * @throw Glib::ConvertError @@ -276,9 +276,9 @@ public: * @return A G::IOStatus. */ #ifdef GLIBMM_EXCEPTIONS_ENABLED - IOStatus read(gunichar& unichar); + IOStatus read(gunichar& thechar); #else - IOStatus read(gunichar& unichar, std::auto_ptr& error); + IOStatus read(gunichar& thechar, std::auto_ptr& error); #endif //GLIBMM_EXCEPTIONS_ENABLED @@ -601,7 +601,7 @@ public: * @return The buffering status of the channel. */ - /** Returns whether @a channel is buffered. + /** Return Value: true if the @a channel is buffered. * @return true if the @a channel is buffered. */ bool get_buffered() const; @@ -628,10 +628,7 @@ public: * IOChannel object. */ - /** Returns whether the file/socket/whatever associated with @a channel - * will be closed when @a channel receives its final unref and is - * destroyed. The default value of this is true for channels created - * by g_io_channel_new_file(), and false for all other channels. + /** Return value: Whether the channel will be closed on the final unref of * @return Whether the channel will be closed on the final unref of * the GIOChannel data structure. */ diff --git a/libs/glibmm2/glib/glibmm/keyfile.cc b/libs/glibmm2/glib/glibmm/keyfile.cc index 541f1e9bfc..8fad136602 100644 --- a/libs/glibmm2/glib/glibmm/keyfile.cc +++ b/libs/glibmm2/glib/glibmm/keyfile.cc @@ -98,14 +98,51 @@ Glib::ustring KeyFile::get_locale_string(const Glib::ustring& group_name, const return retvalue; } +#ifdef GLIBMM_EXCEPTIONS_ENABLED int KeyFile::get_integer(const Glib::ustring& key) const +#else +int KeyFile::get_integer(const Glib::ustring& key, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED { - GError *error = 0; - int retvalue = g_key_file_get_integer(const_cast(gobj()), 0, key.c_str(), &(error)); - if(error) ::Glib::Error::throw_exception(error); + GError* gerror = 0; + int retvalue = g_key_file_get_integer(const_cast(gobj()), NULL, key.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + return retvalue; } + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +double KeyFile::get_double(const Glib::ustring& key) const +#else +double KeyFile::get_double(const Glib::ustring& key, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + double retvalue = g_key_file_get_double(const_cast(gobj()), NULL, key.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +void KeyFile::set_double(const Glib::ustring& key, double value) +{ + g_key_file_set_double(gobj(), 0, key.c_str(), value); +} + + Glib::ArrayHandle KeyFile::get_string_list(const Glib::ustring& group_name, const Glib::ustring& key) const { gchar** string_list = 0; @@ -150,6 +187,17 @@ Glib::ArrayHandle KeyFile::get_integer_list(const Glib::ustring& group_name return Glib::ArrayHandle(integer_list, length_of_list, Glib::OWNERSHIP_DEEP); } +Glib::ArrayHandle KeyFile::get_double_list(const Glib::ustring& group_name, const Glib::ustring& key) const +{ + gdouble* integer_list = 0; + gsize length_of_list = 0; + GError* error = 0; + integer_list = g_key_file_get_double_list(const_cast(gobj()), group_name.c_str(), key.c_str(), &length_of_list, &error); + if(error) + Glib::Error::throw_exception(error); + return Glib::ArrayHandle(integer_list, length_of_list, Glib::OWNERSHIP_DEEP); +} + void KeyFile::set_string_list(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ArrayHandle& list) { gsize length_of_list = list.size(); @@ -168,6 +216,12 @@ void KeyFile::set_integer_list(const Glib::ustring& group_name, const Glib::ustr g_key_file_set_integer_list(gobj(), group_name.c_str(), key.c_str(), const_cast(list.data()), length_of_list); } +void KeyFile::set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list) +{ + gsize length_of_list = list.size(); + g_key_file_set_double_list(gobj(), group_name.c_str(), key.c_str(), const_cast(list.data()), length_of_list); +} + void KeyFile::set_boolean_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list) { gsize length_of_list = list.size(); @@ -394,6 +448,31 @@ int KeyFile::get_integer(const Glib::ustring& group_name, const Glib::ustring& k } +#ifdef GLIBMM_EXCEPTIONS_ENABLED +double KeyFile::get_double(const Glib::ustring& group_name, const Glib::ustring& key) const +#else +double KeyFile::get_double(const Glib::ustring& group_name, const Glib::ustring& key, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + double retvalue = g_key_file_get_double(const_cast(gobj()), group_name.c_str(), key.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +void KeyFile::set_double(const Glib::ustring& group_name, const Glib::ustring& key, double value) +{ +g_key_file_set_double(gobj(), group_name.c_str(), key.c_str(), value); +} + #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::ustring KeyFile::get_comment(const Glib::ustring& group_name, const Glib::ustring& key) const #else diff --git a/libs/glibmm2/glib/glibmm/keyfile.h b/libs/glibmm2/glib/glibmm/keyfile.h index 3625578a70..1c94b466fb 100644 --- a/libs/glibmm2/glib/glibmm/keyfile.h +++ b/libs/glibmm2/glib/glibmm/keyfile.h @@ -84,9 +84,9 @@ inline KeyFileFlags& operator^=(KeyFileFlags& lhs, KeyFileFlags rhs) { return (lhs = static_cast(static_cast(lhs) ^ static_cast(rhs))); } - /** Exception class for KeyFile errors. - */ - class KeyFileError : public Glib::Error +/** Exception class for KeyFile errors. + */ +class KeyFileError : public Glib::Error { public: enum Code @@ -118,6 +118,61 @@ private: }; +/** This class lets you parse, edit or create files containing groups of key-value pairs, which we call key files + * for lack of a better name. Several freedesktop.org specifications use key files now, e.g the Desktop Entry + * Specification and the Icon Theme Specification. + * + * The syntax of key files is described in detail in the Desktop Entry Specification, here is a quick summary: Key + * files consists of groups of key-value pairs, interspersed with comments. + * + * @code + * # this is just an example + * # there can be comments before the first group + * + * [First Group] + * + * Name=Key File Example\tthis value shows\nescaping + * + * # localized strings are stored in multiple key-value pairs + * Welcome=Hello + * Welcome[de]=Hallo + * Welcome[fr]=Bonjour + * Welcome[it]=Ciao + * + * [Another Group] + * + * Numbers=2;20;-200;0 + * + * Booleans=true;false;true;true + * @endcode + * + * Lines beginning with a '#' and blank lines are considered comments. + * + * Groups are started by a header line containing the group name enclosed in '[' and ']', and ended implicitly by + * the start of the next group or the end of the file. Each key-value pair must be contained in a group. + * + * Key-value pairs generally have the form key=value, with the exception of localized strings, which have the form + * key[locale]=value. Space before and after the '=' character are ignored. Newline, tab, carriage return and + * backslash characters in value are escaped as \n, \t, \r, and \\, respectively. To preserve leading spaces in + * values, these can also be escaped as \s. + * + * Key files can store strings (possibly with localized variants), integers, booleans and lists of these. Lists are + * separated by a separator character, typically ';' or ','. To use the list separator character in a value in a + * list, it has to be escaped by prefixing it with a backslash. + * + * This syntax is obviously inspired by the .ini files commonly met on Windows, but there are some important + * differences: + * - .ini files use the ';' character to begin comments, key files use the '#' character. + * - Key files allow only comments before the first group. + * - Key files are always encoded in UTF-8. + * - Key and Group names are case-sensitive, for example a group called [GROUP] is a different group from [group]. + * + * Note that in contrast to the Desktop Entry Specification, groups in key files may contain the same key multiple + * times; the last entry wins. Key files may also contain multiple groups with the same name; they are merged + * together. Another difference is that keys and group names in key files are not restricted to ASCII characters. + * + * @newin2p14 + */ class KeyFile { public: @@ -178,6 +233,16 @@ public: bool load_from_data(const Glib::ustring& data, KeyFileFlags flags = Glib::KEY_FILE_NONE); + //TODO: + /* + gboolean g_key_file_load_from_dirs (GKeyFile *key_file, + const gchar *file, + const gchar **search_dirs, + gchar **full_path, + GKeyFileFlags flags, + GError **error); + */ + /** Looks for a KeyFile named @a file in the paths returned from * g_get_user_data_dir() and g_get_system_data_dirs() and loads them * into the keyfile object, placing the full path to the file in @@ -198,7 +263,7 @@ public: Glib::ustring to_data(); - /** Returns the name of the start group of the file. + /** Return value: The start group of the key file. * @return The start group of the key file. * * @newin2p6. @@ -243,12 +308,7 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED - /** Returns the value associated with @a key under @a group_name . - * - * In the event the key cannot be found, 0 is returned and - * @a error is set to G::KEY_FILE_ERROR_KEY_NOT_FOUND. In the - * event that the @a group_name cannot be found, 0 is returned - * and @a error is set to G::KEY_FILE_ERROR_GROUP_NOT_FOUND. + /** Return value: a newly allocated string or 0 if the specified * @param group_name A group name. * @param key A key. * @param error Return location for a G::Error, or 0. @@ -264,12 +324,7 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED - /** Returns the value associated with @a key under @a group_name . - * - * In the event the key cannot be found, 0 is returned and - * @a error is set to G::KEY_FILE_ERROR_KEY_NOT_FOUND. In the - * event that the @a group_name cannot be found, 0 is returned - * and @a error is set to G::KEY_FILE_ERROR_GROUP_NOT_FOUND. + /** Return value: a newly allocated string or 0 if the specified * @param group_name A group name. * @param key A key. * @param error Return location for a G::Error, or 0. @@ -291,14 +346,7 @@ public: Glib::ustring get_locale_string(const Glib::ustring& group_name, const Glib::ustring& key) const; - /** Returns the value associated with @a key under @a group_name - * translated in the given @a locale if available. If @a locale is - * 0 then the current locale is assumed. - * - * If @a key cannot be found then 0 is returned and @a error is set to - * G::KEY_FILE_ERROR_KEY_NOT_FOUND. If the value associated - * with @a key cannot be interpreted or no suitable translation can - * be found then the untranslated value is returned. + /** Return value: a newly allocated string or 0 if the specified * @param group_name A group name. * @param key A key. * @param locale A locale or 0. @@ -315,18 +363,13 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED - /** Returns the value associated with @a key under @a group_name as a - * boolean. - * - * If @a key cannot be found then the return value is undefined and - * @a error is set to G::KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if - * the value associated with @a key cannot be interpreted as a boolean - * then the return value is also undefined and @a error is set to - * G::KEY_FILE_ERROR_INVALID_VALUE. + /** Return value: the value associated with the key as a boolean, or * @param group_name A group name. * @param key A key. * @param error Return location for a G::Error. - * @return The value associated with the key as a boolean + * @return The value associated with the key as a boolean, or + * false if the key was not found or could not be parsed. + * * @newin2p6. */ #ifdef GLIBMM_EXCEPTIONS_ENABLED @@ -345,18 +388,12 @@ public: int get_integer(const Glib::ustring& key) const; - /** Returns the value associated with @a key under @a group_name as an - * integer. If @a group_name is 0, the start_group is used. - * - * If @a key cannot be found then the return value is undefined and - * @a error is set to G::KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if - * the value associated with @a key cannot be interpreted as an integer - * then the return value is also undefined and @a error is set to - * G::KEY_FILE_ERROR_INVALID_VALUE. + /** Return value: the value associated with the key as an integer, or * @param group_name A group name. * @param key A key. * @param error Return location for a G::Error. - * @return The value associated with the key as an integer. + * @return The value associated with the key as an integer, or + * 0 if the key was not found or could not be parsed. * * @newin2p6. */ @@ -367,6 +404,52 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Gets the value in the first group, under @a key, interpreting it as + * a double. + * @param key The name of the key + * @return The value of @a key as an double + * @throws Glib::KeyFileError + * + * @newin2p14 + */ + double get_double(const Glib::ustring& key) const; + + + /** Return value: the value associated with the key as a double, or + * @param group_name A group name. + * @param key A key. + * @param error Return location for a G::Error. + * @return The value associated with the key as a double, or + * 0.0 if the key was not found or could not be parsed. + * + * @newin2p14. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + double get_double(const Glib::ustring& group_name, const Glib::ustring& key) const; +#else + double get_double(const Glib::ustring& group_name, const Glib::ustring& key, std::auto_ptr& error) const; +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** Associates a new double value with @a key under @a group_name . + * If @a key cannot be found then it is created. + * + * @newin2p14 + * @param group_name A group name. + * @param key A key. + * @param value An double value. + */ + void set_double(const Glib::ustring& group_name, const Glib::ustring& key, double value); + + /** Associates a new double value with @a key under the start group. + * If @a key cannot be found then it is created. + * + * @newin2p12 + * @param key A key. + * @param value An double value. + */ + void set_double(const Glib::ustring& key, double value); + /** Returns the values associated with @a key under @a group_name * @param group_name The name of a group * @param key The name of a key @@ -414,6 +497,15 @@ public: Glib::ArrayHandle get_integer_list(const Glib::ustring& group_name, const Glib::ustring& key) const; + /** Returns the values associated with @a key under @a group_name + * @param group_name The name of a group + * @param key The name of a key + * @return A list of doubles + * @throws Glib::KeyFileError + */ + Glib::ArrayHandle get_double_list(const Glib::ustring& group_name, const Glib::ustring& key) const; + + /** Get comment from top of file * @return The comment */ @@ -530,7 +622,7 @@ public: /** Sets a list of booleans for the @a key under @a group_name. - * If either the @a key or @a group_name cannot be found they are created + * If either the @a key or @a group_name cannot be found they are created. * @param group_name The name of a group * @param key The name of a key * @param list A list holding object of type bool @@ -539,7 +631,7 @@ public: /** Sets a list of integers for the @a key under @a group_name. - * If either the @a key or @a group_name cannot be found they are created + * If either the @a key or @a group_name cannot be found they are created. * @param group_name The name of a group * @param key The name of a key * @param list A list holding object of type int @@ -547,6 +639,17 @@ public: void set_integer_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list); + /** Sets a list of doubles for the @a key under @a group_name. + * If either the @a key or @a group_name cannot be found they are created. + * @param group_name The name of a group + * @param key The name of a key + * @param list A list holding object of type int + * + * @newin2p14 + */ + void set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list); + + /** Places @a comment at the start of the file, before the first group. * @param comment The Comment */ diff --git a/libs/glibmm2/glib/glibmm/listhandle.h b/libs/glibmm2/glib/glibmm/listhandle.h index 2f26eb9ab7..650944e7e1 100644 --- a/libs/glibmm2/glib/glibmm/listhandle.h +++ b/libs/glibmm2/glib/glibmm/listhandle.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_LISTHANDLE_H #define _GLIBMM_LISTHANDLE_H -/* $Id: listhandle.h,v 1.3 2003/04/21 17:39:41 murrayc Exp $ */ +/* $Id: listhandle.h 32 2003-04-21 17:39:41Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/main.cc b/libs/glibmm2/glib/glibmm/main.cc index 0075b49fd6..3ae43e3a4a 100644 --- a/libs/glibmm2/glib/glibmm/main.cc +++ b/libs/glibmm2/glib/glibmm/main.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: main.cc,v 1.11 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: main.cc 420 2007-06-22 15:29:58Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -288,6 +288,7 @@ SignalTimeout::SignalTimeout(GMainContext* context) context_ (context) {} +/* Note that this is our equivalent of g_timeout_add(). */ sigc::connection SignalTimeout::connect(const sigc::slot& slot, unsigned int interval, int priority) { @@ -310,6 +311,29 @@ sigc::connection SignalTimeout::connect(const sigc::slot& slot, return connection; } +/* Note that this is our equivalent of g_timeout_add_seconds(). */ +sigc::connection SignalTimeout::connect_seconds(const sigc::slot& slot, + unsigned int interval, int priority) +{ + SourceConnectionNode *const conn_node = new SourceConnectionNode(slot); + const sigc::connection connection (*conn_node->get_slot()); + + GSource *const source = g_timeout_source_new_seconds(interval); + + if(priority != G_PRIORITY_DEFAULT) + g_source_set_priority(source, priority); + + g_source_set_callback( + source, &glibmm_source_callback, conn_node, + &SourceConnectionNode::destroy_notify_callback); + + g_source_attach(source, context_); + g_source_unref(source); // GMainContext holds a reference + + conn_node->install(source); + return connection; +} + SignalTimeout signal_timeout() { return SignalTimeout(0); // 0 means default context diff --git a/libs/glibmm2/glib/glibmm/main.h b/libs/glibmm2/glib/glibmm/main.h index 1bd1be0c86..c4fe1ad19a 100644 --- a/libs/glibmm2/glib/glibmm/main.h +++ b/libs/glibmm2/glib/glibmm/main.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_MAIN_H #define _GLIBMM_MAIN_H -/* $Id: main.h,v 1.9 2005/03/14 15:22:13 murrayc Exp $ */ +/* $Id: main.h 420 2007-06-22 15:29:58Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -166,6 +166,18 @@ public: #endif /** Connects a timeout handler. + * + * Note that timeout functions may be delayed, due to the processing of other + * event sources. Thus they should not be relied on for precise timing. + * After each call to the timeout function, the time of the next + * timeout is recalculated based on the current time and the given interval + * (it does not try to 'catch up' time lost in delays). + * + * If you want to have a timer in the "seconds" range and do not care + * about the exact time of the first call of the timer, use the + * connect_seconds() function; this function allows for more + * optimizations and more efficient system power usage. + * * @code * Glib::signal_timeout().connect(sigc::ptr_fun(&timeout_handler), 1000); * @endcode @@ -175,13 +187,45 @@ public: * timeout_source->connect(sigc::ptr_fun(&timeout_handler)); * timeout_source->attach(Glib::MainContext::get_default()); * @endcode - * @param slot A slot to call when @a interval elapsed. + * @param slot A slot to call when @a interval has elapsed. * @param interval The timeout in milliseconds. * @param priority The priority of the new event source. * @return A connection handle, which can be used to disconnect the handler. */ sigc::connection connect(const sigc::slot& slot, unsigned int interval, int priority = PRIORITY_DEFAULT); + + + /** Connects a timeout handler with whole second granularity. + * + * Unlike connect(), this operates at whole second granularity. + * The initial starting point of the timer is determined by the implementation + * and the implementation is expected to group multiple timers together so that + * they fire all at the same time. + * + * To allow this grouping, the @a interval to the first timer is rounded + * and can deviate up to one second from the specified interval. + * Subsequent timer iterations will generally run at the specified interval. + * + * @code + * Glib::signal_timeout().connect(sigc::ptr_fun(&timeout_handler), 1000); + * @endcode + * is equivalent to: + * @code + * const Glib::RefPtr timeout_source = Glib::TimeoutSource::create(1000); + * timeout_source->connectseconds(sigc::ptr_fun(&timeout_handler)); + * timeout_source->attach(Glib::MainContext::get_default()); + * @endcode + * @param slot A slot to call when @a interval has elapsed. + * @param interval The timeout in seconds. + * @param priority The priority of the new event source. + * @return A connection handle, which can be used to disconnect the handler. + * + * @newin2p14 + */ + sigc::connection connect_seconds(const sigc::slot& slot, unsigned int interval, + int priority = PRIORITY_DEFAULT); + private: GMainContext* context_; diff --git a/libs/glibmm2/glib/glibmm/markup.h b/libs/glibmm2/glib/glibmm/markup.h index 0ae7e68ffc..b3885cdfcf 100644 --- a/libs/glibmm2/glib/glibmm/markup.h +++ b/libs/glibmm2/glib/glibmm/markup.h @@ -153,11 +153,13 @@ typedef Glib::MarkupError Error; Glib::ustring escape_text(const Glib::ustring& text); -/** @addtogroup glibmmEnums Enums and Flags */ - /** There are no flags right now. Pass Glib::Markup::ParseFlags(0) for * the flags argument to all functions (this should be the default argument * anyway). + */ +/** @addtogroup glibmmEnums Enums and Flags */ + +/** * @ingroup glibmmEnums * @par Bitwise operators: * %ParseFlags operator|(ParseFlags, ParseFlags)
@@ -170,7 +172,8 @@ Glib::ustring escape_text(const Glib::ustring& text); */ enum ParseFlags { - DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0 + DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0, + TREAT_CDATA_AS_TEXT = 1 << 1 }; /** @ingroup glibmmEnums */ diff --git a/libs/glibmm2/glib/glibmm/miscutils.cc b/libs/glibmm2/glib/glibmm/miscutils.cc index 57fa6ebb68..eb0ff01b09 100644 --- a/libs/glibmm2/glib/glibmm/miscutils.cc +++ b/libs/glibmm2/glib/glibmm/miscutils.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: miscutils.cc,v 1.6 2006/09/10 14:38:53 jjongsma Exp $ */ +/* $Id: miscutils.cc 420 2007-06-22 15:29:58Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -31,22 +31,7 @@ namespace Glib Glib::ustring get_application_name() { - if(const char *const application_name = g_get_application_name()) - { - // Lets be a bit more strict than the original GLib function and ensure - // we always return valid UTF-8. gtkmm coders surely won't expect invalid - // UTF-8 in a Glib::ustring returned by a glibmm function. - - if(g_utf8_validate(application_name, -1, 0)) - return Glib::ustring(application_name); - - char *const appname_utf8 = g_filename_to_utf8(application_name, -1, 0, 0, 0); - g_return_val_if_fail(appname_utf8 != 0, ""); - - return Glib::ustring(ScopedPtr(appname_utf8).get()); - } - - return Glib::ustring(); + return convert_const_gchar_ptr_to_ustring (g_get_application_name()); } void set_application_name(const Glib::ustring& application_name) @@ -56,8 +41,7 @@ void set_application_name(const Glib::ustring& application_name) std::string get_prgname() { - const char *const prgname = g_get_prgname(); - return (prgname) ? std::string(prgname) : std::string(); + return convert_const_gchar_ptr_to_stdstring(g_get_prgname()); } void set_prgname(const std::string& prgname) @@ -69,13 +53,12 @@ std::string getenv(const std::string& variable, bool& found) { const char *const value = g_getenv(variable.c_str()); found = (value != 0); - return (value) ? std::string(value) : std::string(); + return convert_const_gchar_ptr_to_stdstring(value); } std::string getenv(const std::string& variable) { - const char *const value = g_getenv(variable.c_str()); - return (value) ? std::string(value) : std::string(); + return convert_const_gchar_ptr_to_stdstring(g_getenv(variable.c_str())); } bool setenv(const std::string& variable, const std::string& value, bool overwrite) @@ -90,175 +73,89 @@ void unsetenv(const std::string& variable) std::string get_user_name() { - return std::string(g_get_user_name()); + return convert_const_gchar_ptr_to_stdstring(g_get_user_name()); } std::string get_real_name() { - return std::string(g_get_real_name()); + return convert_const_gchar_ptr_to_stdstring(g_get_real_name()); } std::string get_home_dir() { - const char *const value = g_get_home_dir(); - return (value) ? std::string(value) : std::string(); + return convert_const_gchar_ptr_to_stdstring(g_get_home_dir()); } std::string get_tmp_dir() { - return std::string(g_get_tmp_dir()); + return convert_const_gchar_ptr_to_stdstring(g_get_tmp_dir()); } std::string get_current_dir() { - const ScopedPtr buf (g_get_current_dir()); - return std::string(buf.get()); + return convert_return_gchar_ptr_to_stdstring(g_get_current_dir()); +} + +std::string get_user_special_dir(GUserDirectory directory) +{ + return convert_const_gchar_ptr_to_stdstring(g_get_user_special_dir(directory)); } std::string get_user_data_dir() { - return std::string(g_get_user_data_dir()); + return convert_const_gchar_ptr_to_stdstring(g_get_user_data_dir()); } std::string get_user_config_dir() { - return std::string(g_get_user_config_dir()); + return convert_const_gchar_ptr_to_stdstring(g_get_user_config_dir()); } std::string get_user_cache_dir() { - return std::string(g_get_user_cache_dir()); + return convert_const_gchar_ptr_to_stdstring(g_get_user_cache_dir()); } bool path_is_absolute(const std::string& filename) { - return g_path_is_absolute(filename.c_str()); + return (g_path_is_absolute(filename.c_str()) != 0); } std::string path_skip_root(const std::string& filename) { // g_path_skip_root() returns a pointer _into_ the argument string, // or NULL if there was no root component. - - if(const char *const ptr = g_path_skip_root(filename.c_str())) - return std::string(ptr); - else - return std::string(); + return convert_const_gchar_ptr_to_stdstring(g_path_skip_root(filename.c_str())); } std::string path_get_basename(const std::string& filename) { - const ScopedPtr buf (g_path_get_basename(filename.c_str())); - return std::string(buf.get()); + return convert_return_gchar_ptr_to_stdstring(g_path_get_basename(filename.c_str())); } std::string path_get_dirname(const std::string& filename) { - const ScopedPtr buf (g_path_get_dirname(filename.c_str())); - return std::string(buf.get()); + return convert_return_gchar_ptr_to_stdstring(g_path_get_dirname(filename.c_str())); } std::string build_filename(const Glib::ArrayHandle& elements) { - return Glib::convert_return_gchar_ptr_to_stdstring( g_build_filenamev(const_cast(elements.data())) ); - + return convert_return_gchar_ptr_to_stdstring(g_build_filenamev(const_cast(elements.data()))); } std::string build_filename(const std::string& elem1, const std::string& elem2) { - const char *const elements[] = { elem1.c_str(), elem2.c_str(), 0 }; - return build_filename(elements); + return convert_return_gchar_ptr_to_stdstring(g_build_filename(elem1.c_str(), elem2.c_str(), static_cast(0))); } std::string build_path(const std::string& separator, const Glib::ArrayHandle& elements) { - return Glib::convert_return_gchar_ptr_to_stdstring( g_build_pathv(separator.c_str(), const_cast(elements.data())) ); - -/* Yes, this reimplements the functionality of g_build_path() -- because - * it takes a varargs list, and calling it several times would result - * in different behaviour. - */ - /* - std::string result; - result.reserve(256); //TODO: Explain why this magic number is useful. murrayc - - const char *const sep = separator.c_str(); - const size_t seplen = separator.length(); - - bool is_first = true; - bool have_leading = false; - const char* single_element = 0; - const char* last_trailing = 0; - - const char *const *const elements_begin = elements.data(); - const char *const *const elements_end = elements_begin + elements.size(); - - for(const char *const * pelement = elements_begin; pelement != elements_end; ++pelement) - { - const char* start = *pelement; - - if(*start == '\0') - continue; // ignore empty elements - - if(seplen != 0) - { - while(strncmp(start, sep, seplen) == 0) - start += seplen; - } - - const char* end = start + strlen(start); - - if(seplen != 0) - { - while(end >= start + seplen && strncmp(end - seplen, sep, seplen) == 0) - end -= seplen; - - last_trailing = end; - - while(last_trailing >= *pelement + seplen && strncmp(last_trailing - seplen, sep, seplen) == 0) - last_trailing -= seplen; - - if(!have_leading) - { - // If the leading and trailing separator strings are in the - // same element and overlap, the result is exactly that element. - // - if(last_trailing <= start) - single_element = *pelement; - - result.append(*pelement, start); - have_leading = true; - } - else - single_element = 0; - } - - if(end == start) - continue; - - if(!is_first) - result += separator; - - result.append(start, end); - is_first = false; - } - - if(single_element) - result = single_element; - else if(last_trailing) - result += last_trailing; - - return result; - */ + return convert_return_gchar_ptr_to_stdstring(g_build_pathv(separator.c_str(), const_cast(elements.data()))); } std::string find_program_in_path(const std::string& program) { - if(char *const buf = g_find_program_in_path(program.c_str())) - return std::string(ScopedPtr(buf).get()); - else - return std::string(); + return convert_return_gchar_ptr_to_stdstring(g_find_program_in_path(program.c_str())); } } // namespace Glib - diff --git a/libs/glibmm2/glib/glibmm/miscutils.h b/libs/glibmm2/glib/glibmm/miscutils.h index 27658b54bb..3861c3772f 100644 --- a/libs/glibmm2/glib/glibmm/miscutils.h +++ b/libs/glibmm2/glib/glibmm/miscutils.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_MISCUTILS_H #define _GLIBMM_MISCUTILS_H -/* $Id: miscutils.h,v 1.5 2006/09/10 14:38:53 jjongsma Exp $ */ +/* $Id: miscutils.h 428 2007-07-29 12:43:29Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -154,13 +154,31 @@ std::string get_tmp_dir(); */ std::string get_current_dir(); +//TODO: We could create a C++ enum to wrap the C GUserDirectory enum, +//but we would have to either be very careful, or define the enum +//values in terms of the C enums anyway. +/** Returns the full path of a special directory using its logical id. + * + * On Unix this is done using the XDG special user directories. + * + * Depending on the platform, the user might be able to change the path + * of the special directory without requiring the session to restart; GLib + * will not reflect any change once the special directories are loaded. + * + * Return value: the path to the specified special directory. + * @param directory Te logical id of special directory + * + * @newin2p14 + */ +std::string get_user_special_dir(GUserDirectory directory); + /** Returns a base directory in which to access application data such as icons * that is customized for a particular user. * * On UNIX platforms this is determined using the mechanisms described in the * XDG Base Directory Specification * - * @since glibmm 2.14 + * @newin2p14 */ std::string get_user_data_dir(); @@ -170,7 +188,7 @@ std::string get_user_data_dir(); * On UNIX platforms this is determined using the mechanisms described in the * XDG Base Directory Specification * - * @since glibmm 2.14 + * @newin2p14 */ std::string get_user_config_dir(); @@ -180,7 +198,7 @@ std::string get_user_config_dir(); * On UNIX platforms this is determined using the mechanisms described in the * XDG Base Directory Specification * - * @since glibmm 2.14 + * @newin2p14 */ std::string get_user_cache_dir(); diff --git a/libs/glibmm2/glib/glibmm/object.cc b/libs/glibmm2/glib/glibmm/object.cc index 9a9c82b7ec..8f616200a7 100644 --- a/libs/glibmm2/glib/glibmm/object.cc +++ b/libs/glibmm2/glib/glibmm/object.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: object.cc,v 1.6 2004/06/20 03:41:20 daniel Exp $ */ +/* $Id: object.cc 369 2007-01-20 10:19:33Z daniel $ */ /* Copyright 1998-2002 The gtkmm Development Team * @@ -28,8 +28,6 @@ #include -#include - //Weak references: //I'm not sure what the point of these are apart from being a hacky way out of circular references, //but maybe we could make it easier to use them by making a Java Reference Object -style class like so: @@ -59,10 +57,15 @@ ConstructParams::ConstructParams(const Glib::Class& glibmm_class_) parameters (0) {} -/* The implementation is mostly copied from gobject.c, with some minor tweaks. +/* + * The implementation is mostly copied from gobject.c, with some minor tweaks. * Basically, it looks up each property name to get its GType, and then uses * G_VALUE_COLLECT() to store the varargs argument in a GValue of the correct * type. + * + * Note that the property name arguments are assumed to be static string + * literals. No attempt is made to copy the string content. This is no + * different from g_object_new(). */ ConstructParams::ConstructParams(const Glib::Class& glibmm_class_, const char* first_property_name, ...) @@ -89,7 +92,7 @@ ConstructParams::ConstructParams(const Glib::Class& glibmm_class_, if(!pspec) { g_warning("Glib::ConstructParams::ConstructParams(): " - "object class `%s' has no property named `%s'", + "object class \"%s\" has no property named \"%s\"", g_type_name(glibmm_class.get_type()), name); break; } @@ -131,7 +134,7 @@ ConstructParams::~ConstructParams() } /* - * Some compilers require the existance of a copy constructor in certain + * Some compilers require the existence of a copy constructor in certain * usage contexts. This implementation is fully functional, but unlikely * to be ever actually called due to optimization. */ @@ -196,13 +199,10 @@ Object::Object() if(custom_type_name_ && !is_anonymous_custom_()) { object_class_.init(); - object_type = object_class_.clone_custom_type(custom_type_name_); //A type that is derived from GObject. + // This creates a type that is derived (indirectly) from GObject. + object_type = object_class_.clone_custom_type(custom_type_name_); } - // Create a new GObject with the specified array of construct properties. - // This works with custom types too, since those inherit the properties of - // their base class. - void *const new_object = g_object_newv(object_type, 0, 0); // Connect the GObject and Glib::Object instances. diff --git a/libs/glibmm2/glib/glibmm/object.h b/libs/glibmm2/glib/glibmm/object.h index 6a06848b66..a44300d464 100644 --- a/libs/glibmm2/glib/glibmm/object.h +++ b/libs/glibmm2/glib/glibmm/object.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_OBJECT_H #define _GLIBMM_OBJECT_H -/* $Id: object.h,v 1.14 2006/06/19 20:43:42 murrayc Exp $ */ +/* $Id: object.h 369 2007-01-20 10:19:33Z daniel $ */ /* Copyright 2002 The gtkmm Development Team * @@ -23,15 +23,16 @@ //X11 defines DestroyNotify and some other non-prefixed stuff, and it's too late to change that now, //so let's give people a clue about the compilation errors that they will see: #ifdef DestroyNotify - #error "X11/Xlib.h seems to have been included before this header. Due to some commonly-named macros in X11/Xlib.h, it may only be included after any glibmm, gdkmm, or gtkmm headers." -#endif //DestroyNotify +# error "X11/Xlib.h seems to have been included before this header. Due to some commonly-named macros in X11/Xlib.h, it may only be included after any glibmm, gdkmm, or gtkmm headers." +#endif +#include /* for G_GNUC_NULL_TERMINATED */ #include #include #include #include #include /* Could be private, but that would be tedious. */ -#include //Because its specializations may be here. +#include /* Because its specializations may be here. */ #include #include @@ -60,7 +61,7 @@ class GSigConnectionNode; * involved, since g_object_new() is just a wrapper around g_object_newv() * as well. * - * The advantage of an auxilary ConstructParams object over g_object_new() + * The advantage of an auxiliary ConstructParams object over g_object_new() * is that the actual construction is always done in the Glib::Object ctor. * This allows for neat tricks like easy creation of derived custom types, * without adding special support to each ctor of every class. @@ -76,16 +77,18 @@ public: GParameter* parameters; explicit ConstructParams(const Glib::Class& glibmm_class_); - ConstructParams(const Glib::Class& glibmm_class_, const char* first_property_name, ...); + ConstructParams(const Glib::Class& glibmm_class_, const char* first_property_name, ...) + G_GNUC_NULL_TERMINATED; // warn if called without a trailing NULL pointer ~ConstructParams(); - // This is only used by the C++ compiler (since g++ 3.4) to create temporary instances. - // Apparently the compiler will actually optimize away the use of this. - // See bug #132300. + // The copy constructor is semantically required by the C++ compiler + // (since g++ 3.4) to be able to create temporary instances, depending + // on the usage context. Apparently the compiler will actually optimize + // away the copy, though. See bug #132300. ConstructParams(const ConstructParams& other); private: - // noncopyable + // no copy assignment ConstructParams& operator=(const ConstructParams&); }; @@ -158,7 +161,7 @@ private: //For some (proably, more spec-compliant) compilers, these specializations must //be next to the objects that they use. #ifndef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION -#ifndef DOXYGEN_SHOULD_SKIP_THIS /* hide the specializations */ +# ifndef DOXYGEN_SHOULD_SKIP_THIS /* hide the specializations */ namespace Container_Helpers { @@ -174,9 +177,9 @@ struct TypeTraits< Glib::RefPtr > typedef typename T::BaseObjectType * CType; typedef typename T::BaseObjectType * CTypeNonConst; - static CType to_c_type (const CppType& ptr) { return Glib::unwrap(ptr); } - static CType to_c_type (CType ptr) { return ptr; } - static CppType to_cpp_type (CType ptr) + static CType to_c_type (const CppType& ptr) { return Glib::unwrap(ptr); } + static CType to_c_type (CType ptr) { return ptr; } + static CppType to_cpp_type(CType ptr) { //return Glib::wrap(ptr, true); @@ -189,7 +192,7 @@ struct TypeTraits< Glib::RefPtr > //We use dynamic_cast<> in case of multiple inheritance. } - static void release_c_type (CType ptr) + static void release_c_type(CType ptr) { GLIBMM_DEBUG_UNREFERENCE(0, ptr); g_object_unref(ptr); @@ -197,7 +200,7 @@ struct TypeTraits< Glib::RefPtr > }; //This confuses the SUN Forte compiler, so we ifdef it out: -#ifdef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS +# ifdef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS /** Partial specialization for pointers to const GObject instances. * @ingroup ContHelpers @@ -210,9 +213,9 @@ struct TypeTraits< Glib::RefPtr > typedef const typename T::BaseObjectType * CType; typedef typename T::BaseObjectType * CTypeNonConst; - static CType to_c_type (const CppType& ptr) { return Glib::unwrap(ptr); } - static CType to_c_type (CType ptr) { return ptr; } - static CppType to_cpp_type (CType ptr) + static CType to_c_type (const CppType& ptr) { return Glib::unwrap(ptr); } + static CType to_c_type (CType ptr) { return ptr; } + static CppType to_cpp_type(CType ptr) { //return Glib::wrap(ptr, true); @@ -225,14 +228,14 @@ struct TypeTraits< Glib::RefPtr > //We use dynamic_cast<> in case of multiple inheritance. } - static void release_c_type (CType ptr) + static void release_c_type (CType ptr) { GLIBMM_DEBUG_UNREFERENCE(0, ptr); g_object_unref(const_cast(ptr)); } }; -#endif //GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS +# endif /* GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS */ } //namespace Container_Helpers @@ -261,7 +264,7 @@ public: }; //The SUN Forte Compiler has a problem with this: -#ifdef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS +# ifdef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS /** Partial specialization for RefPtr<> to const Glib::Object. * @ingroup glibmmValue @@ -278,11 +281,10 @@ public: void set(const CppType& data) { set_object(const_cast(data.operator->())); } CppType get() const { return Glib::RefPtr::cast_dynamic(get_object_copy()); } }; -#endif //GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS +# endif /* GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS */ - -#endif //DOXYGEN_SHOULD_SKIP_THIS -#endif //GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION +# endif /* DOXYGEN_SHOULD_SKIP_THIS */ +#endif /* GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION */ } // namespace Glib diff --git a/libs/glibmm2/glib/glibmm/objectbase.cc b/libs/glibmm2/glib/glibmm/objectbase.cc index fb0a61a164..237c41fed3 100644 --- a/libs/glibmm2/glib/glibmm/objectbase.cc +++ b/libs/glibmm2/glib/glibmm/objectbase.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: objectbase.cc,v 1.8 2006/11/10 02:24:49 murrayc Exp $ */ +/* $Id: objectbase.cc 337 2006-11-10 02:24:49Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/objectbase.h b/libs/glibmm2/glib/glibmm/objectbase.h index a4bf9a526c..623726bd7f 100644 --- a/libs/glibmm2/glib/glibmm/objectbase.h +++ b/libs/glibmm2/glib/glibmm/objectbase.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_OBJECTBASE_H #define _GLIBMM_OBJECTBASE_H -/* $Id: objectbase.h,v 1.13 2006/11/10 02:24:49 murrayc Exp $ */ +/* $Id: objectbase.h 385 2007-03-23 17:23:42Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -134,7 +135,24 @@ public: GObject* gobj_copy() const; #ifndef DOXYGEN_SHOULD_SKIP_THIS - static ObjectBase* _get_current_wrapper(GObject* object); + + /// This is for use by gtkmm wrappers only, and not by applications. + static ObjectBase* _get_current_wrapper(GObject* object); //We keep this non-inline version, to preserve ABI. + + // This is commented-out because it's not clear yet whether it's a worthwhile optimization. + /// This is for use by gtkmm wrappers only, and not by applications. + // + //inline static ObjectBase* _get_current_wrapper_inline(GObject* object) + //{ + // // This is what g_object_get_qdata does internally. However, + // // g_object_get_qdata does an addition G_IS_OBJECT(object) check that + // // needs three times as much time as the actual lookup. + // if(object) + // return static_cast(g_datalist_id_get_data(&object->qdata, Glib::quark_)); + // else + // return 0; + //} + bool _cpp_destruction_is_in_progress() const; #endif //DOXYGEN_SHOULD_SKIP_THIS @@ -146,8 +164,21 @@ protected: bool cpp_destruction_in_progress_; bool is_anonymous_custom_() const; - bool is_derived_() const; +public: // is_derived_() must be public, so that overridden vfuncs and signal handlers can call it via ObjectBase. + + /// This is for use by gtkmm wrappers only, and not by applications. + bool is_derived_() const; //We keep this non-inline version, to preserve ABI. + + //This is commented-out because it's not clear yet whether it's a worthwhile optimization. + // + /// This is for use by gtkmm wrappers only, and not by applications. + //inline bool is_derived_inline_() const + //{ + // return (custom_type_name_ != 0); + //} + +protected: static void destroy_notify_callback_(void* data); virtual void destroy_notify_(); diff --git a/libs/glibmm2/glib/glibmm/optioncontext.cc b/libs/glibmm2/glib/glibmm/optioncontext.cc index 64d9468f2a..df6408fc40 100644 --- a/libs/glibmm2/glib/glibmm/optioncontext.cc +++ b/libs/glibmm2/glib/glibmm/optioncontext.cc @@ -25,11 +25,41 @@ */ #include +#include #include namespace Glib { + namespace Private + { + static const gchar* SignalProxy_translate_gtk_callback (const gchar* str, gpointer data) + { + Glib::ustring translated_str; + Glib::OptionContext::SlotTranslate* the_slot = + static_cast(data); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { +#endif //GLIBMM_EXCEPTIONS_ENABLED + translated_str = (*the_slot)(str); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } +#endif //GLIBMM_EXCEPTIONS_ENABLED + return translated_str.c_str (); + } + + static void SignalProxy_translate_gtk_callback_destroy (gpointer data) + { + delete static_cast(data); + } + + } //namespace Private OptionContext::OptionContext(const Glib::ustring& parameter_string) : gobject_( g_option_context_new(parameter_string.c_str()) ), @@ -74,9 +104,18 @@ OptionGroup OptionContext::get_main_group() const */ - -} // namespace Glib +void OptionContext::set_translate_func (const SlotTranslate& slot) +{ + //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter. + //It will be deleted when SignalProxy_translate_gtk_callback_destroy() is called. + SlotTranslate* slot_copy = new SlotTranslate(slot); + g_option_context_set_translate_func( + gobj(), &Private::SignalProxy_translate_gtk_callback, slot_copy, + &Private::SignalProxy_translate_gtk_callback_destroy); +} + +} // namespace Glib namespace { @@ -156,6 +195,31 @@ bool OptionContext::parse(int& argc, char**& argv, std::auto_ptr& e } +void OptionContext::set_summary(const Glib::ustring& summary) +{ +g_option_context_set_summary(gobj(), summary.c_str()); +} + +Glib::ustring OptionContext::get_summary() const +{ + return Glib::convert_const_gchar_ptr_to_ustring(g_option_context_get_summary(const_cast(gobj()))); +} + +void OptionContext::set_description(const Glib::ustring& description) +{ +g_option_context_set_description(gobj(), description.c_str()); +} + +Glib::ustring OptionContext::get_description() const +{ + return Glib::convert_const_gchar_ptr_to_ustring(g_option_context_get_description(const_cast(gobj()))); +} + +void OptionContext::set_translation_domain(const Glib::ustring& domain) +{ +g_option_context_set_translation_domain(gobj(), domain.c_str()); +} + } // namespace Glib diff --git a/libs/glibmm2/glib/glibmm/optioncontext.h b/libs/glibmm2/glib/glibmm/optioncontext.h index ee645eb66b..cf159bdc1f 100644 --- a/libs/glibmm2/glib/glibmm/optioncontext.h +++ b/libs/glibmm2/glib/glibmm/optioncontext.h @@ -27,6 +27,7 @@ #include #include #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" { typedef struct _GOptionContext GOptionContext; } @@ -103,8 +104,7 @@ public: */ void set_help_enabled(bool help_enabled = true); - /** Returns whether automatic <option>--help</option> generation - * is turned on for @a context . See g_option_context_set_help_enabled(). + /** Returns: true if automatic help generation is turned on. * @return true if automatic help generation is turned on. * * @newin2p6. @@ -125,8 +125,7 @@ public: */ void set_ignore_unknown_options(bool ignore_unknown = true); - /** Returns whether unknown options are ignored or not. See - * g_option_context_set_ignore_unknown_options(). + /** Returns: true if unknown options are ignored. * @return true if unknown options are ignored. * * @newin2p6. @@ -151,6 +150,11 @@ public: * @a argv array contains one of the recognized help options, * this function will produce help output to stdout and * call exit (0). + * + * Note that function depends on the + * current locale for + * automatic character set conversion of string and filename + * arguments. * @param argc A pointer to the number of command line arguments. * @param argv A pointer to the array of command line arguments. * @param error A return location for errors. @@ -195,6 +199,68 @@ public: GOptionContext* gobj() { return gobject_; } const GOptionContext* gobj() const { return gobject_; } + + /** Adds a string to be displayed in --help output before the list of options. This + * is typically a summary of the program functionality. + * + * Note that the summary is translated (see set_translate_func(), + * set_translation_domain()). + * + * @newin2p14 + */ + void set_summary(const Glib::ustring& summary); + + /** Returns: the summary + * See set_summary() for more information + * @return The summary + * + * @newin2p14. + */ + Glib::ustring get_summary() const; + + /** Adds a string to be displayed in --help output after the list of + * options. This text often includes a bug reporting address. + * + * Note that the summary is translated (see set_translate_func()). + * + * @newin2p14 + */ + void set_description(const Glib::ustring& description); + + /** Returns: the description + * See set_description() for more information + * @return The description + * + * @newin2p14. + */ + Glib::ustring get_description() const; + + + /** A convenience function to use gettext() for translating + * user-visible strings. + * + * @newin2p14 + */ + void set_translation_domain(const Glib::ustring& domain); + + /** + * This function is used to translate user-visible strings, for --help output. + * The function takes an untranslated string and returns a translated string + */ + typedef sigc::slot SlotTranslate; + + /** + * Sets the function which is used to translate user-visible + * strings, for --help output. Different groups can use different functions. + * + * If you are using gettext(), you only need to set the translation domain, + * see set_translation_domain(). + * + * @newin2p14 + */ + void set_translate_func (const SlotTranslate& slot); + + protected: GOptionContext* gobject_; diff --git a/libs/glibmm2/glib/glibmm/optiongroup.cc b/libs/glibmm2/glib/glibmm/optiongroup.cc index 42d61fe42a..01ac81d0db 100644 --- a/libs/glibmm2/glib/glibmm/optiongroup.cc +++ b/libs/glibmm2/glib/glibmm/optiongroup.cc @@ -5,7 +5,7 @@ #include // -*- c++ -*- -/* $Id: optiongroup.ccg,v 1.17 2006/01/28 12:09:22 murrayc Exp $ */ +/* $Id: optiongroup.ccg,v 1.15.4.3 2006/03/30 12:19:58 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -28,6 +28,7 @@ #include #include //#include +#include // g_malloc #include namespace Glib @@ -43,7 +44,7 @@ static gboolean g_callback_pre_parse(GOptionContext* context, GOptionGroup* /* g { OptionContext cppContext(context, false /* take_ownership */); //OptionGroup cppGroup(group, true /* take_copy */); //Maybe this should be option_group. - + OptionGroup* option_group = static_cast(data); if(option_group) return option_group->on_pre_parse(cppContext, *option_group); @@ -55,7 +56,7 @@ static gboolean g_callback_post_parse(GOptionContext* context, GOptionGroup* /* { OptionContext cppContext(context, false /* take_ownership */); //OptionGroup cppGroup(group, true /* take_copy */); //Maybe this should be option_group. - + OptionGroup* option_group = static_cast(data); if(option_group) { @@ -69,7 +70,7 @@ static void g_callback_error(GOptionContext* context, GOptionGroup* /* group */, { OptionContext cppContext(context, false /* take_ownership */); //OptionGroup cppGroup(group); //Maybe this should be option_group. - + OptionGroup* option_group = static_cast(data); if(option_group) return option_group->on_error(cppContext, *option_group); @@ -105,7 +106,7 @@ OptionGroup::~OptionGroup() CppOptionEntry& cpp_entry = iter->second; cpp_entry.release_c_arg(); } - + if(has_ownership_) { g_option_group_free(gobj()); @@ -116,15 +117,15 @@ OptionGroup::~OptionGroup() void OptionGroup::add_entry(const OptionEntry& entry) { //It does not copy the entry, so it needs to live as long as the group. - + //g_option_group_add_entries takes an array, with the last item in the array having a null long_name. //Hopefully this will be properly documented eventually - see bug # - + //Create a temporary array, just so we can give the correct thing to g_option_group_add_entries: GOptionEntry array[2]; array[0] = *(entry.gobj()); //Copy contents. GLIBMM_INITIALIZE_STRUCT(array[1], GOptionEntry); - + g_option_group_add_entries(gobj(), array); } @@ -163,10 +164,11 @@ void OptionGroup::add_entry_with_wrapper(const OptionEntry& entry, GOptionArg ar const Glib::ustring name = entry.get_long_name(); type_map_entries::iterator iterFind = map_entries_.find(name); if( iterFind == map_entries_.end() ) //If we have not added this entry already - { + { CppOptionEntry cppEntry; cppEntry.carg_type_ = arg_type; cppEntry.allocate_c_arg(); + cppEntry.set_c_arg_default(cpp_arg); cppEntry.cpparg_ = cpp_arg; @@ -177,36 +179,35 @@ void OptionGroup::add_entry_with_wrapper(const OptionEntry& entry, GOptionArg ar cppEntry.entry_->gobj()->arg = arg_type; cppEntry.entry_->gobj()->arg_data = cppEntry.carg_; - + //Remember the C++/C mapping so that we can use it later: map_entries_[name] = cppEntry; add_entry(*(cppEntry.entry_)); } } - + bool OptionGroup::on_pre_parse(OptionContext& /* context */, OptionGroup& /* group */) { - return true; } bool OptionGroup::on_post_parse(OptionContext& /* context */, OptionGroup& /* group */) { //Call this at the start of overrides. - + //TODO: Maybe put this in the C callback: - + //The C args have now been given values by GOption. //Convert C values to C++ values: - + for(type_map_entries::iterator iter = map_entries_.begin(); iter != map_entries_.end(); ++iter) { CppOptionEntry& cpp_entry = iter->second; cpp_entry.convert_c_to_cpp(); } - + return true; } @@ -218,20 +219,24 @@ void OptionGroup::on_error(OptionContext& /* context */, OptionGroup& /* group * OptionGroup::CppOptionEntry::CppOptionEntry() : carg_type_(G_OPTION_ARG_NONE), carg_(0), cpparg_(0), entry_(0) {} - + void OptionGroup::CppOptionEntry::allocate_c_arg() { //Create an instance of the appropriate C type. //This will be destroyed in the OptionGroup destructor. + // + //We must also call set_c_arg_default() to give these C types the specified defaults based on the C++-typed arguments. switch(carg_type_) { case G_OPTION_ARG_STRING: //The char* will be for UTF8 strins. case G_OPTION_ARG_FILENAME: //The char* will be for strings in the current locale's encoding. { char** typed_arg = new char*; - *typed_arg = 0; //The C code will allocate a char* and put it here, for us to g_free() later. + //The C code will allocate a char* and put it here, for us to g_free() later. + //Alternatively, set_c_arg_default() might allocate a char*, and the C code might or might not free and replace that. + *typed_arg = 0; carg_ = typed_arg; - + break; } case G_OPTION_ARG_INT: @@ -239,7 +244,7 @@ void OptionGroup::CppOptionEntry::allocate_c_arg() int* typed_arg = new int; *typed_arg = 0; carg_ = typed_arg; - + break; } case G_OPTION_ARG_STRING_ARRAY: @@ -248,7 +253,7 @@ void OptionGroup::CppOptionEntry::allocate_c_arg() char*** typed_arg = new char**; *typed_arg = 0; carg_ = typed_arg; - + break; } case G_OPTION_ARG_NONE: /* Actually a boolean. */ @@ -256,7 +261,88 @@ void OptionGroup::CppOptionEntry::allocate_c_arg() gboolean* typed_arg = new gboolean; *typed_arg = 0; carg_ = typed_arg; - + + break; + } + default: + { + break; + } + } +} + +void OptionGroup::CppOptionEntry::set_c_arg_default(void* cpp_arg) +{ + switch(carg_type_) + { + case G_OPTION_ARG_INT: + { + *static_cast(carg_) = *static_cast(cpp_arg); + break; + } + case G_OPTION_ARG_NONE: + { + *static_cast(carg_) = *static_cast(cpp_arg); + break; + } + case G_OPTION_ARG_STRING: + { + Glib::ustring* typed_cpp_arg = static_cast(cpp_arg); + if(typed_cpp_arg && !typed_cpp_arg->empty()) + { + const char** typed_c_arg = static_cast(carg_); + *typed_c_arg = g_strdup(typed_cpp_arg->c_str()); //Freed in release_c_arg(). + } + break; + } + case G_OPTION_ARG_FILENAME: + { + std::string* typed_cpp_arg = static_cast(cpp_arg); + if(typed_cpp_arg && !typed_cpp_arg->empty()) + { + const char** typed_c_arg = static_cast(carg_); + *typed_c_arg = g_strdup(typed_cpp_arg->c_str()); //Freed in release_c_arg(). + } + break; + } + case G_OPTION_ARG_STRING_ARRAY: + { + std::vector* typed_cpp_arg = static_cast*>(cpp_arg); + if(typed_cpp_arg) + { + std::vector& vec = *typed_cpp_arg; + const char** array = static_cast( g_malloc(sizeof(gchar*) * (vec.size() + 1)) ); + + for(std::vector::size_type i = 0; i < vec.size(); ++i) + { + array[i] = g_strdup( vec[i].c_str() ); + } + + array[vec.size()] = 0; + + const char*** typed_c_arg = static_cast(carg_); + *typed_c_arg = array; + } + break; + } + case G_OPTION_ARG_FILENAME_ARRAY: + { + std::vector* typed_cpp_arg = static_cast*>(cpp_arg); + if(typed_cpp_arg) + { + std::vector& vec = *typed_cpp_arg; + const char** array = static_cast( g_malloc(sizeof(gchar*) * (vec.size() + 1)) ); + + for(std::vector::size_type i = 0; i < vec.size(); ++i) + { + array[i] = g_strdup( vec[i].c_str() ); + } + + array[vec.size()] = 0; + + const char*** typed_c_arg = static_cast(carg_); + *typed_c_arg = array; + } break; } default: @@ -277,15 +363,15 @@ void OptionGroup::CppOptionEntry::release_c_arg() case G_OPTION_ARG_STRING: case G_OPTION_ARG_FILENAME: { - char** typed_arg = (char**)carg_; + char** typed_arg = static_cast(carg_); g_free(*typed_arg); //Free the char* string at type_arg, which was allocated by the C code. delete typed_arg; //Delete the char** that we allocated in allocate_c_arg; - + break; } case G_OPTION_ARG_INT: { - int* typed_arg = (int*)carg_; + int* typed_arg = static_cast(carg_); delete typed_arg; break; @@ -298,23 +384,23 @@ void OptionGroup::CppOptionEntry::release_c_arg() } case G_OPTION_ARG_NONE: /* Actually a boolean. */ { - gboolean* typed_arg = (gboolean*)carg_; + gboolean* typed_arg = static_cast(carg_); delete typed_arg; break; } default: { - /* TODO: - G_OPTION_ARG_CALLBACK, -*/ + /* TODO: + G_OPTION_ARG_CALLBACK, + */ break; } } - + carg_ = 0; } - + if(entry_) delete entry_; } @@ -325,44 +411,44 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() { case G_OPTION_ARG_STRING: { - char** typed_arg = (char**)carg_; - Glib::ustring* typed_cpp_arg = (Glib::ustring*)cpparg_; + char** typed_arg = static_cast(carg_); + Glib::ustring* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { char* pch = *typed_arg; (*typed_cpp_arg) = Glib::convert_const_gchar_ptr_to_ustring(pch); - + break; } } case G_OPTION_ARG_FILENAME: { - char** typed_arg = (char**)carg_; - std::string* typed_cpp_arg = (std::string*)cpparg_; + char** typed_arg = static_cast(carg_); + std::string* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { char* pch = *typed_arg; (*typed_cpp_arg) = Glib::convert_const_gchar_ptr_to_stdstring(pch); - + break; } } case G_OPTION_ARG_INT: { - *((int*)cpparg_) = *((int*)carg_); + *((int*)cpparg_) = *(static_cast(carg_)); break; } case G_OPTION_ARG_STRING_ARRAY: { - char*** typed_arg = (char***)carg_; - vecustrings* typed_cpp_arg = (vecustrings*)cpparg_; + char*** typed_arg = static_cast(carg_); + vecustrings* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { typed_cpp_arg->clear(); - + //The C array seems to be null-terminated. //Glib::StringArrayHandle array_handle(*typed_arg, Glib::OWNERSHIP_NONE); - + //The SUN Forte compiler complains about this: // "optiongroup.cc", line 354: Error: Cannot assign Glib::ArrayHandle> to std::vector without @@ -375,14 +461,14 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() // cxx: Error: ../../glib/glibmm/containerhandle_shared.h, line 149: the operand // of a pointer dynamic_cast must be a pointer to a complete class type // return dynamic_cast(Glib::wrap_auto(cobj, false /* take_copy */)); - + //for(Glib::StringArrayHandle::iterator iter = array_handle.begin(); iter != array_handle.end(); ++iter) //{ // typed_cpp_arg->push_back(*iter); //} - + //So we do this: - + char** char_array_next = *typed_arg; while(char_array_next && *char_array_next) { @@ -390,19 +476,19 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() ++char_array_next; } } - + break; } case G_OPTION_ARG_FILENAME_ARRAY: { - char*** typed_arg = (char***)carg_; - vecustrings* typed_cpp_arg = (vecustrings*)cpparg_; + char*** typed_arg = static_cast(carg_); + vecustrings* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { typed_cpp_arg->clear(); - + //See comments above about the SUN Forte and Tru64 compilers. - + char** char_array_next = *typed_arg; while(char_array_next && *char_array_next) { @@ -410,20 +496,20 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() ++char_array_next; } } - + break; } case G_OPTION_ARG_NONE: /* Actually a boolean. */ { - *((bool*)cpparg_) = *((gboolean*)carg_); + *(static_cast(cpparg_)) = *(static_cast(carg_)); break; } default: { /* TODO: - G_OPTION_ARG_CALLBACK, - */ - break; + G_OPTION_ARG_CALLBACK, + */ + break; } } } @@ -433,7 +519,7 @@ GOptionGroup* OptionGroup::gobj_give_ownership() has_ownership_ = false; return gobj(); } - + } // namespace Glib diff --git a/libs/glibmm2/glib/glibmm/optiongroup.h b/libs/glibmm2/glib/glibmm/optiongroup.h index b3419ba13f..57340fefdf 100644 --- a/libs/glibmm2/glib/glibmm/optiongroup.h +++ b/libs/glibmm2/glib/glibmm/optiongroup.h @@ -4,7 +4,7 @@ #define _GLIBMM_OPTIONGROUP_H -/* $Id: optiongroup.hg,v 1.10 2005/01/10 17:42:17 murrayc Exp $ */ +/* $Id: optiongroup.hg,v 1.10.4.1 2006/03/30 12:19:58 murrayc Exp $ */ /* Copyright (C) 2004 The glibmm Development Team * @@ -72,20 +72,20 @@ public: virtual bool on_post_parse(OptionContext& context, OptionGroup& group); virtual void on_error(OptionContext& context, OptionGroup& group); - + void add_entry(const OptionEntry& entry); - + typedef std::vector vecustrings; typedef std::vector vecstrings; - + void add_entry(const OptionEntry& entry, bool& arg); void add_entry(const OptionEntry& entry, int& arg); void add_entry(const OptionEntry& entry, Glib::ustring& arg); void add_entry_filename(const OptionEntry& entry, std::string& arg); void add_entry(const OptionEntry& entry, vecustrings& arg); void add_entry_filename(const OptionEntry& entry, vecstrings& arg); - + /* TODO: void g_option_group_set_translate_func (GOptionGroup *group, GTranslateFunc func, @@ -100,36 +100,41 @@ void g_option_group_set_translate_func (GOptionGroup *group, * @param domain The domain to use. */ void set_translation_domain(const Glib::ustring& domain); - + GOptionGroup* gobj() { return gobject_; } const GOptionGroup* gobj() const { return gobject_; } GOptionGroup* gobj_give_ownership(); - + protected: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + /** This is not public API. It is an implementation detail. + */ class CppOptionEntry { public: CppOptionEntry(); - + void allocate_c_arg(); + void set_c_arg_default(void* cpp_arg); void convert_c_to_cpp(); void release_c_arg(); - + GOptionArg carg_type_; void* carg_; void* cpparg_; OptionEntry* entry_; }; - + void add_entry_with_wrapper(const OptionEntry& entry, GOptionArg arg_type, void* cpp_arg); - + //Map of entry names to CppOptionEntry: typedef std::map type_map_entries; type_map_entries map_entries_; - + GOptionGroup* gobject_; bool has_ownership_; //Whether the gobject_ belongs to this C++ instance. +#endif //DOXYGEN_SHOULD_SKIP_THIS }; diff --git a/libs/glibmm2/glib/glibmm/pattern.cc b/libs/glibmm2/glib/glibmm/pattern.cc index b512661d57..28168620bb 100644 --- a/libs/glibmm2/glib/glibmm/pattern.cc +++ b/libs/glibmm2/glib/glibmm/pattern.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: pattern.cc,v 1.1.1.1 2003/01/07 16:58:51 murrayc Exp $ */ +/* $Id: pattern.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* pattern.cc * diff --git a/libs/glibmm2/glib/glibmm/pattern.h b/libs/glibmm2/glib/glibmm/pattern.h index 9f595bd6d1..32d05feea0 100644 --- a/libs/glibmm2/glib/glibmm/pattern.h +++ b/libs/glibmm2/glib/glibmm/pattern.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_PATTERN_H #define _GLIBMM_PATTERN_H -/* $Id: pattern.h,v 1.1.1.1 2003/01/07 16:58:51 murrayc Exp $ */ +/* $Id: pattern.h 2 2003-01-07 16:59:16Z murrayc $ */ /* pattern.h * diff --git a/libs/glibmm2/glib/glibmm/private/Makefile b/libs/glibmm2/glib/glibmm/private/Makefile deleted file mode 100644 index e4541862bd..0000000000 --- a/libs/glibmm2/glib/glibmm/private/Makefile +++ /dev/null @@ -1,451 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# glib/glibmm/private/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = . -top_srcdir = ../../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = $(am__private_include_HEADERS_DIST) \ - $(srcdir)/../../src/Makefile_list_of_hg.am_fragment \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment -subdir = glib/glibmm/private -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__private_include_HEADERS_DIST = convert_p.h date_p.h fileutils_p.h \ - iochannel_p.h keyfile_p.h markup_p.h module_p.h \ - optioncontext_p.h optionentry_p.h optiongroup_p.h shell_p.h \ - spawn_p.h thread_p.h unicode_p.h interface_p.h object_p.h -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(private_includedir)" -private_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(private_include_HEADERS) -ETAGS = etags -CTAGS = ctags -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -files_posix_hg = -files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg -files_all_hg = $(files_general_hg) $(files_posix_hg) $(files_win32_hg) -files_hg = $(files_general_hg) $(files_posix_hg) -#files_hg = $(files_general_hg) $(files_win32_hg) -files_built_h = $(files_hg:.hg=_p.h) -files_built_all_h = $(files_all_hg:.hg=_p.h) -files_extra_h = interface_p.h object_p.h -files_extra_all_h = interface_p.h object_p.h -dist_sources = $(files_built_all_h) $(files_extra_all_h) -DISTFILES = $(DIST_COMMON) $(dist_sources) -private_includedir = $(includedir)/glibmm-2.4/glibmm/private -private_include_HEADERS = $(files_built_h) $(files_extra_h) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(srcdir)/../../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glib/glibmm/private/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu glib/glibmm/private/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-private_includeHEADERS: $(private_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(private_includedir)" || $(mkdir_p) "$(DESTDIR)$(private_includedir)" - @list='$(private_include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(private_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(private_includedir)/$$f'"; \ - $(private_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(private_includedir)/$$f"; \ - done - -uninstall-private_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(private_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(private_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(private_includedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../../build_shared $(distdir)/../../src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(private_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-private_includeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-private_includeHEADERS - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-private_includeHEADERS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am \ - uninstall-private_includeHEADERS - - -maintainer-clean-local: - (cd $(srcdir) && rm -f $(files_built_h)) -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/glib/glibmm/private/Makefile.in b/libs/glibmm2/glib/glibmm/private/Makefile.in index d747694b8c..cccb5742c1 100644 --- a/libs/glibmm2/glib/glibmm/private/Makefile.in +++ b/libs/glibmm2/glib/glibmm/private/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -42,8 +38,8 @@ DIST_COMMON = $(am__private_include_HEADERS_DIST) \ $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment subdir = glib/glibmm/private ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -59,8 +55,9 @@ SOURCES = DIST_SOURCES = am__private_include_HEADERS_DIST = convert_p.h date_p.h fileutils_p.h \ iochannel_p.h keyfile_p.h markup_p.h module_p.h \ - optioncontext_p.h optionentry_p.h optiongroup_p.h shell_p.h \ - spawn_p.h thread_p.h unicode_p.h interface_p.h object_p.h + optioncontext_p.h optionentry_p.h optiongroup_p.h regex_p.h \ + shell_p.h spawn_p.h thread_p.h unicode_p.h interface_p.h \ + object_p.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,8 +70,6 @@ HEADERS = $(private_include_HEADERS) ETAGS = etags CTAGS = ctags ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -112,12 +107,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -131,13 +126,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -147,27 +139,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -179,31 +162,42 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ files_posix_hg = files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg +files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg shell.hg spawn.hg thread.hg unicode.hg files_all_hg = $(files_general_hg) $(files_posix_hg) $(files_win32_hg) @OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) @OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) @@ -253,13 +247,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-private_includeHEADERS: $(private_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(private_includedir)" || $(mkdir_p) "$(DESTDIR)$(private_includedir)" + test -z "$(private_includedir)" || $(MKDIR_P) "$(DESTDIR)$(private_includedir)" @list='$(private_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -324,23 +314,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../../build_shared $(distdir)/../../src - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -356,7 +344,7 @@ check: check-am all-am: Makefile $(HEADERS) installdirs: for dir in "$(DESTDIR)$(private_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -388,8 +376,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-am @@ -403,12 +390,20 @@ info-am: install-data-am: install-private_includeHEADERS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -428,20 +423,23 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-private_includeHEADERS +uninstall-am: uninstall-private_includeHEADERS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-private_includeHEADERS \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-private_includeHEADERS install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am \ - uninstall-private_includeHEADERS + uninstall-am uninstall-private_includeHEADERS maintainer-clean-local: diff --git a/libs/glibmm2/glib/glibmm/private/regex_p.h b/libs/glibmm2/glib/glibmm/private/regex_p.h new file mode 100644 index 0000000000..7f85ec2d1b --- /dev/null +++ b/libs/glibmm2/glib/glibmm/private/regex_p.h @@ -0,0 +1,8 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GLIBMM_REGEX_P_H +#define _GLIBMM_REGEX_P_H + + +#endif /* _GLIBMM_REGEX_P_H */ + diff --git a/libs/glibmm2/glib/glibmm/property.cc b/libs/glibmm2/glib/glibmm/property.cc index 4504e88f03..955b3ad6e2 100644 --- a/libs/glibmm2/glib/glibmm/property.cc +++ b/libs/glibmm2/glib/glibmm/property.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: property.cc,v 1.3 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: property.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/property.h b/libs/glibmm2/glib/glibmm/property.h index cb99454313..16122cb9a1 100644 --- a/libs/glibmm2/glib/glibmm/property.h +++ b/libs/glibmm2/glib/glibmm/property.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_PROPERTY_H #define _GLIBMM_PROPERTY_H -/* $Id: property.h,v 1.6 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: property.h 291 2006-05-12 08:08:45Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/propertyproxy.cc b/libs/glibmm2/glib/glibmm/propertyproxy.cc index 9945780453..e9dad3c630 100644 --- a/libs/glibmm2/glib/glibmm/propertyproxy.cc +++ b/libs/glibmm2/glib/glibmm/propertyproxy.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: propertyproxy.cc,v 1.1.1.1 2003/01/07 16:58:51 murrayc Exp $ */ +/* $Id: propertyproxy.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* propertyproxy.cc * diff --git a/libs/glibmm2/glib/glibmm/propertyproxy.h b/libs/glibmm2/glib/glibmm/propertyproxy.h index ed1538b575..5f1aa18f4a 100644 --- a/libs/glibmm2/glib/glibmm/propertyproxy.h +++ b/libs/glibmm2/glib/glibmm/propertyproxy.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_PROPERTYPROXY_H #define _GLIBMM_PROPERTYPROXY_H -/* $Id: propertyproxy.h,v 1.5 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: propertyproxy.h 291 2006-05-12 08:08:45Z murrayc $ */ /* propertyproxy.h * diff --git a/libs/glibmm2/glib/glibmm/propertyproxy_base.cc b/libs/glibmm2/glib/glibmm/propertyproxy_base.cc index 39f30b2073..960cc0210e 100644 --- a/libs/glibmm2/glib/glibmm/propertyproxy_base.cc +++ b/libs/glibmm2/glib/glibmm/propertyproxy_base.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: propertyproxy_base.cc,v 1.7 2006/11/28 12:59:19 murrayc Exp $ */ +/* $Id: propertyproxy_base.cc 354 2006-11-28 12:59:19Z murrayc $ */ /* propertyproxy_base.h * diff --git a/libs/glibmm2/glib/glibmm/propertyproxy_base.h b/libs/glibmm2/glib/glibmm/propertyproxy_base.h index 3f45d0b977..4706b2f167 100644 --- a/libs/glibmm2/glib/glibmm/propertyproxy_base.h +++ b/libs/glibmm2/glib/glibmm/propertyproxy_base.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_PROPERTYPROXY_BASE_H #define _GLIBMM_PROPERTYPROXY_BASE_H -/* $Id: propertyproxy_base.h,v 1.7 2006/11/10 02:24:49 murrayc Exp $ */ +/* $Id: propertyproxy_base.h 337 2006-11-10 02:24:49Z murrayc $ */ /* propertyproxy_base.h * diff --git a/libs/glibmm2/glib/glibmm/quark.cc b/libs/glibmm2/glib/glibmm/quark.cc index 8e2a06cdfd..d674942f67 100644 --- a/libs/glibmm2/glib/glibmm/quark.cc +++ b/libs/glibmm2/glib/glibmm/quark.cc @@ -1,4 +1,4 @@ -/* $Id: quark.cc,v 1.1.1.1 2003/01/07 16:58:52 murrayc Exp $ */ +/* $Id: quark.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* quark.cc * diff --git a/libs/glibmm2/glib/glibmm/quark.h b/libs/glibmm2/glib/glibmm/quark.h index 53ac126bf0..c128ac77a6 100644 --- a/libs/glibmm2/glib/glibmm/quark.h +++ b/libs/glibmm2/glib/glibmm/quark.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_QUARK_H #define _GLIBMM_QUARK_H -/* $Id: quark.h,v 1.1.1.1 2003/01/07 16:58:52 murrayc Exp $ */ +/* $Id: quark.h 2 2003-01-07 16:59:16Z murrayc $ */ /* quark.h * diff --git a/libs/glibmm2/glib/glibmm/random.cc b/libs/glibmm2/glib/glibmm/random.cc index e159646bcd..c91981bc13 100644 --- a/libs/glibmm2/glib/glibmm/random.cc +++ b/libs/glibmm2/glib/glibmm/random.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: random.cc,v 1.1.1.1 2003/01/07 16:58:52 murrayc Exp $ */ +/* $Id: random.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* random.cc * diff --git a/libs/glibmm2/glib/glibmm/random.h b/libs/glibmm2/glib/glibmm/random.h index f5187e131a..711d23b28e 100644 --- a/libs/glibmm2/glib/glibmm/random.h +++ b/libs/glibmm2/glib/glibmm/random.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_RANDOM_H #define _GLIBMM_RANDOM_H -/* $Id: random.h,v 1.1.1.1 2003/01/07 16:58:52 murrayc Exp $ */ +/* $Id: random.h 2 2003-01-07 16:59:16Z murrayc $ */ /* random.h * diff --git a/libs/glibmm2/glib/glibmm/refptr.h b/libs/glibmm2/glib/glibmm/refptr.h index 4b246213af..a9e74ace8a 100644 --- a/libs/glibmm2/glib/glibmm/refptr.h +++ b/libs/glibmm2/glib/glibmm/refptr.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_REFPTR_H #define _GLIBMM_REFPTR_H -/* $Id: refptr.h,v 1.4 2005/04/07 08:28:46 murrayc Exp $ */ +/* $Id: refptr.h 216 2005-04-07 08:28:46Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/regex.cc b/libs/glibmm2/glib/glibmm/regex.cc new file mode 100644 index 0000000000..8cc257ec60 --- /dev/null +++ b/libs/glibmm2/glib/glibmm/regex.cc @@ -0,0 +1,451 @@ +// Generated by gtkmmproc -- DO NOT MODIFY! + + +#include +#include + +/* Copyright (C) 2007 The glibmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Glib +{ + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::RefPtr Regex::create(const Glib::ustring& pattern, + RegexCompileFlags compile_options, + RegexMatchFlags match_options) +#else +Glib::RefPtr Regex::create(const Glib::ustring& pattern, + RegexCompileFlags compile_options, + RegexMatchFlags match_options, + std::auto_ptr& error) +#endif /* GLIBMM_EXCEPTIONS_ENABLED */ +{ + GError* gerror = 0; + GRegex* regex = g_regex_new(pattern.c_str(), (GRegexCompileFlags)compile_options, + (GRegexMatchFlags)match_options, &gerror); + + if(gerror) +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::Error::throw_exception(gerror); +#else + error = Glib::Error::throw_exception(gerror); +#endif + return Glib::wrap(regex); +} + +// static +Glib::ustring Regex::escape_string(const Glib::ustring& string) +{ + const Glib::ScopedPtr buf (g_regex_escape_string(string.raw().c_str(), + string.raw().size())); + return Glib::ustring(buf.get()); +} + +bool Regex::match(const Glib::ustring& string, RegexMatchFlags match_options) +{ + return g_regex_match(gobj(), string.c_str(), (GRegexMatchFlags)(match_options), 0); +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_full(gobj(), string.c_str(), -1, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_full(gobj(), string.c_str(), string_len, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + +bool Regex::match_all(const Glib::ustring& string, RegexMatchFlags match_options) +{ + return g_regex_match_all(gobj(), string.c_str(), ((GRegexMatchFlags)(match_options)), 0); +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_all_full(gobj(), string.c_str(), -1, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_all_full(gobj(), string.c_str(), string_len, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options) +#else +Glib::ustring Regex::replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace(gobj(), string.c_str(), -1, start_position, replacement.c_str(), ((GRegexMatchFlags)(match_options)), &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options) +#else +Glib::ustring Regex::replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace_literal(gobj(), string.c_str(), -1, start_position, replacement.c_str(), ((GRegexMatchFlags)(match_options)), &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::StringArrayHandle Regex::split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens) const +#else +Glib::StringArrayHandle Regex::split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::StringArrayHandle retvalue = Glib::StringArrayHandle(g_regex_split_full(const_cast(gobj()), string.c_str(), -1, start_position, ((GRegexMatchFlags)(match_options)), max_tokens, &(gerror)), Glib::OWNERSHIP_DEEP); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +} // namespace Glib + +namespace +{ +} // anonymous namespace + + +Glib::RegexError::RegexError(Glib::RegexError::Code error_code, const Glib::ustring& error_message) +: + Glib::Error (G_REGEX_ERROR, error_code, error_message) +{} + +Glib::RegexError::RegexError(GError* gobject) +: + Glib::Error (gobject) +{} + +Glib::RegexError::Code Glib::RegexError::code() const +{ + return static_cast(Glib::Error::code()); +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +void Glib::RegexError::throw_func(GError* gobject) +{ + throw Glib::RegexError(gobject); +} +#else +//When not using exceptions, we just pass the Exception object around without throwing it: +std::auto_ptr Glib::RegexError::throw_func(GError* gobject) +{ + return std::auto_ptr(new Glib::RegexError(gobject)); +} +#endif //GLIBMM_EXCEPTIONS_ENABLED + + +/* Why reinterpret_cast(gobject) is needed: + * + * A Regex instance is in fact always a GRegex instance. + * Unfortunately, GRegex cannot be a member of Regex, + * because it is an opaque struct. Also, the C interface does not provide + * any hooks to install a destroy notification handler, thus we cannot + * wrap it dynamically either. + * + * The cast works because Regex does not have any member data, and + * it is impossible to derive from it. This is ensured by not implementing + * the (protected) default constructor. The ctor is protected rather than + * private just to avoid a compile warning. + */ + +namespace Glib +{ + +Glib::RefPtr wrap(GRegex* object, bool take_copy) +{ + if(take_copy && object) + g_regex_ref(object); + + // See the comment at the top of this file, if you want to know why the cast works. + return Glib::RefPtr(reinterpret_cast(object)); +} + +} // namespace Glib + + +namespace Glib +{ + + +void Regex::reference() const +{ + // See the comment at the top of this file, if you want to know why the cast works. + g_regex_ref(reinterpret_cast(const_cast(this))); +} + +void Regex::unreference() const +{ + // See the comment at the top of this file, if you want to know why the cast works. + g_regex_unref(reinterpret_cast(const_cast(this))); +} + +GRegex* Regex::gobj() +{ + // See the comment at the top of this file, if you want to know why the cast works. + return reinterpret_cast(this); +} + +const GRegex* Regex::gobj() const +{ + // See the comment at the top of this file, if you want to know why the cast works. + return reinterpret_cast(this); +} + +GRegex* Regex::gobj_copy() const +{ + // See the comment at the top of this file, if you want to know why the cast works. + GRegex *const gobject = reinterpret_cast(const_cast(this)); + g_regex_ref(gobject); + return gobject; +} + + +Glib::ustring Regex::get_pattern() const +{ + return Glib::convert_const_gchar_ptr_to_ustring(g_regex_get_pattern(const_cast(gobj()))); +} + +int Regex::get_max_backref() const +{ + return g_regex_get_max_backref(const_cast(gobj())); +} + +int Regex::get_capture_count() const +{ + return g_regex_get_capture_count(const_cast(gobj())); +} + +int Regex::get_string_number(const Glib::ustring& name) const +{ + return g_regex_get_string_number(const_cast(gobj()), name.c_str()); +} + +bool Regex::match_simple(const Glib::ustring& pattern, const Glib::ustring& string, RegexCompileFlags compile_options, RegexMatchFlags match_options) +{ + return g_regex_match_simple(pattern.c_str(), string.c_str(), ((GRegexCompileFlags)(compile_options)), ((GRegexMatchFlags)(match_options))); +} + + +Glib::StringArrayHandle Regex::split_simple(const Glib::ustring& pattern, const Glib::ustring& string, RegexCompileFlags compile_options, RegexMatchFlags match_options) +{ + return Glib::StringArrayHandle(g_regex_split_simple(pattern.c_str(), string.c_str(), ((GRegexCompileFlags)(compile_options)), ((GRegexMatchFlags)(match_options))), Glib::OWNERSHIP_DEEP); +} + + +Glib::StringArrayHandle Regex::split(const Glib::ustring& string, RegexMatchFlags match_options) +{ + return Glib::StringArrayHandle(g_regex_split(gobj(), string.c_str(), ((GRegexMatchFlags)(match_options))), Glib::OWNERSHIP_DEEP); +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::StringArrayHandle Regex::split(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options, int max_tokens) const +#else +Glib::StringArrayHandle Regex::split(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options, int max_tokens, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::StringArrayHandle retvalue = Glib::StringArrayHandle(g_regex_split_full(const_cast(gobj()), string, string_len, start_position, ((GRegexMatchFlags)(match_options)), max_tokens, &(gerror)), Glib::OWNERSHIP_DEEP); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace(const gchar* string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options) +#else +Glib::ustring Regex::replace(const gchar* string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace(gobj(), string, string_len, start_position, replacement.c_str(), ((GRegexMatchFlags)(match_options)), &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace_literal(const gchar * string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options) +#else +Glib::ustring Regex::replace_literal(const gchar * string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace_literal(gobj(), string, string_len, start_position, replacement.c_str(), ((GRegexMatchFlags)(match_options)), &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace_eval(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, GRegexEvalCallback eval, gpointer user_data) +#else +Glib::ustring Regex::replace_eval(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, GRegexEvalCallback eval, gpointer user_data, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace_eval(gobj(), string.c_str(), string_len, start_position, ((GRegexMatchFlags)(match_options)), eval, user_data, &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::check_replacement(const Glib::ustring& replacement, gboolean* has_references) +#else +bool Regex::check_replacement(const Glib::ustring& replacement, gboolean* has_references, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_check_replacement(replacement.c_str(), has_references, &(gerror)); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + +} // namespace Glib + + diff --git a/libs/glibmm2/glib/glibmm/regex.h b/libs/glibmm2/glib/glibmm/regex.h new file mode 100644 index 0000000000..a9f6276e81 --- /dev/null +++ b/libs/glibmm2/glib/glibmm/regex.h @@ -0,0 +1,676 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GLIBMM_REGEX_H +#define _GLIBMM_REGEX_H + + +/* Copyright (C) 2007 The glibmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +#include +#include +#include +#include +#include + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +typedef struct _GRegex GRegex; +#endif + +namespace Glib +{ + +/** @addtogroup glibmmEnums Enums and Flags */ + +/** + * @ingroup glibmmEnums + * @par Bitwise operators: + * %RegexCompileFlags operator|(RegexCompileFlags, RegexCompileFlags)
+ * %RegexCompileFlags operator&(RegexCompileFlags, RegexCompileFlags)
+ * %RegexCompileFlags operator^(RegexCompileFlags, RegexCompileFlags)
+ * %RegexCompileFlags operator~(RegexCompileFlags)
+ * %RegexCompileFlags& operator|=(RegexCompileFlags&, RegexCompileFlags)
+ * %RegexCompileFlags& operator&=(RegexCompileFlags&, RegexCompileFlags)
+ * %RegexCompileFlags& operator^=(RegexCompileFlags&, RegexCompileFlags)
+ */ +enum RegexCompileFlags +{ + REGEX_CASELESS = 1 << 0, + REGEX_MULTILINE = 1 << 1, + REGEX_DOTALL = 1 << 2, + REGEX_EXTENDED = 1 << 3, + REGEX_ANCHORED = 1 << 4, + REGEX_DOLLAR_ENDONLY = 1 << 5, + REGEX_UNGREEDY = 1 << 9, + REGEX_RAW = 1 << 11, + REGEX_NO_AUTO_CAPTURE = 1 << 12, + REGEX_OPTIMIZE = 1 << 13, + REGEX_DUPNAMES = 1 << 19, + REGEX_NEWLINE_CR = 1 << 20, + REGEX_NEWLINE_LF = 1 << 21, + REGEX_NEWLINE_CRLF = 0x100000 +}; + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags operator|(RegexCompileFlags lhs, RegexCompileFlags rhs) + { return static_cast(static_cast(lhs) | static_cast(rhs)); } + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags operator&(RegexCompileFlags lhs, RegexCompileFlags rhs) + { return static_cast(static_cast(lhs) & static_cast(rhs)); } + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags operator^(RegexCompileFlags lhs, RegexCompileFlags rhs) + { return static_cast(static_cast(lhs) ^ static_cast(rhs)); } + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags operator~(RegexCompileFlags flags) + { return static_cast(~static_cast(flags)); } + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags& operator|=(RegexCompileFlags& lhs, RegexCompileFlags rhs) + { return (lhs = static_cast(static_cast(lhs) | static_cast(rhs))); } + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags& operator&=(RegexCompileFlags& lhs, RegexCompileFlags rhs) + { return (lhs = static_cast(static_cast(lhs) & static_cast(rhs))); } + +/** @ingroup glibmmEnums */ +inline RegexCompileFlags& operator^=(RegexCompileFlags& lhs, RegexCompileFlags rhs) + { return (lhs = static_cast(static_cast(lhs) ^ static_cast(rhs))); } + + +/** + * @ingroup glibmmEnums + * @par Bitwise operators: + * %RegexMatchFlags operator|(RegexMatchFlags, RegexMatchFlags)
+ * %RegexMatchFlags operator&(RegexMatchFlags, RegexMatchFlags)
+ * %RegexMatchFlags operator^(RegexMatchFlags, RegexMatchFlags)
+ * %RegexMatchFlags operator~(RegexMatchFlags)
+ * %RegexMatchFlags& operator|=(RegexMatchFlags&, RegexMatchFlags)
+ * %RegexMatchFlags& operator&=(RegexMatchFlags&, RegexMatchFlags)
+ * %RegexMatchFlags& operator^=(RegexMatchFlags&, RegexMatchFlags)
+ */ +enum RegexMatchFlags +{ + REGEX_MATCH_ANCHORED = 1 << 4, + REGEX_MATCH_NOTBOL = 1 << 7, + REGEX_MATCH_NOTEOL = 1 << 8, + REGEX_MATCH_NOTEMPTY = 1 << 10, + REGEX_MATCH_PARTIAL = 1 << 15, + REGEX_MATCH_NEWLINE_CR = 1 << 20, + REGEX_MATCH_NEWLINE_LF = 1 << 21, + REGEX_MATCH_NEWLINE_CRLF = 0x100000, + REGEX_MATCH_NEWLINE_ANY = 1 << 22 +}; + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags operator|(RegexMatchFlags lhs, RegexMatchFlags rhs) + { return static_cast(static_cast(lhs) | static_cast(rhs)); } + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags operator&(RegexMatchFlags lhs, RegexMatchFlags rhs) + { return static_cast(static_cast(lhs) & static_cast(rhs)); } + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags operator^(RegexMatchFlags lhs, RegexMatchFlags rhs) + { return static_cast(static_cast(lhs) ^ static_cast(rhs)); } + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags operator~(RegexMatchFlags flags) + { return static_cast(~static_cast(flags)); } + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags& operator|=(RegexMatchFlags& lhs, RegexMatchFlags rhs) + { return (lhs = static_cast(static_cast(lhs) | static_cast(rhs))); } + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags& operator&=(RegexMatchFlags& lhs, RegexMatchFlags rhs) + { return (lhs = static_cast(static_cast(lhs) & static_cast(rhs))); } + +/** @ingroup glibmmEnums */ +inline RegexMatchFlags& operator^=(RegexMatchFlags& lhs, RegexMatchFlags rhs) + { return (lhs = static_cast(static_cast(lhs) ^ static_cast(rhs))); } + + +/** Exception class for Regex + */ +class RegexError : public Glib::Error +{ +public: + enum Code + { + COMPILE, + OPTIMIZE, + REPLACE, + MATCH + }; + + RegexError(Code error_code, const Glib::ustring& error_message); + explicit RegexError(GError* gobject); + Code code() const; + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +private: + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + static void throw_func(GError* gobject); +#else + //When not using exceptions, we just pass the Exception object around without throwing it: + static std::auto_ptr throw_func(GError* gobject); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + friend void wrap_init(); // uses throw_func() +#endif +}; + + +/** Perl-compatible regular expressions - matches strings against regular expressions. + * + * The Glib::Regex functions implement regular expression pattern matching using + * syntax and semantics similar to Perl regular expression. + * + * Some functions accept a start_position argument, setting it differs from just + * passing over a shortened string and setting REGEX_MATCH_NOTBOL in the case + * of a pattern that begins with any kind of lookbehind assertion. For example, + * consider the pattern "\Biss\B" which finds occurrences of "iss" in the middle + * of words. ("\B" matches only if the current position in the subject is not a + * word boundary.) When applied to the string "Mississipi" from the fourth byte, + * namely "issipi", it does not match, because "\B" is always false at the + * start of the subject, which is deemed to be a word boundary. However, if + * the entire string is passed , but with start_position set to 4, it finds the + * second occurrence of "iss" because it is able to look behind the starting point + * to discover that it is preceded by a letter. + * + * Note that, unless you set the REGEX_RAW flag, all the strings passed to these + * functions must be encoded in UTF-8. The lengths and the positions inside the + * strings are in bytes and not in characters, so, for instance, + * "\xc3\xa0" (i.e. "à") is two bytes long but it is treated as a single + * character. If you set REGEX_RAW the strings can be non-valid UTF-8 strings + * and a byte is treated as a character, so "\xc3\xa0" is two bytes and + * two characters long. + * + * When matching a pattern, "\n" matches only against a "\n" character in the + * string, and "\r" matches only a "\r" character. To match any newline sequence + * use "\R". This particular group matches either the two-character sequence + * CR + LF ("\r\n"), or one of the single characters LF (linefeed, U+000A, "\n"), + * VT (vertical tab, U+000B, "\v"), FF (formfeed, U+000C, "\f"), CR (carriage + * return, U+000D, "\r"), NEL (next line, U+0085), LS (line separator, U+2028), + * or PS (paragraph separator, U+2029). + * + * The behaviour of the dot, circumflex, and dollar metacharacters are affected + * by newline characters, the default is to recognize any newline character (the + * same characters recognized by "\R"). This can be changed with REGEX_NEWLINE_CR, + * REGEX_NEWLINE_LF and REGEX_NEWLINE_CRLF compile options, and with + * REGEX_MATCH_NEWLINE_ANY, REGEX_MATCH_NEWLINE_CR, REGEX_MATCH_NEWLINE_LF + * and REGEX_MATCH_NEWLINE_CRLF match options. These settings are also + * relevant when compiling a pattern if REGEX_EXTENDED is set, and an unescaped + * "#" outside a character class is encountered. This indicates a comment that + * lasts until after the next newline. + * + * Creating and manipulating the same Glib::Regex class from different threads is + * not a problem as Glib::Regex does not modify its internal state between creation and + * destruction, on the other hand Glib::MatchInfo is not threadsafe. + * + * The regular expressions low level functionalities are obtained through the + * excellent PCRE library written by Philip Hazel. + * + * @newin2p14 + */ +class Regex +{ + public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + typedef Regex CppObjectType; + typedef GRegex BaseObjectType; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + + // For use with Glib::RefPtr<> only. + void reference() const; + void unreference() const; + + ///Provides access to the underlying C instance. + GRegex* gobj(); + + ///Provides access to the underlying C instance. + const GRegex* gobj() const; + + ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. + GRegex* gobj_copy() const; + +protected: + // Do not derive this. Glib::Regex can neither be constructed nor deleted. + Regex(); + void operator delete(void*, size_t); + +private: + // noncopyable + Regex(const Regex&); + Regex& operator=(const Regex&); + + +public: + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + static Glib::RefPtr create(const Glib::ustring& pattern, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0)); +#else + static Glib::RefPtr create(const Glib::ustring& pattern, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0), std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + + /** Gets the pattern string associated with @a regex , i.e.\ a copy of + * the string passed to g_regex_new(). + * @return The pattern of @a regex + * + * @newin2p14. + */ + Glib::ustring get_pattern() const; + + /** Returns: the number of the highest back reference + * @return The number of the highest back reference + * + * @newin2p14. + */ + int get_max_backref() const; + + /** Returns: the number of capturing subpatterns + * @return The number of capturing subpatterns + * + * @newin2p14. + */ + int get_capture_count() const; + + /** Retrieves the number of the subexpression named @a name . + * @param name Name of the subexpression. + * @return The number of the subexpression or -1 if @a name + * does not exists + * + * @newin2p14. + */ + int get_string_number(const Glib::ustring& name) const; + + static Glib::ustring escape_string(const Glib::ustring& string); + + + /** Scans for a match in @a string for @a pattern . + * + * This function is equivalent to g_regex_match() but it does not + * require to compile the pattern with g_regex_new(), avoiding some + * lines of code when you need just to do a match without extracting + * substrings, capture counts, and so on. + * + * If this function is to be called on the same @a pattern more than + * once, it's more efficient to compile the pattern once with + * g_regex_new() and then use g_regex_match(). + * @param pattern The regular expression. + * @param string The string to scan for matches. + * @param compile_options Compile options for the regular expression. + * @param match_options Match options. + * @return true is the string matched, false otherwise + * + * @newin2p14. + */ + static bool match_simple(const Glib::ustring& pattern, const Glib::ustring& string, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0)); + + //TODO: _WRAP_METHOD(bool match(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo **match_info = 0), g_regex_match) + bool match(const Glib::ustring& string, RegexMatchFlags match_options = static_cast(0)); + + //TODO: Wrap GMatchInfo as an iterator: + //_WRAP_METHOD(bool match_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_full, errthrow) + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options); +#else + bool match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options); +#else + bool match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + //TODO: _WRAP_METHOD(bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo ** match_info = 0), g_regex_match_all) + bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = static_cast(0)); + + //TODO: _WRAP_METHOD(bool match_all_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_all_full, errthrow) + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options); +#else + bool match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options); +#else + bool match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + + /** Breaks the string on the pattern, and returns an array of + * the tokens. If the pattern contains capturing parentheses, + * then the text for each of the substrings will also be returned. + * If the pattern does not match anywhere in the string, then the + * whole string is returned as the first token. + * + * This function is equivalent to g_regex_split() but it does + * not require to compile the pattern with g_regex_new(), avoiding + * some lines of code when you need just to do a split without + * extracting substrings, capture counts, and so on. + * + * If this function is to be called on the same @a pattern more than + * once, it's more efficient to compile the pattern once with + * g_regex_new() and then use g_regex_split(). + * + * As a special case, the result of splitting the empty string "" + * is an empty vector, not a vector containing a single string. + * The reason for this special case is that being able to represent + * a empty vector is typically more useful than consistent handling + * of empty elements. If you do need to represent empty elements, + * you'll need to check for the empty string before calling this + * function. + * + * A pattern that can match empty strings splits @a string into + * separate characters wherever it matches the empty string between + * characters. For example splitting "ab c" using as a separator + * "\s*", you will get "a", "b" and "c". + * @param pattern The regular expression. + * @param string The string to scan for matches. + * @param compile_options Compile options for the regular expression. + * @param match_options Match options. + * @return A 0-terminated gchar ** array. Free it using g_strfreev() + * + * @newin2p14. + */ + static Glib::StringArrayHandle split_simple(const Glib::ustring& pattern, const Glib::ustring& string, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0)); + + /** Breaks the string on the pattern, and returns an array of the tokens. + * If the pattern contains capturing parentheses, then the text for each + * of the substrings will also be returned. If the pattern does not match + * anywhere in the string, then the whole string is returned as the first + * token. + * + * As a special case, the result of splitting the empty string "" is an + * empty vector, not a vector containing a single string. The reason for + * this special case is that being able to represent a empty vector is + * typically more useful than consistent handling of empty elements. If + * you do need to represent empty elements, you'll need to check for the + * empty string before calling this function. + * + * A pattern that can match empty strings splits @a string into separate + * characters wherever it matches the empty string between characters. + * For example splitting "ab c" using as a separator "\s*", you will get + * "a", "b" and "c". + * @param string The string to split with the pattern. + * @param match_options Match time option flags. + * @return A 0-terminated gchar ** array. Free it using g_strfreev() + * + * @newin2p14. + */ + Glib::StringArrayHandle split(const Glib::ustring& string, RegexMatchFlags match_options = static_cast(0)); + + + /** Breaks the string on the pattern, and returns an array of the tokens. + * If the pattern contains capturing parentheses, then the text for each + * of the substrings will also be returned. If the pattern does not match + * anywhere in the string, then the whole string is returned as the first + * token. + * + * As a special case, the result of splitting the empty string "" is an + * empty vector, not a vector containing a single string. The reason for + * this special case is that being able to represent a empty vector is + * typically more useful than consistent handling of empty elements. If + * you do need to represent empty elements, you'll need to check for the + * empty string before calling this function. + * + * A pattern that can match empty strings splits @a string into separate + * characters wherever it matches the empty string between characters. + * For example splitting "ab c" using as a separator "\s*", you will get + * "a", "b" and "c". + * + * Setting @a start_position differs from just passing over a shortened + * string and setting G::REGEX_MATCH_NOTBOL in the case of a pattern + * that begins with any kind of lookbehind assertion, such as "\b". + * @param string The string to split with the pattern. + * @param string_len The length of @a string , or -1 if @a string is nul-terminated. + * @param start_position Starting index of the string to match. + * @param match_options Match time option flags. + * @param max_tokens The maximum number of tokens to split @a string into. + * If this is less than 1, the string is split completely. + * @param error Return location for a G::Error. + * @return A 0-terminated gchar ** array. Free it using g_strfreev() + * + * @newin2p14. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::StringArrayHandle split(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = static_cast(0), int max_tokens = 0) const; +#else + Glib::StringArrayHandle split(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options, int max_tokens, std::auto_ptr& error) const; +#endif //GLIBMM_EXCEPTIONS_ENABLED + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::StringArrayHandle split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens) const; +#else + Glib::StringArrayHandle split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens, std::auto_ptr& error) const; +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + + /** Replaces all occurances of the pattern in @a regex with the + * replacement text. Backreferences of the form '\number' or + * '\g<number>' in the replacement text are interpolated by the + * number-th captured subexpression of the match, '\g<name>' refers + * to the captured subexpression with the given name. '\0' refers to the + * complete match, but '\0' followed by a number is the octal representation + * of a character. To include a literal '\' in the replacement, write '\\'. + * There are also escapes that changes the case of the following text: + * + * <variablelist> + * <varlistentry><term>\l</term> + * <listitem> + * Convert to lower case the next character + * </listitem> + * </varlistentry> + * <varlistentry><term>\u</term> + * <listitem> + * Convert to upper case the next character + * </listitem> + * </varlistentry> + * <varlistentry><term>\L</term> + * <listitem> + * Convert to lower case till \E + * </listitem> + * </varlistentry> + * <varlistentry><term>\U</term> + * <listitem> + * Convert to upper case till \E + * </listitem> + * </varlistentry> + * <varlistentry><term>\E</term> + * <listitem> + * End case modification + * </listitem> + * </varlistentry> + * </variablelist> + * + * If you do not need to use backreferences use g_regex_replace_literal(). + * + * The @a replacement string must be UTF-8 encoded even if G::REGEX_RAW was + * passed to g_regex_new(). If you want to use not UTF-8 encoded stings + * you can use g_regex_replace_literal(). + * + * Setting @a start_position differs from just passing over a shortened + * string and setting G::REGEX_MATCH_NOTBOL in the case of a pattern that + * begins with any kind of lookbehind assertion, such as "\b". + * @param string The string to perform matches against. + * @param string_len The length of @a string , or -1 if @a string is nul-terminated. + * @param start_position Starting index of the string to match. + * @param replacement Text to replace each match with. + * @param match_options Options for the match. + * @param error Location to store the error occuring, or 0 to ignore errors. + * @return A newly allocated string containing the replacements + * + * @newin2p14. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace(const gchar* string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options = static_cast(0)); +#else + Glib::ustring replace(const gchar* string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error); +#endif //GLIBMM_EXCEPTIONS_ENABLED + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options); +#else + Glib::ustring replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + + /** Replaces all occurances of the pattern in @a regex with the + * replacement text. @a replacement is replaced literally, to + * include backreferences use g_regex_replace(). + * + * Setting @a start_position differs from just passing over a + * shortened string and setting G::REGEX_MATCH_NOTBOL in the + * case of a pattern that begins with any kind of lookbehind + * assertion, such as "\b". + * @param string The string to perform matches against. + * @param string_len The length of @a string , or -1 if @a string is nul-terminated. + * @param start_position Starting index of the string to match. + * @param replacement Text to replace each match with. + * @param match_options Options for the match. + * @param error Location to store the error occuring, or 0 to ignore errors. + * @return A newly allocated string containing the replacements + * + * @newin2p14. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace_literal(const gchar *string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options = static_cast(0)); +#else + Glib::ustring replace_literal(const gchar * string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error); +#endif //GLIBMM_EXCEPTIONS_ENABLED + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options); +#else + Glib::ustring replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + + /** Replaces occurances of the pattern in regex with the output of + * @a eval for that occurance. + * + * Setting @a start_position differs from just passing over a shortened + * string and setting G::REGEX_MATCH_NOTBOL in the case of a pattern + * that begins with any kind of lookbehind assertion, such as "\b". + * @param string String to perform matches against. + * @param string_len The length of @a string , or -1 if @a string is nul-terminated. + * @param start_position Starting index of the string to match. + * @param match_options Options for the match. + * @param eval A function to call for each match. + * @param user_data User data to pass to the function. + * @param error Location to store the error occuring, or 0 to ignore errors. + * @return A newly allocated string containing the replacements + * + * @newin2p14. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace_eval(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, GRegexEvalCallback eval, gpointer user_data); +#else + Glib::ustring replace_eval(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, GRegexEvalCallback eval, gpointer user_data, std::auto_ptr& error); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** Checks whether @a replacement is a valid replacement string + * (see g_regex_replace()), i.e.\ that all escape sequences in + * it are valid. + * + * If @a has_references is not 0 then @a replacement is checked + * for pattern references. For instance, replacement text 'foo\\n' + * does not contain references and may be evaluated without information + * about actual match, but '\0\1' (whole match followed by first + * subpattern) requires valid G::MatchInfo object. + * @param replacement The replacement string. + * @param has_references Location to store information about + * references in @a replacement or 0. + * @param error Location to store error. + * @return Whether @a replacement is a valid replacement string + * + * @newin2p14. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + static bool check_replacement(const Glib::ustring& replacement, gboolean* has_references); +#else + static bool check_replacement(const Glib::ustring& replacement, gboolean* has_references, std::auto_ptr& error); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + +/* Match info */ +/* +GRegex *g_match_info_get_regex (const GMatchInfo *match_info); +const gchar *g_match_info_get_string (const GMatchInfo *match_info); + +void g_match_info_free (GMatchInfo *match_info); + _WRAP_METHOD(bool g_match_info_next (GMatchInfo *match_info, + GError **error); + _WRAP_METHOD(bool g_match_info_matches (const GMatchInfo *match_info); + _WRAP_METHOD(int g_match_info_get_match_count (const GMatchInfo *match_info); + _WRAP_METHOD(bool g_match_info_is_partial_match (const GMatchInfo *match_info); +Glib::ustring g_match_info_expand_references(const GMatchInfo *match_info, + Glib::ustring& string_to_expand, + GError **error); +Glib::ustring g_match_info_fetch (const GMatchInfo *match_info, + int match_num); + _WRAP_METHOD(bool g_match_info_fetch_pos (const GMatchInfo *match_info, + int match_num, + int *start_pos, + int *end_pos); +Glib::ustring g_match_info_fetch_named (const GMatchInfo *match_info, + Glib::ustring& name); + _WRAP_METHOD(bool g_match_info_fetch_named_pos (const GMatchInfo *match_info, + Glib::ustring& name, + int *start_pos, + int *end_pos); +gchar **g_match_info_fetch_all (const GMatchInfo *match_info); +*/ + + +}; + +} // namespace Glib + + +namespace Glib +{ + + /** A Glib::wrap() method for this object. + * + * @param object The C instance. + * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. + * @result A C++ instance that wraps this C instance. + * + * @relates Glib::Regex + */ + Glib::RefPtr wrap(GRegex* object, bool take_copy = false); + +} // namespace Glib + + +#endif /* _GLIBMM_REGEX_H */ + diff --git a/libs/glibmm2/glib/glibmm/sarray.h b/libs/glibmm2/glib/glibmm/sarray.h index b6f24d3a4f..c9720b5028 100644 --- a/libs/glibmm2/glib/glibmm/sarray.h +++ b/libs/glibmm2/glib/glibmm/sarray.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_SARRAY_H #define _GLIBMM_SARRAY_H -/* $Id: sarray.h,v 1.1.1.1 2003/01/07 16:58:53 murrayc Exp $ */ +/* $Id: sarray.h 2 2003-01-07 16:59:16Z murrayc $ */ /* array.h * diff --git a/libs/glibmm2/glib/glibmm/shell.cc b/libs/glibmm2/glib/glibmm/shell.cc index 52c6a47451..e20304aa0b 100644 --- a/libs/glibmm2/glib/glibmm/shell.cc +++ b/libs/glibmm2/glib/glibmm/shell.cc @@ -5,7 +5,7 @@ #include // -*- c++ -*- -/* $Id: shell.ccg,v 1.1.1.1 2003/01/07 16:58:38 murrayc Exp $ */ +/* $Id: shell.ccg,v 1.1 2003/01/07 16:58:38 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/signalproxy.cc b/libs/glibmm2/glib/glibmm/signalproxy.cc index 1f95436fb0..49e35c550e 100644 --- a/libs/glibmm2/glib/glibmm/signalproxy.cc +++ b/libs/glibmm2/glib/glibmm/signalproxy.cc @@ -1,6 +1,6 @@ // -*- c++ -*- -/* $Id: signalproxy.cc,v 1.3 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: signalproxy.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* signalproxy.cc * diff --git a/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.cc b/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.cc index 19604d92c0..9311fad3b9 100644 --- a/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.cc +++ b/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.cc @@ -1,6 +1,6 @@ // -*- c++ -*- -/* $Id: signalproxy_connectionnode.cc,v 1.6 2004/10/07 16:02:01 philipl Exp $ */ +/* $Id: signalproxy_connectionnode.cc 137 2004-10-07 16:02:01Z philipl $ */ /* signalproxy_connectionnode.cc * diff --git a/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.h b/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.h index ea55824e78..7d0faa3ca2 100644 --- a/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.h +++ b/libs/glibmm2/glib/glibmm/signalproxy_connectionnode.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_SIGNALPROXY_CONNECTIONNODE_H #define _GLIBMM_SIGNALPROXY_CONNECTIONNODE_H -/* $Id: signalproxy_connectionnode.h,v 1.6 2004/12/18 23:52:44 murrayc Exp $ */ +/* $Id: signalproxy_connectionnode.h 446 2007-09-26 15:10:44Z murrayc $ */ /* signalproxy_connectionnode.h * @@ -24,13 +24,18 @@ */ #include -#include +#include +#ifndef DOXYGEN_SHOULD_SKIP_THIS typedef struct _GObject GObject; +typedef struct _GClosure GClosure; +#endif //DOXYGEN_SHOULD_SKIP_THIS namespace Glib { +#ifndef DOXYGEN_SHOULD_SKIP_THIS + /** SignalProxyConnectionNode is a connection node for use with SignalProxy. * It lives between the layer of Gtk+ and libsigc++. * It is very much an internal class. @@ -63,6 +68,8 @@ protected: GObject* object_; }; +#endif //DOXYGEN_SHOULD_SKIP_THIS + } /* namespace Glib */ diff --git a/libs/glibmm2/glib/glibmm/slisthandle.h b/libs/glibmm2/glib/glibmm/slisthandle.h index 6e3f1671d1..0806e7be21 100644 --- a/libs/glibmm2/glib/glibmm/slisthandle.h +++ b/libs/glibmm2/glib/glibmm/slisthandle.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_SLISTHANDLE_H #define _GLIBMM_SLISTHANDLE_H -/* $Id: slisthandle.h,v 1.3 2003/04/21 17:39:41 murrayc Exp $ */ +/* $Id: slisthandle.h 32 2003-04-21 17:39:41Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/streamiochannel.cc b/libs/glibmm2/glib/glibmm/streamiochannel.cc index f87b9ae83b..db7f45aabc 100644 --- a/libs/glibmm2/glib/glibmm/streamiochannel.cc +++ b/libs/glibmm2/glib/glibmm/streamiochannel.cc @@ -1,4 +1,4 @@ -/* $Id: streamiochannel.cc,v 1.3 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: streamiochannel.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/streamiochannel.h b/libs/glibmm2/glib/glibmm/streamiochannel.h index f1c807eb6b..65c6972598 100644 --- a/libs/glibmm2/glib/glibmm/streamiochannel.h +++ b/libs/glibmm2/glib/glibmm/streamiochannel.h @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: streamiochannel.h,v 1.2 2003/01/22 12:08:52 murrayc Exp $ */ +/* $Id: streamiochannel.h 17 2003-01-22 12:09:02Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/stringutils.cc b/libs/glibmm2/glib/glibmm/stringutils.cc index df47a993c8..6cf0137b54 100644 --- a/libs/glibmm2/glib/glibmm/stringutils.cc +++ b/libs/glibmm2/glib/glibmm/stringutils.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: stringutils.cc,v 1.3 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: stringutils.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/stringutils.h b/libs/glibmm2/glib/glibmm/stringutils.h index 2e1fd52832..aa32e755e3 100644 --- a/libs/glibmm2/glib/glibmm/stringutils.h +++ b/libs/glibmm2/glib/glibmm/stringutils.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_STRINGUTILS_H #define _GLIBMM_STRINGUTILS_H -/* $Id: stringutils.h,v 1.2 2004/06/07 17:26:39 daniel Exp $ */ +/* $Id: stringutils.h 116 2004-06-07 17:26:39Z daniel $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/thread.h b/libs/glibmm2/glib/glibmm/thread.h index fed779fc47..456d16850d 100644 --- a/libs/glibmm2/glib/glibmm/thread.h +++ b/libs/glibmm2/glib/glibmm/thread.h @@ -70,14 +70,16 @@ enum { THREAD_PRIORITY_NORMAL = GLIBMM_MACRO_DEFINITION_THREAD_PRIORITY_NORMAL } namespace Glib { -/** @addtogroup glibmmEnums Enums and Flags */ - /** Specifies the priority of a thread. * @note It is not guaranteed, that threads with different priorities really * behave accordingly. On some systems (e.g. Linux) only root can * increase priorities. On other systems (e.g. Solaris) there doesn't seem to * be different scheduling for different priorities. All in all try to avoid * being dependent on priorities. + */ +/** @addtogroup glibmmEnums Enums and Flags */ + +/** * @ingroup glibmmEnums */ enum ThreadPriority diff --git a/libs/glibmm2/glib/glibmm/threadpool.cc b/libs/glibmm2/glib/glibmm/threadpool.cc index 459d975cbb..f6ccfe055b 100644 --- a/libs/glibmm2/glib/glibmm/threadpool.cc +++ b/libs/glibmm2/glib/glibmm/threadpool.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: threadpool.cc,v 1.6 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: threadpool.cc 291 2006-05-12 08:08:45Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/threadpool.h b/libs/glibmm2/glib/glibmm/threadpool.h index e332fa2b81..10a1209566 100644 --- a/libs/glibmm2/glib/glibmm/threadpool.h +++ b/libs/glibmm2/glib/glibmm/threadpool.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_THREADPOOL_H #define _GLIBMM_THREADPOOL_H -/* $Id: threadpool.h,v 1.2 2004/02/10 14:26:04 murrayc Exp $ */ +/* $Id: threadpool.h 72 2004-02-10 14:26:07Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/timer.cc b/libs/glibmm2/glib/glibmm/timer.cc index df7985d97e..754431bf85 100644 --- a/libs/glibmm2/glib/glibmm/timer.cc +++ b/libs/glibmm2/glib/glibmm/timer.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: timer.cc,v 1.1.1.1 2003/01/07 16:58:56 murrayc Exp $ */ +/* $Id: timer.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* timer.cc * diff --git a/libs/glibmm2/glib/glibmm/timer.h b/libs/glibmm2/glib/glibmm/timer.h index 54bd8bd8f2..b80f9ef8b7 100644 --- a/libs/glibmm2/glib/glibmm/timer.h +++ b/libs/glibmm2/glib/glibmm/timer.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_TIMER_H #define _GLIBMM_TIMER_H -/* $Id: timer.h,v 1.1.1.1 2003/01/07 16:58:56 murrayc Exp $ */ +/* $Id: timer.h 2 2003-01-07 16:59:16Z murrayc $ */ /* timer.h * diff --git a/libs/glibmm2/glib/glibmm/timeval.cc b/libs/glibmm2/glib/glibmm/timeval.cc index 835af84fa5..61882138f1 100644 --- a/libs/glibmm2/glib/glibmm/timeval.cc +++ b/libs/glibmm2/glib/glibmm/timeval.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: timeval.cc,v 1.1.1.1 2003/01/07 16:58:56 murrayc Exp $ */ +/* $Id: timeval.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* timeval.cc * diff --git a/libs/glibmm2/glib/glibmm/timeval.h b/libs/glibmm2/glib/glibmm/timeval.h index 256202ecbc..1988a01ad4 100644 --- a/libs/glibmm2/glib/glibmm/timeval.h +++ b/libs/glibmm2/glib/glibmm/timeval.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_TIMEVAL_H #define _GLIBMM_TIMEVAL_H -/* $Id: timeval.h,v 1.1.1.1 2003/01/07 16:58:56 murrayc Exp $ */ +/* $Id: timeval.h 2 2003-01-07 16:59:16Z murrayc $ */ /* timeval.h * diff --git a/libs/glibmm2/glib/glibmm/unicode.cc b/libs/glibmm2/glib/glibmm/unicode.cc index 63ba67b1d2..a1e506049b 100644 --- a/libs/glibmm2/glib/glibmm/unicode.cc +++ b/libs/glibmm2/glib/glibmm/unicode.cc @@ -5,7 +5,7 @@ #include // -*- c++ -*- -/* $Id: unicode.ccg,v 1.1.1.1 2003/01/07 16:58:42 murrayc Exp $ */ +/* $Id: unicode.ccg,v 1.1 2003/01/07 16:58:42 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/unicode.h b/libs/glibmm2/glib/glibmm/unicode.h index 07f3c75891..f43559e11b 100644 --- a/libs/glibmm2/glib/glibmm/unicode.h +++ b/libs/glibmm2/glib/glibmm/unicode.h @@ -128,7 +128,12 @@ enum UnicodeBreakType UNICODE_BREAK_AMBIGUOUS, UNICODE_BREAK_UNKNOWN, UNICODE_BREAK_NEXT_LINE, - UNICODE_BREAK_WORD_JOINER + UNICODE_BREAK_WORD_JOINER, + UNICODE_BREAK_HANGUL_L_JAMO, + UNICODE_BREAK_HANGUL_V_JAMO, + UNICODE_BREAK_HANGUL_T_JAMO, + UNICODE_BREAK_HANGUL_LV_SYLLABLE, + UNICODE_BREAK_HANGUL_LVT_SYLLABLE }; @@ -193,7 +198,7 @@ inline AsciiType& operator^=(AsciiType& lhs, AsciiType rhs) enum NormalizeMode { NORMALIZE_DEFAULT, - NORMALIZE_NFD = NORMALIZE_DEFAULT, + NORMALIZE_NFD, NORMALIZE_DEFAULT_COMPOSE, NORMALIZE_NFC = NORMALIZE_DEFAULT_COMPOSE, NORMALIZE_ALL, diff --git a/libs/glibmm2/glib/glibmm/ustring.cc b/libs/glibmm2/glib/glibmm/ustring.cc index 9fabc0c1f6..f7bf3bcf0a 100644 --- a/libs/glibmm2/glib/glibmm/ustring.cc +++ b/libs/glibmm2/glib/glibmm/ustring.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: ustring.cc,v 1.7 2006/05/12 08:08:43 murrayc Exp $ */ +/* $Id: ustring.cc 369 2007-01-20 10:19:33Z daniel $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -54,8 +54,8 @@ struct UnicharToUtf8 // std::string will do that for us. // First overload: stop on '\0' character. -// -static ustring::size_type utf8_byte_offset(const char* str, ustring::size_type offset) +static +ustring::size_type utf8_byte_offset(const char* str, ustring::size_type offset) { if(offset == ustring::npos) return ustring::npos; @@ -77,8 +77,8 @@ static ustring::size_type utf8_byte_offset(const char* str, ustring::size_type o } // Second overload: stop when reaching maxlen. -// -static ustring::size_type utf8_byte_offset(const char* str, ustring::size_type offset, +static +ustring::size_type utf8_byte_offset(const char* str, ustring::size_type offset, ustring::size_type maxlen) { if(offset == ustring::npos) @@ -139,8 +139,8 @@ ustring::size_type utf8_char_offset(const std::string& str, ustring::size_type o // Helper to implement ustring::find_first_of() and find_first_not_of(). // Returns the UTF-8 character offset, or ustring::npos if not found. -// -static ustring::size_type utf8_find_first_of(const std::string& str, ustring::size_type offset, +static +ustring::size_type utf8_find_first_of(const std::string& str, ustring::size_type offset, const char* utf8_match, long utf8_match_size, bool find_not_of) { @@ -175,8 +175,8 @@ static ustring::size_type utf8_find_first_of(const std::string& str, ustring::si // Helper to implement ustring::find_last_of() and find_last_not_of(). // Returns the UTF-8 character offset, or ustring::npos if not found. -// -static ustring::size_type utf8_find_last_of(const std::string& str, ustring::size_type offset, +static +ustring::size_type utf8_find_last_of(const std::string& str, ustring::size_type offset, const char* utf8_match, long utf8_match_size, bool find_not_of) { @@ -197,7 +197,9 @@ static ustring::size_type utf8_find_last_of(const std::string& str, ustring::siz while(pstr > str_begin) { // Move to previous character. - do --pstr; while((*pstr & '\xC0') == '\x80'); + do + --pstr; + while((static_cast(*pstr) & 0xC0u) == 0x80); const gunichar *const pfound = std::find(match_begin, match_end, g_utf8_get_char(pstr)); @@ -220,36 +222,44 @@ namespace Glib const ustring::size_type ustring::npos = std::string::npos; #endif -// We need our own version of g_utf8_get_char(), because the std::string -// iterator is not necessarily a plain pointer (it's in fact not in GCC's -// libstdc++-v3). Copying the UTF-8 data into a temporary buffer isn't an -// option since this operation is quite time critical. The implementation -// is quite different from g_utf8_get_char() -- both more generic and faster. -// -// By looking at the first byte of a UTF-8 character one can determine the -// number of bytes used. GLib offers the g_utf8_skip[] array for this purpose, -// but accessing this global variable would introduce a function call to fetch -// the Global Offset Table, plus two levels of indirection in order to read the -// value. Even worse, fetching the GOT is always done right at the start of -// the function instead of the branch that actually uses the variable. -// -// Fortunately, there's a better way to get the byte count. As this table -// shows, there's a nice regular pattern in the UTF-8 encoding scheme: -// -// 0x00000000 - 0x0000007F: 0xxxxxxx -// 0x00000080 - 0x000007FF: 110xxxxx 10xxxxxx -// 0x00000800 - 0x0000FFFF: 1110xxxx 10xxxxxx 10xxxxxx -// 0x00010000 - 0x001FFFFF: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx -// 0x00200000 - 0x03FFFFFF: 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx -// 0x04000000 - 0x7FFFFFFF: 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx -// -// Except for the single byte case, the number of leading 1-bits equals the -// byte count. All that is needed is to shift the first byte to the left -// until bit 7 becomes 0. Naturally, doing so requires a loop -- but since -// we already have one, no additional cost is introduced. This shifting can -// further be combined with the computation of the bitmask needed to eliminate -// the leading length bits, thus saving yet another register. -// +/* + * We need our own version of g_utf8_get_char(), because the std::string + * iterator is not necessarily a plain pointer (it's in fact not in GCC's + * libstdc++-v3). Copying the UTF-8 data into a temporary buffer isn't an + * option since this operation is quite time critical. The implementation + * is quite different from g_utf8_get_char() -- both more generic and likely + * faster. + * + * By looking at the first byte of a UTF-8 character one can determine the + * number of bytes used. GLib offers the g_utf8_skip[] array for this purpose, + * but accessing this global variable would, on IA32 at least, introduce + * a function call to fetch the Global Offset Table, plus two levels of + * indirection in order to read the value. Even worse, fetching the GOT is + * always done right at the start of the function instead of the branch that + * actually uses the variable. + * + * Fortunately, there's a better way to get the byte count. As this table + * shows, there's a nice regular pattern in the UTF-8 encoding scheme: + * + * 0x00000000 - 0x0000007F: 0xxxxxxx + * 0x00000080 - 0x000007FF: 110xxxxx 10xxxxxx + * 0x00000800 - 0x0000FFFF: 1110xxxx 10xxxxxx 10xxxxxx + * 0x00010000 - 0x001FFFFF: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx + * 0x00200000 - 0x03FFFFFF: 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx + * 0x04000000 - 0x7FFFFFFF: 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx + * + * Except for the single byte case, the number of leading 1-bits equals the + * byte count. All that is needed is to shift the first byte to the left + * until bit 7 becomes 0. Naturally, doing so requires a loop -- but since + * we already have one, no additional cost is introduced. This shifting can + * further be combined with the computation of the bitmask needed to eliminate + * the leading length bits, thus saving yet another register. + * + * Note: If you change this code, it is advisable to also review what the + * compiler makes of it in the assembler output. Except for some pointless + * register moves, the generated code is sufficiently close to the optimum + * with GCC 4.1.2 on x86_64. + */ gunichar get_unichar_from_std_iterator(std::string::const_iterator pos) { unsigned int result = static_cast(*pos); @@ -258,21 +268,16 @@ gunichar get_unichar_from_std_iterator(std::string::const_iterator pos) { unsigned int mask = 0x40; - // This loop may look somewhat strange, but this happens to be the - // one variant g++ 3.3 generates optimum code for. (In particular, - // the unconditional break avoids counterproductive loop alignment.) - for(++pos;; ++pos) + do { - mask <<= 5; - const unsigned int c = static_cast(*pos); - result = (result << 6) + c - 0x80; - - if((result & mask) != 0) - continue; - break; + result <<= 6; + const unsigned int c = static_cast(*++pos); + mask <<= 5; + result += c - 0x80; } + while((result & mask) != 0); - result &= --mask; + result &= mask - 1; } return result; @@ -1125,7 +1130,7 @@ bool ustring::is_ascii() const for(; p != pend; ++p) { - if((*p & '\x80') != 0) + if((static_cast(*p) & 0x80u) != 0) return false; } diff --git a/libs/glibmm2/glib/glibmm/ustring.h b/libs/glibmm2/glib/glibmm/ustring.h index 86ff170552..06c97c7633 100644 --- a/libs/glibmm2/glib/glibmm/ustring.h +++ b/libs/glibmm2/glib/glibmm/ustring.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_USTRING_H #define _GLIBMM_USTRING_H -/* $Id: ustring.h,v 1.15 2006/09/19 20:48:15 murrayc Exp $ */ +/* $Id: ustring.h 369 2007-01-20 10:19:33Z daniel $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -729,7 +729,7 @@ const ustring_Iterator ustring_Iterator::operator++(int) template inline ustring_Iterator& ustring_Iterator::operator--() { - do --pos_; while((*pos_ & '\xC0') == '\x80'); + do --pos_; while((static_cast(*pos_) & 0xC0u) == 0x80); return *this; } diff --git a/libs/glibmm2/glib/glibmm/utility.cc b/libs/glibmm2/glib/glibmm/utility.cc index c523b2880a..d23e46458c 100644 --- a/libs/glibmm2/glib/glibmm/utility.cc +++ b/libs/glibmm2/glib/glibmm/utility.cc @@ -1,6 +1,6 @@ // -*- c++ -*- -/* $Id: utility.cc,v 1.1.1.1 2003/01/07 16:58:59 murrayc Exp $ */ +/* $Id: utility.cc 2 2003-01-07 16:59:16Z murrayc $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/utility.h b/libs/glibmm2/glib/glibmm/utility.h index ce541a8d11..fa5c0dcfc1 100644 --- a/libs/glibmm2/glib/glibmm/utility.h +++ b/libs/glibmm2/glib/glibmm/utility.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_UTILITY_H #define _GLIBMM_UTILITY_H -/* $Id: utility.h,v 1.2 2003/01/21 12:43:26 murrayc Exp $ */ +/* $Id: utility.h 386 2007-03-23 17:31:16Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * @@ -21,14 +21,12 @@ */ #include +#include #include #ifndef DOXYGEN_SHOULD_SKIP_THIS -extern "C" void g_free(void*); - - /* Occasionally, a struct variable has to be initialized after its definition, * i.e. when using structs as class member data. For convenience, the macro * GLIBMM_INITIALIZE_STRUCT(Var, Type) is provided. It even avoids creating diff --git a/libs/glibmm2/glib/glibmm/value.cc b/libs/glibmm2/glib/glibmm/value.cc index 620498c4aa..63aff5f4d0 100644 --- a/libs/glibmm2/glib/glibmm/value.cc +++ b/libs/glibmm2/glib/glibmm/value.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: value.cc,v 1.4 2006/05/14 12:12:41 murrayc Exp $ */ +/* $Id: value.cc 292 2006-05-14 12:12:41Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/value.h b/libs/glibmm2/glib/glibmm/value.h index c729d32b1b..12d611bc91 100644 --- a/libs/glibmm2/glib/glibmm/value.h +++ b/libs/glibmm2/glib/glibmm/value.h @@ -1,7 +1,7 @@ // -*- c++ -*- #ifndef _GLIBMM_VALUE_H #define _GLIBMM_VALUE_H -/* $Id: value.h,v 1.11 2006/05/14 12:12:41 murrayc Exp $ */ +/* $Id: value.h 292 2006-05-14 12:12:41Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/value_custom.cc b/libs/glibmm2/glib/glibmm/value_custom.cc index 0cf99da781..09919f4a6b 100644 --- a/libs/glibmm2/glib/glibmm/value_custom.cc +++ b/libs/glibmm2/glib/glibmm/value_custom.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: value_custom.cc,v 1.7 2006/04/12 08:12:11 murrayc Exp $ */ +/* $Id: value_custom.cc 260 2006-04-12 08:12:12Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/glibmm/value_custom.h b/libs/glibmm2/glib/glibmm/value_custom.h index 70f4c3f021..b08c591051 100644 --- a/libs/glibmm2/glib/glibmm/value_custom.h +++ b/libs/glibmm2/glib/glibmm/value_custom.h @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: value_custom.h,v 1.8 2005/01/21 19:26:04 murrayc Exp $ */ +/* $Id: value_custom.h 419 2007-06-22 14:43:53Z murrayc $ */ /* Copyright 2002 The gtkmm Development Team * @@ -18,6 +18,9 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef _GLIBMM_VALUE_CUSTOM_H +#define _GLIBMM_VALUE_CUSTOM_H + #ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef _GLIBMM_VALUE_H_INCLUDE_VALUE_CUSTOM_H #error "glibmm/value_custom.h cannot be included directly" @@ -287,3 +290,6 @@ void Value::value_copy_func(const GValue* src_value, GValue* dest_value) } // namespace Glib +#endif //_GLIBMM_VALUE_CUSTOM_H + + diff --git a/libs/glibmm2/glib/glibmm/wrap.cc b/libs/glibmm2/glib/glibmm/wrap.cc index 54e1507ceb..49a1e15c79 100644 --- a/libs/glibmm2/glib/glibmm/wrap.cc +++ b/libs/glibmm2/glib/glibmm/wrap.cc @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: wrap.cc,v 1.3 2005/01/06 17:42:56 murrayc Exp $ */ +/* $Id: wrap.cc 447 2007-10-03 09:51:41Z murrayc $ */ /* wrap.cc * @@ -45,36 +45,6 @@ typedef std::vector WrapFuncTable; static WrapFuncTable* wrap_func_table = 0; - -static Glib::ObjectBase* create_new_wrapper(GObject* object) -{ - g_return_val_if_fail(wrap_func_table != 0, 0); - - bool gtkmm_wrapper_already_deleted = (bool)g_object_get_qdata((GObject*)object, Glib::quark_cpp_wrapper_deleted_); - if(gtkmm_wrapper_already_deleted) - { - g_warning("Glib::create_new_wrapper: Attempted to create a 2nd C++ wrapper for a C instance whose C++ wrapper has been deleted."); - return 0; - } - - // Traverse upwards through the inheritance hierarchy - // to find the most-specialized wrap_new() for this GType. - // - for(GType type = G_OBJECT_TYPE(object); type != 0; type = g_type_parent(type)) - { - // Look up the wrap table index stored in the type's static data. - // If a wrap_new() has been registered for the type then call it. - // - if(const gpointer idx = g_type_get_qdata(type, Glib::quark_)) - { - const Glib::WrapNewFunction func = (*wrap_func_table)[GPOINTER_TO_UINT(idx)]; - return (*func)(object); - } - } - - return 0; -} - } // anonymous namespace @@ -120,6 +90,85 @@ void wrap_register(GType type, WrapNewFunction func) g_type_set_qdata(type, Glib::quark_, GUINT_TO_POINTER(idx)); } + +static Glib::ObjectBase* wrap_create_new_wrapper(GObject* object) +{ + g_return_val_if_fail(wrap_func_table != 0, 0); + + const bool gtkmm_wrapper_already_deleted = (bool)g_object_get_qdata((GObject*)object, Glib::quark_cpp_wrapper_deleted_); + if(gtkmm_wrapper_already_deleted) + { + g_warning("Glib::wrap_create_new_wrapper: Attempted to create a 2nd C++ wrapper for a C instance whose C++ wrapper has been deleted."); + return 0; + } + + // Traverse upwards through the inheritance hierarchy + // to find the most-specialized wrap_new() for this GType. + // + for(GType type = G_OBJECT_TYPE(object); type != 0; type = g_type_parent(type)) + { + // Look up the wrap table index stored in the type's static data. + // If a wrap_new() has been registered for the type then call it. + // + if(const gpointer idx = g_type_get_qdata(type, Glib::quark_)) + { + const Glib::WrapNewFunction func = (*wrap_func_table)[GPOINTER_TO_UINT(idx)]; + return (*func)(object); + } + } + + return 0; +} + +static gboolean gtype_wraps_interface(GType implementer_type, GType interface_type) +{ + guint n_ifaces = 0; + GType *ifaces = g_type_interfaces (implementer_type, &n_ifaces); + + gboolean found = FALSE; + while (n_ifaces-- && !found) + { + found = (ifaces[n_ifaces] == interface_type); + } + + g_free (ifaces); + + return found; +} + +Glib::ObjectBase* wrap_create_new_wrapper_for_interface(GObject* object, GType interface_gtype) +{ + g_return_val_if_fail(wrap_func_table != 0, 0); + + const bool gtkmm_wrapper_already_deleted = (bool)g_object_get_qdata((GObject*)object, Glib::quark_cpp_wrapper_deleted_); + if(gtkmm_wrapper_already_deleted) + { + g_warning("Glib::wrap_create_new_wrapper: Attempted to create a 2nd C++ wrapper for a C instance whose C++ wrapper has been deleted."); + return 0; + } + + // Traverse upwards through the inheritance hierarchy + // to find the most-specialized wrap_new() for this GType. + // + for(GType type = G_OBJECT_TYPE(object); type != 0; type = g_type_parent(type)) + { + // Look up the wrap table index stored in the type's static data. + // If a wrap_new() has been registered for the type then call it. + // But only if the type implements the interface, + // so that the C++ instance is likely to inherit from the appropriate class too. + // + const gpointer idx = g_type_get_qdata(type, Glib::quark_); + if(idx && gtype_wraps_interface(type, interface_gtype)) + { + const Glib::WrapNewFunction func = (*wrap_func_table)[GPOINTER_TO_UINT(idx)]; + return (*func)(object); + } + } + + return 0; +} + + // This is a factory function that converts any type to // its C++ wrapper instance by looking up a wrap_new() function in a map. // @@ -129,13 +178,12 @@ ObjectBase* wrap_auto(GObject* object, bool take_copy) return 0; // Look up current C++ wrapper instance: - ObjectBase* pCppObject = - static_cast(g_object_get_qdata(object, Glib::quark_)); + ObjectBase* pCppObject = ObjectBase::_get_current_wrapper(object); if(!pCppObject) { // There's not already a wrapper: generate a new C++ instance. - pCppObject = create_new_wrapper(object); + pCppObject = wrap_create_new_wrapper(object); if(!pCppObject) { diff --git a/libs/glibmm2/glib/glibmm/wrap.h b/libs/glibmm2/glib/glibmm/wrap.h index 7bbd705fc2..83aae3c880 100644 --- a/libs/glibmm2/glib/glibmm/wrap.h +++ b/libs/glibmm2/glib/glibmm/wrap.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_WRAP_H #define _GLIBMM_WRAP_H -/* $Id: wrap.h,v 1.2 2003/01/27 16:14:36 murrayc Exp $ */ +/* $Id: wrap.h 447 2007-10-03 09:51:41Z murrayc $ */ /* Copyright (C) 1998-2002 The gtkmm Development Team * @@ -23,11 +23,13 @@ #include #include - +#include namespace Glib { +#ifndef DOXYGEN_SHOULD_SKIP_THIS + class ObjectBase; class Object; @@ -46,6 +48,50 @@ void wrap_register(GType type, WrapNewFunction func); // or automatically generate a new wrapper if there's none. Glib::ObjectBase* wrap_auto(GObject* object, bool take_copy = false); +/** Create a C++ instance of a known C++ type that is mostly closely associated with the GType of the C object. + * @param object The C object which should be placed in a new C++ instance. + * @param interface_gtype The returned instance will implement this interface. Otherwise it will be NULL. + */ +Glib::ObjectBase* wrap_create_new_wrapper_for_interface(GObject* object, GType interface_gtype); + +// Return the current C++ wrapper instance of the GObject, +// or automatically generate a new wrapper if there's none. +template +TInterface* wrap_auto_interface(GObject* object, bool take_copy = false) +{ + if(!object) + return 0; + + // Look up current C++ wrapper instance: + ObjectBase* pCppObject = ObjectBase::_get_current_wrapper(object); + + if(!pCppObject) + { + // There's not already a wrapper: generate a new C++ instance. + // We use exact_type_only=true avoid creating Glib::Object for interfaces of unknown implementation, + // because we do not want a C++ object that does not dynamic_cast to the expected interface type. + pCppObject = wrap_create_new_wrapper_for_interface(object, TInterface::get_base_type()); + } + + //If no exact wrapper was created, + //create an instance of the interface, + //so we at least get the expected type: + TInterface* result = 0; + if(pCppObject) + result = dynamic_cast(pCppObject); + else + result = new TInterface((typename TInterface::BaseObjectType*)object); + + // take_copy=true is used where the GTK+ function doesn't do + // an extra ref for us, and always for plain struct members. + if(take_copy && result) + result->reference(); + + return result; +} + +#endif //DOXYGEN_SHOULD_SKIP_THIS + // Get a C++ instance that wraps the C instance. // This always returns the same C++ instance for the same C instance. // Each wrapper has it's own override of Glib::wrap(). diff --git a/libs/glibmm2/glib/glibmm/wrap_init.cc b/libs/glibmm2/glib/glibmm/wrap_init.cc index b6799993f1..f1eafb8f09 100644 --- a/libs/glibmm2/glib/glibmm/wrap_init.cc +++ b/libs/glibmm2/glib/glibmm/wrap_init.cc @@ -22,6 +22,7 @@ #include "optioncontext.h" #include "optionentry.h" #include "optiongroup.h" +#include "regex.h" #include "shell.h" #include "spawn.h" #include "thread.h" @@ -41,6 +42,7 @@ GQuark g_io_channel_error_quark(void); GQuark g_key_file_error_quark(void); GQuark g_markup_error_quark(void); GQuark g_option_error_quark(void); +GQuark g_regex_error_quark(void); GQuark g_shell_error_quark(void); GQuark g_spawn_error_quark(void); GQuark g_thread_error_quark(void); @@ -61,6 +63,7 @@ void wrap_init() Glib::Error::register_domain(g_key_file_error_quark(), &Glib::KeyFileError::throw_func); Glib::Error::register_domain(g_markup_error_quark(), &Glib::MarkupError::throw_func); Glib::Error::register_domain(g_option_error_quark(), &Glib::OptionError::throw_func); + Glib::Error::register_domain(g_regex_error_quark(), &Glib::RegexError::throw_func); Glib::Error::register_domain(g_shell_error_quark(), &Glib::ShellError::throw_func); Glib::Error::register_domain(g_spawn_error_quark(), &Glib::SpawnError::throw_func); Glib::Error::register_domain(g_thread_error_quark(), &Glib::ThreadError::throw_func); diff --git a/libs/glibmm2/glib/glibmm/wrap_init.h b/libs/glibmm2/glib/glibmm/wrap_init.h index fbdc4e0853..cd5dd0dfa0 100644 --- a/libs/glibmm2/glib/glibmm/wrap_init.h +++ b/libs/glibmm2/glib/glibmm/wrap_init.h @@ -2,7 +2,7 @@ #ifndef _GLIBMM_WRAP_INIT_H #define _GLIBMM_WRAP_INIT_H -/* $Id: wrap_init.h,v 1.1.1.1 2003/01/07 16:59:01 murrayc Exp $ */ +/* $Id: wrap_init.h 2 2003-01-07 16:59:16Z murrayc $ */ /* wrap_init.h * diff --git a/libs/glibmm2/glib/glibmmconfig.h b/libs/glibmm2/glib/glibmmconfig.h index 7cf16ed623..4e4bfa308f 100644 --- a/libs/glibmm2/glib/glibmmconfig.h +++ b/libs/glibmm2/glib/glibmmconfig.h @@ -1,11 +1,11 @@ -/* glib/glibmmconfig.h. Generated by configure. */ +/* glib/glibmmconfig.h. Generated from glibmmconfig.h.in by configure. */ #ifndef _GLIBMM_CONFIG_H #define _GLIBMM_CONFIG_H 1 /* version numbers */ #define GLIBMM_MAJOR_VERSION 2 -#define GLIBMM_MINOR_VERSION 13 -#define GLIBMM_MICRO_VERSION 3 +#define GLIBMM_MINOR_VERSION 14 +#define GLIBMM_MICRO_VERSION 2 // detect common platforms #if defined(_WIN32) @@ -38,6 +38,7 @@ /* #undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR */ #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1 #define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 +#define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1 /* #undef GLIBMM_COMPILER_SUN_FORTE */ /* #undef GLIBMM_DEBUG_REFCOUNTING */ #define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 @@ -57,6 +58,7 @@ #define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1 #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 1 #define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 + #define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1 #define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 #define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 #define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 @@ -76,7 +78,7 @@ #ifdef GLIBMM_DLL #if defined(GLIBMM_BUILD) && defined(_WINDLL) /* Do not dllexport as it is handled by gendef on MSVC */ - #define GLIBMM_API + #define GLIBMM_API #elif !defined(GLIBMM_BUILD) #define GLIBMM_API __declspec(dllimport) #else diff --git a/libs/glibmm2/glib/glibmmconfig.h.in b/libs/glibmm2/glib/glibmmconfig.h.in index da7a98da7f..8a971fe5b3 100644 --- a/libs/glibmm2/glib/glibmmconfig.h.in +++ b/libs/glibmm2/glib/glibmmconfig.h.in @@ -37,6 +37,7 @@ #undef GLIBMM_HAVE_SUN_REVERSE_ITERATOR #undef GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS #undef GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS +#undef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 #undef GLIBMM_COMPILER_SUN_FORTE #undef GLIBMM_DEBUG_REFCOUNTING #undef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION @@ -56,6 +57,7 @@ #define GLIBMM_HAVE_STD_ITERATOR_TRAITS 1 #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS 2 #define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 + #define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1 #define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 #define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 #define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 diff --git a/libs/glibmm2/glib/src/Makefile b/libs/glibmm2/glib/src/Makefile deleted file mode 100644 index a12e24aba8..0000000000 --- a/libs/glibmm2/glib/src/Makefile +++ /dev/null @@ -1,424 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# glib/src/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile_list_of_hg.am_fragment \ - $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment \ - $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment \ - $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment \ - $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment \ - $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment -subdir = glib/src -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -sublib_name = glibmm -sublib_namespace = Glib -files_defs = glib.defs glib_enums.defs glib_functions.defs gobject.defs gobject_enums.defs gobject_functions.defs gmodule_enums.defs gmodule_functions.defs glib_docs.xml glib_docs_override.xml -tools_dir_m4 = $(top_srcdir)/tools/m4 -tools_dir_pm = $(top_srcdir)/tools/pm -gensrc_destdir = $(srcdir)/../$(sublib_name) -stamp_dir = $(srcdir)/.stamps -files_tools_m4 = base.m4 class_shared.m4 class_boxedtype.m4 class_boxedtype_static.m4 \ - class_generic.m4 class_gobject.m4 class_gtkobject.m4 \ - class_interface.m4 class_opaque_refcounted.m4 class_opaque_copyable.m4 \ - gerror.m4 \ - compare.m4 convert.m4 convert_base.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ - convert_glib.m4 convert_gtk.m4 convert_pango.m4 ctor.m4 doc.m4 enum.m4 list.m4 member.m4 \ - method.m4 property.m4 signal.m4 vfunc.m4 - -files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm -files_tools_genwrap = generate_wrap_init.pl -files_tools_perl = $(files_tools_genwrap) gmmproc.in -tools_m4 = $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4) -tools_pm = $(files_tools_pm:%.pm=$(tools_dir_pm)/%.pm) -files_posix_hg = -files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg -files_all_hg = $(files_general_hg) $(files_posix_hg) $(files_win32_hg) -files_hg = $(files_general_hg) $(files_posix_hg) -#files_hg = $(files_general_hg) $(files_win32_hg) -files_all_ccg = $(files_all_hg:%.hg=%.ccg) -files_h = $(files_all_hg:%.hg=$(gensrc_destdir)/%.h) -files_cc = $(files_all_hg:%.hg=$(gensrc_destdir)/%.cc) -files_stamp = $(files_all_hg:%.hg=$(stamp_dir)/stamp-%) \ - $(glibmm_files_m4:%.m4=$(gensrc_destdir)/%) -gmmproc_in = $(top_srcdir)/tools/gmmproc.in -gmmproc_path = $(top_builddir)/tools/gmmproc -gmmproc_args = -I $(tools_dir_m4) --defs $(srcdir) -run_gmmproc = $(PERL_PATH) -I$(tools_dir_pm) $(gmmproc_path) $(gmmproc_args) -gen_wrap_init_in = $(top_srcdir)/tools/generate_wrap_init.pl.in -gen_wrap_init_path = $(top_builddir)/tools/generate_wrap_init.pl -gen_wrap_init_args = --namespace=$(sublib_namespace) -run_gen_wrap_init = $(PERL_PATH) $(gen_wrap_init_path) $(gen_wrap_init_args) -EXTRA_DIST = Makefile_list_of_hg.am_fragment $(files_defs) \ - $(files_all_hg) $(files_all_ccg) $(glibmm_files_m4) \ - template.macros.m4 -glibmm_files_m4 = signalproxy.h.m4 value_basictypes.cc.m4 value_basictypes.h.m4 -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment $(srcdir)/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_gensrc_platform.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu glib/src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu glib/src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../build_shared $(distdir)/../../tools $(distdir)/../../tools/m4 $(distdir)/../../tools/pm - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-local: -all-am: Makefile all-local -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic \ - maintainer-clean-local - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - - -$(stamp_dir)/stamp-%: %.hg %.ccg $(gmmproc_in) $(tools_m4) $(tools_pm) $(files_defs) - $(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir) - @echo 'timestamp' >$@ - -$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_in) $(files_all_hg) - $(run_gen_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) >$@ - -create-stamp-dir: - @(test -d $(stamp_dir) || mkdir $(stamp_dir)) - -#all-local: create-stamp-dir $(files_stamp) $(gensrc_destdir)/wrap_init.cc - -maintainer-clean-local: - rm -rf $(stamp_dir) - -.PHONY: create-stamp-dir - -$(gensrc_destdir)/%.cc: %.cc.m4 template.macros.m4 - $(M4) -I$(srcdir) $< >$@ - -$(gensrc_destdir)/%.h: %.h.m4 template.macros.m4 - $(M4) -I$(srcdir) $< >$@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/glib/src/Makefile.in b/libs/glibmm2/glib/src/Makefile.in index 04b587c100..c43e26c1f7 100644 --- a/libs/glibmm2/glib/src/Makefile.in +++ b/libs/glibmm2/glib/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -44,8 +40,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment subdir = glib/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -61,8 +57,6 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -100,12 +94,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -119,13 +113,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -135,27 +126,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -167,28 +149,39 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ sublib_name = glibmm sublib_namespace = Glib files_defs = glib.defs glib_enums.defs glib_functions.defs gobject.defs gobject_enums.defs gobject_functions.defs gmodule_enums.defs gmodule_functions.defs glib_docs.xml glib_docs_override.xml @@ -211,7 +204,7 @@ tools_m4 = $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4) tools_pm = $(files_tools_pm:%.pm=$(tools_dir_pm)/%.pm) files_posix_hg = files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg +files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg shell.hg spawn.hg thread.hg unicode.hg files_all_hg = $(files_general_hg) $(files_posix_hg) $(files_win32_hg) @OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) @OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) @@ -270,10 +263,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -282,23 +271,21 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../build_shared $(distdir)/../../tools $(distdir)/../../tools/m4 $(distdir)/../../tools/pm - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -344,7 +331,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -358,12 +345,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -383,18 +378,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool distclean distclean-generic distclean-libtool \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am $(stamp_dir)/stamp-%: %.hg %.ccg $(gmmproc_in) $(tools_m4) $(tools_pm) $(files_defs) diff --git a/libs/glibmm2/glib/src/Makefile_list_of_hg.am_fragment b/libs/glibmm2/glib/src/Makefile_list_of_hg.am_fragment index 469614d82c..4cc446def7 100644 --- a/libs/glibmm2/glib/src/Makefile_list_of_hg.am_fragment +++ b/libs/glibmm2/glib/src/Makefile_list_of_hg.am_fragment @@ -5,4 +5,4 @@ files_posix_hg = files_win32_hg = -files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg shell.hg spawn.hg thread.hg unicode.hg +files_general_hg = convert.hg date.hg fileutils.hg iochannel.hg keyfile.hg markup.hg module.hg optioncontext.hg optionentry.hg optiongroup.hg regex.hg shell.hg spawn.hg thread.hg unicode.hg diff --git a/libs/glibmm2/glib/src/date.ccg b/libs/glibmm2/glib/src/date.ccg index ca7bc50d9c..8f66c8e8f8 100644 --- a/libs/glibmm2/glib/src/date.ccg +++ b/libs/glibmm2/glib/src/date.ccg @@ -65,14 +65,22 @@ void Date::set_parse(const Glib::ustring& str) g_date_set_parse(&gobject_, str.c_str()); } + _DEPRECATE_IFDEF_START + +//Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32) +//That would make the set_time() method overload impossible. +#ifdef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 void Date::set_time(GTime time) { //This method, and the C function that it wraps, are deprecated. g_date_set_time(&gobject_, time); } +#endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 + _DEPRECATE_IFDEF_END + void Date::set_time(time_t timet) { g_date_set_time_t(&gobject_, timet); diff --git a/libs/glibmm2/glib/src/date.hg b/libs/glibmm2/glib/src/date.hg index 1f6b4eef28..9d04a29719 100644 --- a/libs/glibmm2/glib/src/date.hg +++ b/libs/glibmm2/glib/src/date.hg @@ -70,7 +70,12 @@ public: */ void set_parse (const Glib::ustring& str); + _DEPRECATE_IFDEF_START + + //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32) + //That would make the set_time() method overload impossible. + #ifdef GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 /** Sets the value of a date from a GTime (time_t) value. * * @param time GTime value to set. @@ -78,8 +83,11 @@ public: * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&). */ void set_time(GTime time); + #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 + _DEPRECATE_IFDEF_END + /** Sets the value of a date from a time_t value. * * @param timet time_t value to set diff --git a/libs/glibmm2/glib/src/fileutils.ccg b/libs/glibmm2/glib/src/fileutils.ccg index e7b63f96c6..84df93f952 100644 --- a/libs/glibmm2/glib/src/fileutils.ccg +++ b/libs/glibmm2/glib/src/fileutils.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: fileutils.ccg,v 1.1.1.1 2003/01/07 16:58:25 murrayc Exp $ */ +/* $Id: fileutils.ccg,v 1.1 2003/01/07 16:58:25 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/src/glib_docs.xml b/libs/glibmm2/glib/src/glib_docs.xml index e6bb3a528c..e013376865 100644 --- a/libs/glibmm2/glib/src/glib_docs.xml +++ b/libs/glibmm2/glib/src/glib_docs.xml @@ -2,18 +2,18 @@ Converts a string to a hash value. -It can be passed to g_hash_table_new() as the @hash_func parameter, -when using strings as keys in a #GHashTable. +It can be passed to g_hash_table_new() as the @hash_func +parameter, when using strings as keys in a #GHashTable. - a string key. + a string key - a hash value corresponding to the key. + a hash value corresponding to the key @@ -37,8 +37,8 @@ strcasecmp() function on platforms which support it. 0 if the strings match, a negative value if @s1 &lt; @s2, or a positive value if @s1 &gt; @s2. -Deprecated: See g_strncasecmp() for a discussion of why this function is -deprecated and how to replace it. +Deprecated:2.2: See g_strncasecmp() for a discussion of why this function +is deprecated and how to replace it. @@ -161,8 +161,7 @@ moves @src into *@dest. *@dest must be %NULL. -Returns the number of threads currently running in @pool. - +Return value: the number of threads currently running @@ -175,12 +174,149 @@ Returns the number of threads currently running in @pool. - + -Removes the specified group, @group_name, -from the key file. +Retrieves the names of the applications that have registered the +bookmark for @uri. -Since: 2.6 +In the event the URI cannot be found, %NULL is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + return location of the length of the returned list, or %NULL + + + + return location for a #GError, or %NULL + + + + a newly allocated %NULL-terminated array of strings. +Use g_strfreev() to free it. + +Since: 2.12 + + + + + +Close an IO channel. Any pending data to be written will be +flushed, ignoring errors. The channel will not be freed until the +last reference is dropped using g_io_channel_unref(). + +Deprecated:2.2: Use g_io_channel_shutdown() instead. + + + + + A #GIOChannel + + + + + + + + +Compares two strings for equality, returning %TRUE if they are equal. +For use with #GHashTable. + + + + + + a #GString + + + + another #GString + + + + %TRUE if they strings are the same length and contain the +same bytes + + + + + +Gets whether the private flag of the bookmark for @uri is set. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. In the +event that the private flag cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_INVALID_VALUE. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + return location for a #GError, or %NULL + + + + %TRUE if the private flag is set, %FALSE otherwise. + +Since: 2.12 + + + + + +Return value: The currently firing source or %NULL. + + + + + The currently firing source or %NULL. + +Since: 2.12 + + + + + +Returns: a canonical representation for the string + + + + + a string + + + + a canonical representation for the string + +Since: 2.10 + + + + + +Associates a list of double values with @key under +@group_name. If @key cannot be found then it is created. +If @group_name is %NULL the start group is used. + +Since: 2.12 @@ -192,30 +328,37 @@ Since: 2.6 a group name - - return location for a #GError or %NULL + + a key + + + + an array of double values + + + + number of double values in @list - + -Close an IO channel. Any pending data to be written will be -flushed, ignoring errors. The channel will not be freed until the -last reference is dropped using g_io_channel_unref(). - -Deprecated: Use g_io_channel_shutdown() instead. +Return value: the position of @iter - - A #GIOChannel + + a #GSequenceIter - + the position of @iter + +Since: 2.14 + @@ -320,6 +463,25 @@ one of the #GMarkupParser functions. + + +Creates a new #GStringChunk. + + + + + + the default size of the blocks of memory which are +allocated to store the strings. If a particular string +is larger than this default size, a larger block of +memory will be allocated for it. + + + + a new #GStringChunk + + + Converts a string into canonical form, standardizing @@ -370,6 +532,33 @@ normalized form of @str. + + +Scans for the next match using the same parameters of the previous +call to g_regex_match_full() or g_regex_match() that returned +@match_info. + +The match is done on the string passed to the match function, so you +cannot free it before calling this function. + + + + + + a #GMatchInfo structure + + + + location to store the error occuring, or %NULL to ignore errors + + + + %TRUE is the string matched, %FALSE otherwise + +Since: 2.14 + + + This is just like the standard C qsort() function, but @@ -402,6 +591,26 @@ the comparison routine accepts a user data argument. + + +Retrieves the name of the next entry in the directory. The '.' and +'..' entries are omitted. On Windows, the returned name is in +UTF-8. On Unix, it is in the on-disk encoding. + + + + + + a #GDir* created by g_dir_open() + + + + The entry's name or %NULL if there are no +more entries. The return value is owned by GLib and +must not be modified or freed. + + + If @context is currently waiting in a poll(), interrupt @@ -501,6 +710,44 @@ was large enough. + + +Retrieves the text matching the @match_num&lt;!-- --&gt;'th capturing +parentheses. 0 is the full text of the match, 1 is the first paren +set, 2 the second, and so on. + +If @match_num is a valid sub pattern but it didn't match anything +(e.g. sub pattern 1, matching "b" against "(a)?b") then an empty +string is returned. + +If the match was obtained using the DFA algorithm, that is using +g_regex_match_all() or g_regex_match_all_full(), the retrieved +string is not that of a set of parentheses but that of a matched +substring. Substrings are matched in reverse order of length, so +0 is the longest match. + +The string is fetched from the string passed to the match function, +so you cannot call this function after freeing the string. + + + + + + #GMatchInfo structure + + + + number of the sub expression + + + + The matched substring, or %NULL if an error occurred. +You have to free the string yourself + +Since: 2.14 + + + Increases the reference count on a #GMainContext object by one. @@ -546,15 +793,7 @@ or when displaying an application's name in the task list. Tries to become the owner of the specified context. If some other context is the owner of the context, -returns %FALSE immediately. Ownership is properly -recursive: the owner can require ownership again -and will release ownership when g_main_context_release() -is called as many times as g_main_context_acquire(). - -You must be the owner of a context before you -can call g_main_context_prepare(), g_main_context_query(), -g_main_context_check(), g_main_context_dispatch(). - +Return value: %TRUE if the operation succeeded, and @@ -568,6 +807,23 @@ this thread is now the owner of @context. + + +Returns: the string searched with @match_info + + + + + a #GMatchInfo + + + + the string searched with @match_info + +Since: 2.14 + + + Writes all of @contents to a file named @filename, with good error checking. @@ -652,7 +908,7 @@ range btweeen #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. - the id of the event source. + the ID (greater than 0) of the event source. @@ -671,15 +927,31 @@ will return the first entry again. + + +Retrieves every key inside @hash_table. The returned data is valid +until @hash_table is modified. + + + + + + a #GHashTable + + + + a #GList containing all the keys inside the hash +table. The content of the list is owned by the hash table and +should not be modified or freed. Use g_list_free() when done +using the list. + +Since: 2.14 + + + -Returns an ordered list of base directories in which to access -system-wide configuration information. - -On UNIX platforms this is determined using the mechanisms described in -the &lt;ulink url="http://www.freedesktop.org/Standards/basedir-spec"&gt; -XDG Base Directory Specification&lt;/ulink&gt; - +Return value: a %NULL-terminated array of strings owned by GLib that must @@ -819,9 +1091,7 @@ Since: 2.6 -Returns the next random #gdouble from @rand_ equally distributed over -the range [0..1). - +Return value: A random number. @@ -966,6 +1236,26 @@ If @c is not an uppercase or lowercase character, + + +Creates a new GSequence. The @data_destroy function, if non-%NULL will +be called on all items when the sequence is destroyed and on items that +are removed from the sequence. + + + + + + a #GDestroyNotify function, or %NULL + + + + a new #GSequence + +Since: 2.14 + + + Decreases the reference count on a #GMainLoop object by one. If @@ -981,21 +1271,38 @@ the result is zero, free the loop and free all associated memory. - + -Decreases the reference count of the asynchronous @queue by 1 and -releases the lock. This function must be called while holding the -@queue's lock. If the reference count went to 0, the @queue will be -destroyed and the memory allocated will be freed. +Return value: the values associated with the key as a list of - - a #GAsyncQueue. + + a #GKeyFile + + + + a group name + + + + a key + + + + the number of integers returned + + + + return location for a #GError - + the values associated with the key as a list of +integers, or %NULL if the key was not found or could not be parsed. + +Since: 2.6 + @@ -1047,6 +1354,81 @@ the first one found will be returned. + + +This function looks for a desktop bookmark file named @file in the +paths returned from g_get_user_data_dir() and g_get_system_data_dirs(), +loads the file into @bookmark and returns the file's full path in +@full_path. If the file could not be loaded then an %error is +set to either a #GFileError or #GBookmarkFileError. + + + + + + a #GBookmarkFile + + + + a relative path to a filename to open and parse + + + + return location for a string containing the full path +of the file, or %NULL + + + + return location for a #GError, or %NULL + + + + %TRUE if a key file could be loaded, %FALSE othewise + +Since: 2.12 + + + + + +Incrementally decode a sequence of binary data from its Base-64 stringified +representation. By calling this function multiple times you can convert +data in chunks to avoid having to have the full encoded data in memory. + +The output buffer must be large enough to fit all the data that will +be written to it. Since base64 encodes 3 bytes in 4 chars you need +at least: @len * 3 / 4 bytes. + + + + + + binary input data + + + + max length of @in data to decode + + + + output buffer + + + + Saved state between steps, initialize to 0 + + + + Saved state between steps, initialize to 0 + + + + The number of bytes of output that was written + +Since: 2.12 + + + Converts a string from one character set to another. @@ -1108,6 +1490,34 @@ g_free(). Otherwise %NULL and @error will be set. + + +Finds an iterator somewhere in the range (@begin, @end). This +iterator will be close to the middle of the range, but is not +guaranteed to be &lt;emphasis&gt;exactly&lt;/emphasis&gt; in the middle. + +The @begin and @end iterators must both point to the same sequence and +@begin must come before or be equal to @end in the sequence. + + + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + A #GSequenceIter pointing somewhere in the +(@begin, @end) range. + +Since: 2.14 + + + Adds a file descriptor to the set of file descriptors polled for @@ -1158,8 +1568,7 @@ Since: 2.6 -Returns a pointer to the main group of @context. - +Return value: the main group of @context, or %NULL if @context doesn't @@ -1221,35 +1630,40 @@ the string in place.) - + -Searches a #GTree using @search_func. +Retrieves the list of group names of the bookmark for @uri. -The @search_func is called with a pointer to the key of a key/value pair in the tree, -and the passed in @user_data. If @search_func returns 0 for a key/value pair, then -g_tree_search_func() will return the value of that pair. If @search_func returns -1, -searching will proceed among the key/value pairs that have a smaller key; if @search_func -returns 1, searching will proceed among the key/value pairs that have a larger key. +In the event the URI cannot be found, %NULL is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + +The returned array is %NULL terminated, so @length may optionally +be %NULL. - - a #GTree. + + a #GBookmarkFile - - a function used to search the #GTree. + + a valid URI - - the data passed as the second argument to the @search_func -function. + + return location for the length of the returned string, or %NULL + + + + return location for a #GError, or %NULL - the value corresponding to the found key, or %NULL if the key -was not found. + a newly allocated %NULL-terminated array of group names. +Use g_strfreev() to free it. + +Since: 2.12 @@ -1331,30 +1745,29 @@ Since: 2.4 -Compares two strings and returns %TRUE if they are equal. -It can be passed to g_hash_table_new() as the @key_equal_func -parameter, when using strings as keys in a #GHashTable. +Compares two strings for byte-by-byte equality and returns %TRUE +if they are equal. It can be passed to g_hash_table_new() as the +@key_equal_func parameter, when using strings as keys in a #GHashTable. - a key. + a key - a key to compare with @v1. + a key to compare with @v1 - %TRUE if the two keys match. + %TRUE if the two keys match -Returns the name of the start group of the file. - +Return value: The start group of the key file. @@ -1394,11 +1807,12 @@ not found. -Destroys the #GHashTable. If keys and/or values are dynamically -allocated, you should either free them first or create the #GHashTable -using g_hash_table_new_full(). In the latter case the destroy functions -you supplied will be called on all keys and values before destroying -the #GHashTable. +Destroys all keys and values in the #GHashTable and decrements its +reference count by 1. If keys and/or values are dynamically allocated, +you should either free them first or create the #GHashTable with destroy +notifiers using g_hash_table_new_full(). In the latter case the destroy +functions you supplied will be called on all keys and values during the +destruction phase. @@ -1410,35 +1824,123 @@ the #GHashTable. - + -Gets the height of a #GTree. +Return value: the value associated with the key as a double, or -If the #GTree contains no nodes, the height is 0. -If the #GTree contains only one root node the height is 1. -If the root node has children the height is 2, etc. + + + + a #GKeyFile + + + + a group name + + + + a key + + + + return location for a #GError + + + + the value associated with the key as a double, or +0.0 if the key was not found or could not be parsed. + +Since: 2.12 + + + + + +Looks whether the desktop bookmark has an item with its URI set to @uri. - - a #GTree. + + a #GBookmarkFile + + + + a valid URI - the height of the #GTree. + %TRUE if @uri is inside @bookmark, %FALSE otherwise + +Since: 2.12 + + + + + +This function will return the maximum @interval that a thread will +wait in the thread pool for new tasks before being stopped. + +If this function returns 0, threads waiting in the thread pool for +new work are not stopped. + + + + + + the maximum @interval to wait for new tasks in the +thread pool before stopping the thread (1/1000ths of a second). + +Since: 2.10 + + + + + +Increases the reference count of the asynchronous @queue by 1. You +do not need to hold the lock to call this function. + + + + + + a #GAsyncQueue. + + + + the @queue that was passed in (since 2.6) + + + + + +Removes @len bytes from a #GString, starting at position @pos. +The rest of the #GString is shifted down to fill the gap. + + + + + + a #GString + + + + the position of the content to remove + + + + the number of bytes to remove, or -1 to remove all +following bytes + + + + @string -Returns a base directory in which to access application data such -as icons that is customized for a particular user. - -On UNIX platforms this is determined using the mechanisms described in -the &lt;ulink url="http://www.freedesktop.org/Standards/basedir-spec"&gt; -XDG Base Directory Specification&lt;/ulink&gt; - +Return value: a string owned by GLib that must not be modified @@ -1458,6 +1960,10 @@ Unlike the BSD strcasecmp() function, this only recognizes standard ASCII letters and ignores the locale, treating all non-ASCII characters as if they are not letters. +The same warning as in g_ascii_strcasecmp() applies: Use this +function only on strings known to be in encodings where bytes +corresponding to ASCII letters always represent themselves. + @@ -1474,10 +1980,8 @@ characters as if they are not letters. - an integer less than, equal to, or greater than zero -if the first @n bytes of @s1 is found, respectively, -to be less than, to match, or to be greater than the -first @n bytes of @s2. + 0 if the strings match, a negative value if @s1 &lt; @s2, +or a positive value if @s1 &gt; @s2. @@ -1497,6 +2001,25 @@ memory will be destroyed. + + +Atomically increments the reference count of @hash_table by one. +This function is MT-safe and may be called from any thread. + + + + + + a valid #GHashTable. + + + + the passed in #GHashTable. + +Since: 2.10 + + + Runs a main loop until g_main_loop_quit() is called on the loop. @@ -1564,8 +2087,8 @@ Converts a string to lower case. the string -Deprecated: This function is totally broken for the reasons discussed in -the g_strncasecmp() docs - use g_ascii_strdown() or g_utf8_strdown() +Deprecated:2.2: This function is totally broken for the reasons discussed +in the g_strncasecmp() docs - use g_ascii_strdown() or g_utf8_strdown() instead. @@ -1601,6 +2124,23 @@ Since: 2.4 + + +Returns: the number of capturing subpatterns + + + + + a #GRegex + + + + the number of capturing subpatterns + +Since: 2.14 + + + Associates a function with @group which will be called @@ -1654,7 +2194,7 @@ processed. Note however, that no thread of this pool is interrupted, while processing a task. Instead at least all still running threads can finish their tasks before the @pool is freed. -If @wait is %TRUE, the functions does not return before all tasks +If @wait_ is %TRUE, the functions does not return before all tasks to be processed (dependent on @immediate, whether all or only the currently running) are ready. Otherwise the function returns immediately. @@ -1670,7 +2210,7 @@ After calling this function @pool must not be used anymore. should @pool shut down immediately? - + should the function wait for all tasks to be finished? @@ -1678,16 +2218,33 @@ After calling this function @pool must not be used anymore. - + -Stops all currently unused threads. This does not change the -maximal number of unused threads. This function can be used to -regularly stop all unused threads e.g. from g_timeout_add(). +Gets the time when the bookmark for @uri was last modified. + +In the event the URI cannot be found, -1 is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + a #GBookmarkFile + + + + a valid URI + + + + return location for a #GError, or %NULL + + - + a timestamp + +Since: 2.12 + @@ -1767,7 +2324,9 @@ or %NULL, if none. Converts a string from UTF-8 to the encoding GLib uses for -filenames. Note that on Windows GLib uses UTF-8 for filenames. +filenames. Note that on Windows GLib uses UTF-8 for filenames; +on other platforms, this function indirectly depends on the +&lt;link linkend="setlocale"&gt;current locale&lt;/link&gt;. @@ -1885,8 +2444,7 @@ g_hash_table_lookup_extended(). -Returns a random #gdouble equally distributed over the range [@begin..@end). - +Return value: A random number. @@ -1922,41 +2480,158 @@ also be negative to decrease the value of @time_. - + -A wrapper for the POSIX rename() function. The rename() function -renames a file, moving it between directories if required. +Associates a new double value with @key under @group_name. +If @key cannot be found then it is created. If @group_name +is %NULL, the start group is used. -See your C library manual for more details about how rename() works -on your system. Note in particular that on Windows, it is in -general not possible to rename a file if a file with the new name -already exists. Also it is not possible in general to rename an -open file. +Since: 2.12 + + + + + a #GKeyFile + + + + a group name + + + + a key + + + + an double value + + + + + + + + +Encode a sequence of binary data into its Base-64 stringified +representation. - - a pathname in the GLib file name encoding (UTF-8 on Windows) + + the binary data to encode - - a pathname in the GLib file name encoding + + the length of @data - 0 if the renaming succeeded, -1 if an error occurred + a newly allocated, zero-terminated Base-64 encoded +string representing @data. + +Since: 2.12 + + + + + +Create a directory if it doesn't already exist. Create intermediate +parent directories as needed, too. + + + + + + a pathname in the GLib file name encoding + + + + permissions to use for newly created directories + + + + 0 if the directory already exists, or was successfully +created. Returns -1 if an error occurred, with errno set. + +Since: 2.8 + + + + + +Creates a new option context. + +The @parameter_string can serve multiple purposes. It can be used +to add descriptions for "rest" arguments, which are not parsed by +the #GOptionContext, typically something like "FILES" or +"FILE1 FILE2...". If you are using #G_OPTION_REMAINING for +collecting "rest" arguments, GLib handles this automatically by +using the @arg_description of the corresponding #GOptionEntry in +the usage summary. + +Another usage is to give a short summary of the program +functionality, like " - frob the strings", which will be displayed +in the same line as the usage. For a longer description of the +program functionality that should be displayed as a paragraph +below the usage line, use g_option_context_set_summary(). + +Note that the @parameter_string is translated (see +g_option_context_set_translate_func()). + + + + + + a string which is displayed in +the first line of &lt;option&gt;--help&lt;/option&gt; output, after the +usage summary +&lt;literal&gt;&lt;replaceable&gt;programname&lt;/replaceable&gt; [OPTION...]&lt;/literal&gt; + + + + a newly created #GOptionContext, which must be +freed with g_option_context_free() after use. Since: 2.6 + + +This function cannot be called on a channel with %NULL encoding. + + + + + + a #GIOChannel + + + + a character + + + + A location to return an error of type #GConvertError +or #GIOChannelError + + + + a #GIOStatus + + + -Sets a function to be called when the child indicated by @pid exits, at a -default priority, #G_PRIORITY_DEFAULT. +Sets a function to be called when the child indicated by @pid +exits, at a default priority, #G_PRIORITY_DEFAULT. -Note that on platforms where #GPid must be explicitely closed +If you obtain @pid from g_spawn_async() or g_spawn_async_with_pipes() +you will need to pass #G_SPAWN_DO_NOT_REAP_CHILD as flag to +the spawn function for the child watching to work. + +Note that on platforms where #GPid must be explicitly closed (see g_spawn_close_pid()) @pid must not be closed while the source is still active. Typically, you will want to call g_spawn_close_pid() in the callback function for the source. @@ -1979,63 +2654,56 @@ GLib supports only a single callback per process id. - the id of event source. + the ID (greater than 0) of the event source. Since: 2.4 - + -Converts a #gdouble to a string, using the '.' as -decimal point. To format the number you pass in -a printf()-style format string. Allowed conversion -specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'. - -If you just want to want to serialize the value into a -string, use g_ascii_dtostr(). - +Return value: the length of the @queue. - - A buffer to place the resulting string in - - - - The length of the buffer. - - - - The printf()-style format to use for the -code to use for converting. - - - - The #gdouble to convert + + a #GAsyncQueue. - The pointer to the buffer with the converted string. + the length of the @queue. - + -Sets the buffer size. +Adds a copy of @string to the #GStringChunk. +It returns a pointer to the new copy of the string +in the #GStringChunk. The characters in the string +can be changed, if necessary, though you should not +change anything after the end of the string. + +Unlike g_string_chunk_insert_const(), this function +does not check for duplicates. Also strings added +with g_string_chunk_insert() will not be searched +by g_string_chunk_insert_const() when looking for +duplicates. + - - a #GIOChannel + + a #GStringChunk - - the size of the buffer. 0 == pick a good size + + the string to add - + a pointer to the copy of @string within +the #GStringChunk + @@ -2070,38 +2738,19 @@ full name including the type suffix. - + -Creates a new #GHashTable like g_hash_table_new() and allows to specify -functions to free the memory allocated for the key and value that get -called when removing the entry from the #GHashTable. +Frees a #GError and associated resources. - - a function to create a hash value from a key. - - - - a function to check two keys for equality. - - - - a function to free the memory allocated for the key -used when removing the entry from the #GHashTable or %NULL if you -don't want to supply such a function. - - - - a function to free the memory allocated for the -value used when removing the entry from the #GHashTable or %NULL if -you don't want to supply such a function. + + a #GError - a new #GHashTable. - + @@ -2109,9 +2758,7 @@ you don't want to supply such a function. Adds a function to be called whenever there are no higher priority events pending to the default main loop. The function is given the default idle priority, #G_PRIORITY_DEFAULT_IDLE. If the function -returns %FALSE it is automatically removed from the list of event -sources and will not be called again. - +Return value: the ID (greater than 0) of the event source. @@ -2124,14 +2771,37 @@ sources and will not be called again. - the id of the event source. + the ID (greater than 0) of the event source. + + +Appends a formatted string onto the end of a #GString. +This function is is similar to g_string_printf() except +that the text is appended to the #GString. + + + + + a #GString + + + + the string format. See the printf() documentation + + + + the parameters to insert into the format string + + + + + + -Returns a random #gdouble equally distributed over the range [0..1). - +Return value: A random number. @@ -2180,22 +2850,119 @@ Since: 2.4 - + -Creates a new empty #GKeyFile object. Use g_key_file_load_from_file(), -g_key_file_load_from_data() or g_key_file_load_from_data_dirs() to -read an existing key file. +Given a position @p with a UTF-8 encoded string @str, find the start +of the previous UTF-8 character starting before @p. Returns %NULL if no +UTF-8 characters are present in @str before @p. + +@p does not have to be at the beginning of a UTF-8 character. No check +is made to see if the character found is actually valid other than +it starts with an appropriate byte. + + pointer to the beginning of a UTF-8 encoded string + + + + pointer to some position within @str + + - an empty #GKeyFile. - -Since: 2.6 + a pointer to the found character or %NULL. + + +Like g_sequence_search(), but uses +a #GSequenceIterCompareFunc instead of a #GCompareDataFunc as +the compare function. + + + + + + a #GSequence + + + + data for the new item + + + + the #GSequenceIterCompare function used to compare iterators +in the sequence. It is called with two iterators pointing into @seq. +It should return 0 if the iterators are equal, a negative value if the +first iterator comes before the second, and a positive value if the +second iterator comes before the first. + + + + user data passed to @iter_cmp + + + + a #GSequenceIter pointing to the position in @seq +where @data would have been inserted according to @iter_cmp and @cmp_data. + +Since: 2.14 + + + + + +Moves the item pointed to by @src to the position indicated by @dest. +After calling this function @dest will point to the position immediately +after @src. It is allowed for @src and @dest to point into different +sequences. + +Since: 2.14 + + + + + a #GSequenceIter pointing to the item to move + + + + a #GSequenceIter pointing to the position to which +the item is moved. + + + + + + + + +Writes a formatted string into a #GString. +This function is similar to g_string_printf() except that +the arguments to the format string are passed as a va_list. + +Since: 2.14 + + + + + a #GString + + + + the string format. See the printf() documentation + + + + the parameters to insert into the format string + + + + + + Decreases the reference count on a #GMainContext object by one. If @@ -2222,10 +2989,118 @@ Gets the names of all variables set in the environment. a %NULL-terminated list of strings which must be freed with g_strfreev(). +Programs that want to be portable to Windows should typically use +this function and g_getenv() instead of using the environ array +from the C library directly. On Windows, the strings in the environ +array are in system codepage encoding, while in most of the typical +use cases for environment variables in GLib-using programs you want +the UTF-8 encoding that this function and g_getenv() provide. + Since: 2.8 + + +Sets a function to be called at regular intervals with the default +priority, #G_PRIORITY_DEFAULT. The function is called repeatedly until +it returns %FALSE, at which point the timeout is automatically destroyed +and the function will not be called again. + +See g_timeout_add_seconds_full() for the differences between +g_timeout_add() and g_timeout_add_seconds(). + + + + + + the time between calls to the function, in seconds + + + + function to call + + + + data to pass to @function + + + + the ID (greater than 0) of the event source. + +Since: 2.14 + + + + + +Sets the time the bookmark for @uri was added into @bookmark. + +If no bookmark for @uri is found then it is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + a timestamp or -1 to use the current time + + + + + + + + +Changes the data for the item pointed to by @iter to be @data. If +the sequence has a data destroy function associated with it, that +function is called on the existing data that @iter pointed to. + +Since: 2.14 + + + + + a #GSequenceIter + + + + new data for the item + + + + + + + + +Determines whether this thread holds the (recursive) +ownership of this #GMaincontext. This is useful to +know before waiting on another thread that may be +blocking to get ownership of @context. + + + + + + a #GMainContext + + + + %TRUE if current thread is owner of @context. + +Since: 2.10 + + + Return a random #guint32 equally distributed over the range @@ -2295,6 +3170,23 @@ calling the key and value destroy functions. + + +Return value: the length of @seq + + + + + a #GSequence + + + + the length of @seq + +Since: 2.14 + + + Sets the callback function storing the data as a refcounted callback @@ -2323,24 +3215,49 @@ and getting the callback and data - + -Creates a new option context. +Sets the value of a date from a #GTime value. + +@Deprecated:2.10: Use g_date_set_time_t() instead. + + + + + a #GDate. + + + + #GTime value to set. + + + + + + + + +Creates a new #GString with @len bytes of the @init buffer. +Because a length is provided, @init need not be nul-terminated, +and can contain embedded nul bytes. + +Since this function does not stop at nul bytes, it is the caller's +responsibility to ensure that @init has at least @len addressable +bytes. - - a string which is displayed in -the first line of &lt;option&gt;--help&lt;/option&gt; output, after -&lt;literal&gt;&lt;replaceable&gt;programname&lt;/replaceable&gt; [OPTION...]&lt;/literal&gt; + + initial contents of the string + + + + length of @init to use - a newly created #GOptionContext, which must be -freed with g_option_context_free() after use. - -Since: 2.6 + a new #GString @@ -2393,6 +3310,22 @@ Since: 2.8 + + +Frees all the memory associated with the #GMatchInfo structure. + +Since: 2.14 + + + + + a #GMatchInfo + + + + + + Looks whether the key file has the group @group_name. @@ -2415,32 +3348,34 @@ Since: 2.6 - + -Copies a block of memory @len bytes long, from @src to @dest. -The source and destination areas may overlap. +Duplicates the first @n bytes of a string, returning a newly-allocated +buffer @n + 1 bytes long which will always be nul-terminated. +If @str is less than @n bytes long the buffer is padded with nuls. +If @str is %NULL it returns %NULL. +The returned value should be freed when no longer needed. + +&lt;note&gt;&lt;para&gt; +To copy a number of characters from a UTF-8 encoded string, use +g_utf8_strncpy() instead. +&lt;/para&gt;&lt;/note&gt; -In order to use this function, you must include -&lt;filename&gt;string.h&lt;/filename&gt; yourself, because this macro will -typically simply resolve to memmove() and GLib does not include -&lt;filename&gt;string.h&lt;/filename&gt; for you. - - the destination address to copy the bytes to. + + the string to duplicate - - the source address to copy the bytes from. - - - - the number of bytes to copy. + + the maximum number of bytes to copy from @str - + a newly-allocated buffer containing the first @n bytes +of @str, nul-terminated + @@ -2462,8 +3397,7 @@ is empty. -Returns the first element of the queue. - +Returns: the data of the first element in the queue, or %NULL if the queue @@ -2507,6 +3441,93 @@ Since: 2.6 + + +Replaces all occurances of the pattern in @regex with the +replacement text. Backreferences of the form '\number' or +'\g&lt;number&gt;' in the replacement text are interpolated by the +number-th captured subexpression of the match, '\g&lt;name&gt;' refers +to the captured subexpression with the given name. '\0' refers to the +complete match, but '\0' followed by a number is the octal representation +of a character. To include a literal '\' in the replacement, write '\\'. +There are also escapes that changes the case of the following text: + +&lt;variablelist&gt; +&lt;varlistentry&gt;&lt;term&gt;\l&lt;/term&gt; +&lt;listitem&gt; +&lt;para&gt;Convert to lower case the next character&lt;/para&gt; +&lt;/listitem&gt; +&lt;/varlistentry&gt; +&lt;varlistentry&gt;&lt;term&gt;\u&lt;/term&gt; +&lt;listitem&gt; +&lt;para&gt;Convert to upper case the next character&lt;/para&gt; +&lt;/listitem&gt; +&lt;/varlistentry&gt; +&lt;varlistentry&gt;&lt;term&gt;\L&lt;/term&gt; +&lt;listitem&gt; +&lt;para&gt;Convert to lower case till \E&lt;/para&gt; +&lt;/listitem&gt; +&lt;/varlistentry&gt; +&lt;varlistentry&gt;&lt;term&gt;\U&lt;/term&gt; +&lt;listitem&gt; +&lt;para&gt;Convert to upper case till \E&lt;/para&gt; +&lt;/listitem&gt; +&lt;/varlistentry&gt; +&lt;varlistentry&gt;&lt;term&gt;\E&lt;/term&gt; +&lt;listitem&gt; +&lt;para&gt;End case modification&lt;/para&gt; +&lt;/listitem&gt; +&lt;/varlistentry&gt; +&lt;/variablelist&gt; + +If you do not need to use backreferences use g_regex_replace_literal(). + +The @replacement string must be UTF-8 encoded even if #G_REGEX_RAW was +passed to g_regex_new(). If you want to use not UTF-8 encoded stings +you can use g_regex_replace_literal(). + +Setting @start_position differs from just passing over a shortened +string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern that +begins with any kind of lookbehind assertion, such as "\b". + + + + + + a #GRegex structure + + + + the string to perform matches against + + + + the length of @string, or -1 if @string is nul-terminated + + + + starting index of the string to match + + + + text to replace each match with + + + + options for the match + + + + location to store the error occuring, or %NULL to ignore errors + + + + a newly allocated string containing the replacements + +Since: 2.14 + + + Sets the (writeable) flags in @channel to (@flags & %G_IO_CHANNEL_SET_MASK). @@ -2531,35 +3552,74 @@ Sets the (writeable) flags in @channel to (@flags & %G_IO_CHANNEL_SET_MASK). - + -Creates a new parse context. A parse context is used to parse -marked-up documents. You can feed any number of documents into -a context, as long as no errors occur; once an error occurs, -the parse context can't continue to parse text (you have to free it -and create a new parse context). +Adds the application with @name and @exec to the list of +applications that have registered a bookmark for @uri into +@bookmark. + +Every bookmark inside a #GBookmarkFile must have at least an +application registered. Each application must provide a name, a +command line useful for launching the bookmark, the number of times +the bookmark has been registered by the application and the last +time the application registered this bookmark. + +If @name is %NULL, the name of the application will be the +same returned by g_get_application(); if @exec is %NULL, the +command line will be a composition of the program name as +returned by g_get_prgname() and the "%u" modifier, which will be +expanded to the bookmark's URI. + +This function will automatically take care of updating the +registrations count and timestamping in case an application +with the same @name had already registered a bookmark for +@uri inside @bookmark. + +If no bookmark for @uri is found, one is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + the name of the application registering the bookmark +or %NULL + + + + command line to be used to launch the bookmark or %NULL + + + + + + + + +Looks up the #GUnicodeScript for a particular character (as defined +by Unicode Standard Annex #24). No check is made for @ch being a +valid Unicode character; if you pass in invalid character, the +result is undefined. - - a #GMarkupParser - - - - one or more #GMarkupParseFlags - - - - user data to pass to #GMarkupParser functions - - - - user data destroy notifier called when the parse context is freed + + a Unicode character - a new #GMarkupParseContext + the #GUnicodeScript for the character. + +Since: 2.14 @@ -2594,6 +3654,61 @@ Closes the directory and deallocates all related resources. + + +Appends @len bytes of @val to @string. Because @len is +provided, @val may contain embedded nuls and need not +be nul-terminated. + +Since this function does not stop at nul bytes, it is +the caller's responsibility to ensure that @val has at +least @len addressable bytes. + + + + + + a #GString + + + + bytes to append + + + + number of bytes of @val to use + + + + @string + + + + + +Returns: A newly allocated string containing the help text + + + + + a #GOptionContext + + + + if %TRUE, only include the main group + + + + the #GOptionGroup to create help for, or %NULL + + + + A newly allocated string containing the help text + +Since: 2.14 + + + Inserts a new element into @queue at the given position @@ -2664,6 +3779,58 @@ with g_utf8_get_char(). + + +Incrementally encode a sequence of binary data into it's Base-64 stringified +representation. By calling this function multiple times you can convert +data in chunks to avoid having to have the full encoded data in memory. + +When all of the data has been converted you must call +g_base64_encode_close() to flush the saved state. + +The output buffer must be large enough to fit all the data that will +be written to it. Due to the way base64 encodes you will need +at least: @len * 4 / 3 + 6 bytes. If you enable line-breaking you will +need at least: @len * 4 / 3 + @len * 4 / (3 * 72) + 7 bytes. + +@break_lines is typically used when putting base64-encoded data in emails. +It breaks the lines at 72 columns instead of putting all of the text on +the same line. This avoids problems with long lines in the email system. + + + + + + the binary data to encode + + + + the length of @in + + + + whether to break long lines + + + + pointer to destination buffer + + + + Saved state between steps, initialize to 0 + + + + Saved state between steps, initialize to 0 + + + + The number of bytes of output that was written + +Since: 2.12 + + + Creates a new #GMainContext strcuture @@ -2723,61 +3890,71 @@ was large enough. - + -This function creates a new thread pool. - -Whenever you call g_thread_pool_push(), either a new thread is -created or an unused one is reused. At most @max_threads threads -are running concurrently for this thread pool. @max_threads = -1 -allows unlimited threads to be created for this thread pool. The -newly created or reused thread now executes the function @func with -the two arguments. The first one is the parameter to -g_thread_pool_push() and the second one is @user_data. - -The parameter @exclusive determines, whether the thread pool owns -all threads exclusive or whether the threads are shared -globally. If @exclusive is %TRUE, @max_threads threads are started -immediately and they will run exclusively for this thread pool until -it is destroyed by g_thread_pool_free(). If @exclusive is %FALSE, -threads are created, when needed and shared between all -non-exclusive thread pools. This implies that @max_threads may not -be -1 for exclusive thread pools. - -@error can be %NULL to ignore errors, or non-%NULL to report -errors. An error can only occur when @exclusive is set to %TRUE and -not all @max_threads threads could be created. +Converts a string containing an ISO 8601 encoded date and time +to a #GTimeVal and puts it into @time_. - - a function to execute in the threads of the new thread pool + + a ISO 8601 encoded date string - - user data that is handed over to @func every time it -is called - - - - the maximal number of threads to execute concurrently in -the new thread pool, -1 means no limit - - - - should this thread pool be exclusive? - - - - return location for error + + a #GTimeVal - the new #GThreadPool + %TRUE if the conversion was successful. + +Since: 2.12 + + +Converts all lower case ASCII letters to upper case ASCII letters. + + + + + + a string. + + + + length of @str in bytes, or -1 if @str is nul-terminated. + + + + a newly allocated string, with all the lower case +characters in @str converted to upper case, with +semantics that exactly match g_ascii_toupper(). (Note +that this is unlike the old g_strup(), which modified +the string in place.) + + + + + +Pushes the @data into the @queue. @data must not be %NULL. + + + + + a #GAsyncQueue. + + + + @data to push into the @queue. + + + + + + Converts a string to a #gdouble value. @@ -2811,35 +3988,7 @@ the last character used in the conversion. -Returns an ordered list of base directories in which to access -system-wide application data. - -On UNIX platforms this is determined using the mechanisms described in -the &lt;ulink url="http://www.freedesktop.org/Standards/basedir-spec"&gt; -XDG Base Directory Specification&lt;/ulink&gt; - -On Windows the first elements in the list are the Application Data -and Documents folders for All Users. (These can be determined only -on Windows 2000 or later and are not present in the list on other -Windows versions.) See documentation for CSIDL_COMMON_APPDATA and -CSIDL_COMMON_DOCUMENTS. - -Then follows the "share" subfolder in the installation folder for -the package containing the DLL that calls this function, if it can -be determined. - -Finally the list contains the "share" subfolder in the installation -folder for GLib, and in the installation folder for the package the -application's .exe file belongs to. - -The installation folders above are determined by looking up the -folder where the module (DLL or EXE) in question is located. If the -folder's name is "bin", its parent is used, otherwise the folder -itself. - -Note that on Windows the returned list can vary depending on where -this function is called. - +Return value: a %NULL-terminated array of strings owned by GLib that must @@ -2850,6 +3999,49 @@ Since: 2.6 + + +Return value: A negative number if @a comes before @b, 0 if they are + + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + A negative number if @a comes before @b, 0 if they are +equal, and a positive number if @a comes after @b. + +Since: 2.14 + + + + + +Adds a string on to the start of a #GString, +expanding it if necessary. + + + + + + a #GString + + + + the string to prepend on the start of @string + + + + @string + + + Expires as many unused cache buckets as it needs to in order to get @@ -2884,9 +4076,7 @@ to the string. -Returns whether unknown options are ignored or not. See -g_option_context_set_ignore_unknown_options(). - +Returns: %TRUE if unknown options are ignored. @@ -2901,11 +4091,79 @@ Since: 2.6 + + +Breaks the string on the pattern, and returns an array of the tokens. +If the pattern contains capturing parentheses, then the text for each +of the substrings will also be returned. If the pattern does not match +anywhere in the string, then the whole string is returned as the first +token. + +As a special case, the result of splitting the empty string "" is an +empty vector, not a vector containing a single string. The reason for +this special case is that being able to represent a empty vector is +typically more useful than consistent handling of empty elements. If +you do need to represent empty elements, you'll need to check for the +empty string before calling this function. + +A pattern that can match empty strings splits @string into separate +characters wherever it matches the empty string between characters. +For example splitting "ab c" using as a separator "\s*", you will get +"a", "b" and "c". + +Setting @start_position differs from just passing over a shortened +string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern +that begins with any kind of lookbehind assertion, such as "\b". + + + + + + a #GRegex structure + + + + the string to split with the pattern + + + + the length of @string, or -1 if @string is nul-terminated + + + + starting index of the string to match + + + + match time option flags + + + + the maximum number of tokens to split @string into. +If this is less than 1, the string is split completely + + + + return location for a #GError + + + + a %NULL-terminated gchar ** array. Free it using g_strfreev() + +Since: 2.14 + + + Converts from an integer character offset to a pointer to a position within the string. +Since 2.10, this function allows to pass a negative @offset to +step backwards. It is usually worth stepping backwards from the end +instead of forwards if @offset is in the last fourth of the string, +since moving forward is about 3 times faster than moving backward. + @@ -2943,15 +4201,7 @@ owned by GLib and must not be freed. -Returns the value associated with @key under @group_name -translated in the given @locale if available. If @locale is -%NULL then the current locale is assumed. - -If @key cannot be found then %NULL is returned and @error is set to -#G_KEY_FILE_ERROR_KEY_NOT_FOUND. If the value associated -with @key cannot be interpreted or no suitable translation can -be found then the untranslated value is returned. - +Return value: a newly allocated string or %NULL if the specified @@ -2983,30 +4233,53 @@ Since: 2.6 - + -Searches the string @haystack for the first occurrence -of the string @needle, limiting the length of the search -to @haystack_len. +Inserts a new item just before the item pointed to by @iter. - - a string. + + a #GSequenceIter - - the maximum length of @haystack. - - - - the string to search for. + + the data for the new item - a pointer to the found occurrence, or -%NULL if not found. + an iterator pointing to the new item + +Since: 2.14 + + + + + +Loads a desktop bookmark file into an empty #GBookmarkFile structure. +If the file could not be loaded then @error is set to either a #GFileError +or #GBookmarkFileError. + + + + + + an empty #GBookmarkFile struct + + + + the path of a filename to load, in the GLib file name encoding + + + + return location for a #GError, or %NULL + + + + %TRUE if a desktop bookmark file could be loaded + +Since: 2.12 @@ -3040,6 +4313,36 @@ Since: 2.8 + + +Retrieves the text matching the capturing parentheses named @name. + +If @name is a valid sub pattern name but it didn't match anything +(e.g. sub pattern "X", matching "b" against "(?P&lt;X&gt;a)?b") +then an empty string is returned. + +The string is fetched from the string passed to the match function, +so you cannot call this function after freeing the string. + + + + + + #GMatchInfo structure + + + + name of the subexpression + + + + The matched substring, or %NULL if an error occurred. +You have to free the string yourself + +Since: 2.14 + + + Determines if a character is a hexidecimal digit. @@ -3056,6 +4359,38 @@ Determines if a character is a hexidecimal digit. + + +Creates a new parse context. A parse context is used to parse +marked-up documents. You can feed any number of documents into +a context, as long as no errors occur; once an error occurs, +the parse context can't continue to parse text (you have to free it +and create a new parse context). + + + + + + a #GMarkupParser + + + + one or more #GMarkupParseFlags + + + + user data to pass to #GMarkupParser functions + + + + user data destroy notifier called when the parse context is freed + + + + a new #GMarkupParseContext + + + Associates a new boolean value with @key under @group_name. @@ -3085,62 +4420,74 @@ Since: 2.6 - + -Converts a pointer to a #gint to a hash value. -It can be passed to g_hash_table_new() as the @hash_func parameter, -when using pointers to integers values as keys in a #GHashTable. +Frees all strings contained within the #GStringChunk. +After calling g_string_chunk_clear() it is not safe to +access any of the strings which were contained within it. +Since: 2.14 - - a pointer to a #gint key + + a #GStringChunk - a hash value corresponding to the key. - + - + -Convert a string from a 32-bit fixed width representation as UCS-4. -to UTF-8. The result will be terminated with a 0 byte. +Adds @group to the list of groups to which the bookmark for @uri +belongs to. + +If no bookmark for @uri is found then it is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + the group name to be added + + + + + + + + +Removes the bookmark for @uri from the bookmark file @bookmark. - - a UCS-4 encoded string + + a #GBookmarkFile - - the maximum length of @str to use. If @len &lt; 0, then -the string is terminated with a 0 character. - - - - location to store number of characters read read, or %NULL. - - - - location to store number of bytes written or %NULL. -The value here stored does not include the trailing 0 -byte. + + a valid URI - location to store the error occuring, or %NULL to ignore -errors. Any of the errors in #GConvertError other than -%G_CONVERT_ERROR_NO_CONVERSION may occur. + return location for a #GError, or %NULL - a pointer to a newly allocated UTF-8 string. -This value must be freed with g_free(). If an -error occurs, %NULL will be returned and -@error set. + %TRUE if the bookmark was removed successfully. + +Since: 2.12 @@ -3180,9 +4527,31 @@ Since: 2.4 + + +Adds a new item to the front of @seq + + + + + + a #GSequence + + + + the data for the new item + + + + an iterator pointing to the new item + +Since: 2.14 + + + -Convert a string from UTF-8 to UTF-16. A 0 word will be +Convert a string from UTF-8 to UTF-16. A 0 character will be added to the result after the converted text. @@ -3193,8 +4562,8 @@ added to the result after the converted text. - the maximum length of @str to use. If @len &lt; 0, then -the string is nul-terminated. + the maximum length (number of characters) of @str to use. +If @len &lt; 0, then the string is nul-terminated. @@ -3206,9 +4575,9 @@ invalid input is stored here. - location to store number of words written, or %NULL. -The value stored here does not include the trailing -0 word. + location to store number of &lt;type&gt;gunichar2&lt;/type&gt; written, +or %NULL. +The value stored here does not include the trailing 0. @@ -3251,10 +4620,37 @@ the number of elements in @queue, the link is added to the end of + + +Call @thread_func on all existing #GThread structures. Note that +threads may decide to exit while @thread_func is running, so +without intimate knowledge about the lifetime of foreign threads, +@thread_func shouldn't access the GThread* pointer passed in as +first argument. However, @thread_func will not be called for threads +which are known to have exited already. + +Due to thread lifetime checks, this function has an execution complexity +which is quadratic in the number of existing threads. + +Since: 2.10 + + + + + function to call for all GThread structures + + + + second argument to @thread_func + + + + + + -Returns the last element of the queue. - +Returns: the data of the last element in the queue, or %NULL if the queue @@ -3306,10 +4702,14 @@ hold the lock to call this function. -Sets a function to be called when the child indicated by @pid exits, at a -default priority, #G_PRIORITY_DEFAULT. +Sets a function to be called when the child indicated by @pid +exits, at the priority @priority. -Note that on platforms where #GPid must be explicitely closed +If you obtain @pid from g_spawn_async() or g_spawn_async_with_pipes() +you will need to pass #G_SPAWN_DO_NOT_REAP_CHILD as flag to +the spawn function for the child watching to work. + +Note that on platforms where #GPid must be explicitly closed (see g_spawn_close_pid()) @pid must not be closed while the source is still active. Typically, you will want to call g_spawn_close_pid() in the callback function for the source. @@ -3341,12 +4741,64 @@ range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. - the id of event source. + the ID (greater than 0) of the event source. Since: 2.4 + + +Return value: the values associated with the key as a list of + + + + + a #GKeyFile + + + + a group name + + + + a key + + + + the number of doubles returned + + + + return location for a #GError + + + + the values associated with the key as a list of +doubles, or %NULL if the key was not found or could not be parsed. + +Since: 2.12 + + + + + +Return value: a #GSequenceIter pointing to the previous position before + + + + + a #GSequenceIter + + + + a #GSequenceIter pointing to the previous position before +@iter. + +Since: 2.14 + + + Frees context and all the groups which have been @@ -3389,7 +4841,7 @@ file). %G_IO_ERROR_NONE if the operation was successful. -Deprecated: Use g_io_channel_seek_position() instead. +Deprecated:2.2: Use g_io_channel_seek_position() instead. @@ -3419,11 +4871,8 @@ converted to lowercase. -A wrapper for the POSIX stat() function. The stat() function -returns information about a file. - -See the C library manual for more details about stat(). - +A wrapper for the POSIX stat() function. The stat() function +Returns: 0 if the information was successfully retrieved, -1 if an error @@ -3444,19 +4893,63 @@ Since: 2.6 + + +Retrieves the number of matched substrings (including substring 0, +that is the whole matched text), so 1 is returned if the pattern +has no substrings in it and 0 is returned if the match failed. + +If the last match was obtained using the DFA algorithm, that is +using g_regex_match_all() or g_regex_match_all_full(), the retrieved +count is not that of the number of capturing parentheses but that of +the number of matched substrings. + + + + + + a #GMatchInfo structure + + + + Number of matched substrings, or -1 if an error occurred + +Since: 2.14 + + + + + +Opens a temporary file. See the mkstemp() documentation +on most UNIX-like systems. + +The parameter is a string that should follow the rules for +mkstemp() templates, i.e. contain the string "XXXXXX". +g_mkstemp() is slightly more flexible than mkstemp() +in that the sequence does not have to occur at the very end of the +template. The X string will +be modified to form the name of a file that didn't exist. +The string should be in the GLib file name encoding. Most importantly, +on Windows it should be in UTF-8. + + + + + + template filename + + + + A file handle (as from open()) to the file +opened for reading and writing. The file is opened in binary mode +on platforms where there is a difference. The file handle should be +closed with close(). In case of errors, -1 is returned. + + + -Returns the display basename for the particular filename, guaranteed -to be valid UTF-8. The display name might not be identical to the filename, -for instance there might be problems converting it to UTF-8, and some files -can be translated in the display - -You must pass the whole absolute pathname to this functions so that -translation of well known locations can be done. - -This function is preferred over g_filename_display_name() if you know the -whole path, as it allows translation. - +Return value: a newly allocated string containing @@ -3472,6 +4965,33 @@ Since: 2.6 + + +This function outputs @bookmark into a file. The write process is +guaranteed to be atomic by using g_file_set_contents() internally. + + + + + + a #GBookmarkFile + + + + path of the output file + + + + return location for a #GError, or %NULL + + + + %TRUE if the file was successfully written. + +Since: 2.12 + + + Turns on flag values for a data list. This function is used @@ -3481,6 +5001,8 @@ not generally useful except in circumstances where space is very tight. (It is used in the base #GObject type, for example.) +Since: 2.8 + @@ -3512,11 +5034,7 @@ being validated otherwise). Note that g_utf8_validate() returns %FALSE if @max_len is positive and NUL is met before @max_len bytes have been read. -Returns %TRUE if all of @str was valid. Many GLib and GTK+ -routines &lt;emphasis&gt;require&lt;/emphasis&gt; valid UTF-8 as input; -so data read from a file or the network should be checked -with g_utf8_validate() before doing anything else with it. - +Return value: %TRUE if the text was valid UTF-8 @@ -3542,6 +5060,8 @@ with g_utf8_validate() before doing anything else with it. Creates a new cache bucket, inserts it into the cache and increments the cache size. +This assumes ownership of @key. + @@ -3558,23 +5078,28 @@ increments the cache size. - + -Creates a new #GTree. +Creates a new timeout source. + +The source will not initially be associated with any #GMainContext +and must be added to one with g_source_attach() before it will be +executed. + +The scheduling granularity/accuracy of this timeout source will be +in seconds. - - the function used to order the nodes in the #GTree. -It should return values similar to the standard strcmp() function - -0 if the two arguments are equal, a negative value if the first argument -comes before the second, or a positive value if the first argument comes -after the second. + + the timeout interval in seconds - a new #GTree. + the newly-created timeout source + +Since: 2.14 @@ -3583,9 +5108,13 @@ after the second. Converts a string into a collation key that can be compared with other collation keys produced by the same function using strcmp(). + The results of comparing the collation keys of two strings -with strcmp() will always be the same as -comparing the two original keys with g_utf8_collate(). +with strcmp() will always be the same as comparing the two +original keys with g_utf8_collate(). + +Note that this function depends on the +&lt;link linkend="setlocale"&gt;current locale&lt;/link&gt;. @@ -3604,17 +5133,53 @@ be freed with g_free() when you are done with it. + + +Pops data from the @queue. If no data is received before @end_time, +%NULL is returned. This function must be called while holding the +@queue's lock. + +To easily calculate @end_time a combination of g_get_current_time() +and g_time_val_add() can be used. + + + + + + a #GAsyncQueue. + + + + a #GTimeVal, determining the final time. + + + + data from the queue or %NULL, when no data is +received before @end_time. + + + + + +Sets the buffer size. + + + + + a #GIOChannel + + + + the size of the buffer. 0 == pick a good size + + + + + + -Returns the value associated with @key under @group_name as an -integer. If @group_name is %NULL, the start_group is used. - -If @key cannot be found then the return value is undefined and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if -the value associated with @key cannot be interpreted as an integer -then the return value is also undefined and @error is set to -#G_KEY_FILE_ERROR_INVALID_VALUE. - +Return value: the value associated with the key as an integer, or @@ -3635,7 +5200,8 @@ then the return value is also undefined and @error is set to - the value associated with the key as an integer. + the value associated with the key as an integer, or +0 if the key was not found or could not be parsed. Since: 2.6 @@ -3650,13 +5216,14 @@ out from right to left. For instance, "(" would become its mirror imag If @ch has the Unicode mirrored property and there is another unicode character that typically has a glyph that is the mirror image of @ch's -glyph, puts that character in the address pointed to by @mirrored_ch. +glyph and @mirrored_ch is set, it puts that character in the address +pointed to by @mirrored_ch. Otherwise the original character is put. - a unicode character + a Unicode character @@ -3664,8 +5231,7 @@ glyph, puts that character in the address pointed to by @mirrored_ch. - %TRUE if @ch has a mirrored character and @mirrored_ch is -filled in, %FALSE otherwise + %TRUE if @ch has a mirrored character, %FALSE otherwise Since: 2.4 @@ -3706,6 +5272,24 @@ be a relative path. + + +Determines the canonical combining class of a Unicode character. + + + + + + a Unicode character + + + + the combining class of the character + +Since: 2.14 + + + Converts a string from one character set to another. @@ -3788,6 +5372,27 @@ on a %NULL value, g_strdupv() simply returns %NULL. + + +Adds a string onto the end of a #GString, expanding +it if necessary. + + + + + + a #GString + + + + the string to append onto the end of @string + + + + @string + + + Converts a #gdouble to a string, using the '.' as @@ -3819,6 +5424,46 @@ be larger than @G_ASCII_DTOSTR_BUF_SIZE bytes. + + +Gets the number of bookmarks inside @bookmark. + + + + + + a #GBookmarkFile + + + + the number of bookmarks + +Since: 2.12 + + + + + +Return value: a newly allocated %NULL-terminated array of strings. + + + + + a #GBookmarkFile + + + + return location for the number of returned URIs, or %NULL + + + + a newly allocated %NULL-terminated array of strings. +Use g_strfreev() to free it. + +Since: 2.12 + + + Checks that the GLib library in use is compatible with the @@ -3844,11 +5489,11 @@ version @required_major.required_minor.@required_micro - the required major version. + the required minor version. - the required major version. + the required micro version. @@ -3887,7 +5532,7 @@ Writes data to a #GIOChannel. %G_IO_ERROR_NONE if the operation was successful. -Deprecated: Use g_io_channel_write_chars() instead. +Deprecated:2.2: Use g_io_channel_write_chars() instead. @@ -3929,6 +5574,42 @@ Since: 2.6 + + +Like g_sequence_insert_sorted(), but uses +a #GSequenceIterCompareFunc instead of a #GCompareDataFunc as +the compare function. + + + + + + a #GSequence + + + + data for the new item + + + + the #GSequenceItercompare used to compare iterators in the +sequence. It is called with two iterators pointing into @seq. It should +return 0 if the iterators are equal, a negative value if the first +iterator comes before the second, and a positive value if the second +iterator comes before the first. + + + + user data passed to @cmp_func + + + + a #GSequenceIter pointing to the new item + +Since: 2.14 + + + Finds a source with the given user data for the callback. If @@ -3970,6 +5651,22 @@ more than one element. + + +Creates a hash code for @str; for use with #GHashTable. + + + + + + a string to hash + + + + hash code for @str + + + An implementation of the standard vsprintf() function which supports @@ -4016,51 +5713,50 @@ available immediately. - + -See g_spawn_async_with_pipes() for a full description; this function -simply calls the g_spawn_async_with_pipes() without any pipes. +Determines whether a character is a control character. +Given some UTF-8 text, obtain a character value with +g_utf8_get_char(). - - child's current working directory, or %NULL to inherit parent's - - - - child's argument vector - - - - child's environment, or %NULL to inherit parent's - - - - flags from #GSpawnFlags - - - - function to run in the child just before exec() - - - - user data for @child_setup - - - - return location for child process ID, or %NULL - - - - return location for error + + a Unicode character - %TRUE on success, %FALSE if error is set + %TRUE if @c is a control character + + +Appends a formatted string onto the end of a #GString. +This function is is similar to g_string_sprintf() except that +the text is appended to the #GString. + +Deprecated: This function has been renamed to g_string_append_printf() + + + + + a #GString + + + + the string format. See the sprintf() documentation + + + + the parameters to insert into the format string + + + + + + Converts a filename from UTF-8 to the system codepage. @@ -4162,8 +5858,7 @@ be %NULL. A new #GError is created and assigned to *@err. -Returns the first link in @queue - +Return value: the first link in @queue, or %NULL if @queue is empty @@ -4178,19 +5873,41 @@ Since: 2.4 - + -Sets the seed for the global random number generator, which is used -by the &lt;function&gt;g_random_*&lt;/function&gt; functions, to @seed. +Creates a new child_watch source. + +The source will not initially be associated with any #GMainContext +and must be added to one with g_source_attach() before it will be +executed. + +Note that child watch sources can only be used in conjunction with +&lt;literal&gt;g_spawn...&lt;/literal&gt; when the %G_SPAWN_DO_NOT_REAP_CHILD +flag is used. + +Note that on platforms where #GPid must be explicitly closed +(see g_spawn_close_pid()) @pid must not be closed while the +source is still active. Typically, you will want to call +g_spawn_close_pid() in the callback function for the source. + +Note further that using g_child_watch_source_new() is not +compatible with calling &lt;literal&gt;waitpid(-1)&lt;/literal&gt; in +the application. Calling waitpid() for individual pids will +still work fine. + - - a value to reinitialize the global random number generator. + + process id of a child process to watch. On Windows, a HANDLE +for the process to watch (which actually doesn't have to be a child). - + the newly-created child watch source + +Since: 2.4 + @@ -4252,8 +5969,7 @@ Since: 2.8 -Returns the maximal allowed number of unused threads. - +Return value: the maximal number of unused threads @@ -4321,11 +6037,15 @@ have a default priority of %G_PRIORITY_DEFAULT. -Adds a copy of the first @len bytes of @string to the #GStringChunk. The -copy is nul-terminated. +Adds a copy of the first @len bytes of @string to the #GStringChunk. +The copy is nul-terminated. -The characters in the string can be changed, if necessary, though you -should not change anything after the end of the string. +Since this function does not stop at nul bytes, it is the caller's +responsibility to ensure that @string has at least @len addressable +bytes. + +The characters in the returned string can be changed, if necessary, +though you should not change anything after the end of the string. @@ -4340,7 +6060,7 @@ should not change anything after the end of the string. number of bytes of @string to insert, or -1 to insert a -nul-terminated string. +nul-terminated string @@ -4350,6 +6070,78 @@ Since: 2.4 + + +Like g_sequence_sort_changed(), but uses +a #GSequenceIterCompareFunc instead of a #GCompareDataFunc as +the compare function. + +Since: 2.14 + + + + + a #GSequenceIter + + + + the #GSequenceItercompare used to compare iterators in the +sequence. It is called with two iterators pointing into @seq. It should +return 0 if the iterators are equal, a negative value if the first +iterator comes before the second, and a positive value if the second +iterator comes before the first. + + + + user data passed to @cmp_func + + + + + + + + +Converts a string to a #guint64 value. +This function behaves like the standard strtoull() function +does in the C locale. It does this without actually +changing the current locale, since that would not be +thread-safe. + +This function is typically used when reading configuration +files or other non-user input that should be locale independent. +To handle input from the user you should normally use the +locale-sensitive system strtoull() function. + +If the correct value would cause overflow, %G_MAXUINT64 +is returned, and %ERANGE is stored in %errno. If the base is +outside the valid range, zero is returned, and %EINVAL is stored +in %errno. If the string conversion fails, zero is returned, and +@endptr returns @nptr (if @endptr is non-%NULL). + + + + + + the string to convert to a numeric value. + + + + if non-%NULL, it returns the character after +the last character used in the conversion. + + + + to be used for the conversion, 2..36 or 0 + + + + the #guint64 value or zero on error. + +Since: 2.2 + + + Determines if a given character is assigned in the Unicode @@ -4392,17 +6184,35 @@ Since: 2.4 + + +Sets the private flag of the bookmark for @uri. + +If a bookmark for @uri cannot be found then it is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + %TRUE if the bookmark should be marked as private + + + + + + -Returns the value associated with @key under @group_name as a -boolean. - -If @key cannot be found then the return value is undefined and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if -the value associated with @key cannot be interpreted as a boolean -then the return value is also undefined and @error is set to -#G_KEY_FILE_ERROR_INVALID_VALUE. - +Return value: the value associated with the key as a boolean, or @@ -4423,17 +6233,60 @@ then the return value is also undefined and @error is set to - the value associated with the key as a boolean + the value associated with the key as a boolean, or +%FALSE if the key was not found or could not be parsed. + Since: 2.6 + + +Sorts @queue using @func. + +This function will lock @queue before it sorts the queue and unlock +it when it is finished. + +If you were sorting a list of priority numbers to make sure the +lowest priority would be at the top of the queue, you could use: +&lt;informalexample&gt;&lt;programlisting&gt; +gint32 id1; +gint32 id2; + +id1 = GPOINTER_TO_INT (element1); +id2 = GPOINTER_TO_INT (element2); + +return (id1 &gt; id2 ? +1 : id1 == id2 ? 0 : -1); +&lt;/programlisting&gt;&lt;/informalexample&gt; + +Since: 2.10 + + + + + a #GAsyncQueue + + + + the #GCompareDataFunc is used to sort @queue. This +function is passed two elements of the @queue. The function +should return 0 if they are equal, a negative value if the +first element should be higher in the @queue or a positive +value if the first element should be lower in the @queue than +the second element. + + + + user data passed to @func + + + + + + -Returns %TRUE if the given @file_name is an absolute file name, -i.e. it contains a full path from the root directory such as "/usr/local" -on UNIX or "C:\windows" on Windows systems. - +Returns: %TRUE if @file_name is an absolute path. @@ -4446,6 +6299,67 @@ on UNIX or "C:\windows" on Windows systems. + + +Prepends @len bytes of @val to @string. +Because @len is provided, @val may contain +embedded nuls and need not be nul-terminated. + +Since this function does not stop at nul bytes, +it is the caller's responsibility to ensure that +@val has at least @len addressable bytes. + + + + + + a #GString + + + + bytes to prepend + + + + number of bytes in @val to prepend + + + + @string + + + + + +Overwrites part of a string, lengthening it if necessary. +This function will work with embedded nuls. + + + + + + a #GString + + + + the position at which to start overwriting + + + + the string that will overwrite the @string starting at @pos + + + + the number of bytes to write from @val + + + + @string + +Since: 2.14 + + + Checks to see if the main loop is currently being run via g_main_loop_run(). @@ -4462,9 +6376,52 @@ Checks to see if the main loop is currently being run via g_main_loop_run(). + + +Return value: a newly allocated string or %NULL if the specified + + + + + a #GBookmarkFile + + + + a valid URI or %NULL + + + + return location for a #GError, or %NULL + + + + a newly allocated string or %NULL if the specified +URI cannot be found. + +Since: 2.12 + + + + + +Creates a new #GString, initialized with the given string. + + + + + + the initial text to copy into the string + + + + the new #GString + + + -Converts an absolute filename to an escaped ASCII-encoded URI. +Converts an absolute filename to an escaped ASCII-encoded URI, with the path +component following Section 3.3. of RFC 2396. @@ -4504,9 +6461,9 @@ Converts a #GString to lowercase. the #GString. -Deprecated: This function uses the locale-specific tolower() function, -which is almost never the right thing. Use g_string_ascii_down() or -g_utf8_strdown() instead. +Deprecated:2.2: This function uses the locale-specific +tolower() function, which is almost never the right thing. +Use g_string_ascii_down() or g_utf8_strdown() instead. @@ -4524,47 +6481,51 @@ Converts a string to upper case. the string -Deprecated: This function is totally broken for the reasons discussed in -the g_strncasecmp() docs - use g_ascii_strup() or g_utf8_strup() instead. +Deprecated:2.2: This function is totally broken for the reasons discussed +in the g_strncasecmp() docs - use g_ascii_strup() or g_utf8_strup() instead. - + -Removes a key and its associated value from a #GTree without calling -the key and value destroy functions. - -If the key does not exist in the #GTree, the function does nothing. - +Returns: ISO 8601 week number of the year. - - a #GTree. - - - - the key to remove. + + a valid #GDate - %TRUE if the key was found (prior to 2.8, this function returned nothing) + ISO 8601 week number of the year. + +Since: 2.6 Try to determine the installation directory for a software package. -Typically used by GNU software packages. @package should be a short identifier for the package. Typically it is the same identifier as used for -&lt;literal&gt;GETTEXT_PACKAGE&lt;/literal&gt; in software configured according -to GNU standards. The function first looks in the Windows Registry -for the value &lt;literal&gt;&num;InstallationDirectory&lt;/literal&gt; in the key +&lt;literal&gt;GETTEXT_PACKAGE&lt;/literal&gt; in software configured using GNU +autotools. The function first looks in the Windows Registry for the +value &lt;literal&gt;&num;InstallationDirectory&lt;/literal&gt; in the key &lt;literal&gt;&num;HKLM\Software\@package&lt;/literal&gt;, and if that value exists and is a string, returns that. +It is strongly recommended that packagers of GLib-using libraries +for Windows do not store installation paths in the Registry to be +used by this function as that interfers with having several +parallel installations of the library. Parallel installations of +different versions of some GLib-using library, or GLib itself, +might well be desirable for various reasons. + +For the same reason it is recommeded to always pass %NULL as +@package to this function, to avoid the temptation to use the +Registry. + If @package is %NULL, or the above value isn't found in the Registry, but @dll_name is non-%NULL, it should name a DLL loaded into the current process. Typically that would be the name of the @@ -4598,29 +6559,21 @@ needed any longer. - + -Returns whether automatic &lt;option&gt;--help&lt;/option&gt; generation -is turned on for @context. See g_option_context_set_help_enabled(). - +Stops all currently unused threads. This does not change the +maximal number of unused threads. This function can be used to +regularly stop all unused threads e.g. from g_timeout_add(). - - a #GOptionContext - - - %TRUE if automatic help generation is turned on. - -Since: 2.6 - + -Returns the number of elements contained in the #GHashTable. - +Return value: the number of key/value pairs in the #GHashTable. @@ -4677,6 +6630,55 @@ Gets the priority of a source. + + +Replaces all occurances of the pattern in @regex with the +replacement text. @replacement is replaced literally, to +include backreferences use g_regex_replace(). + +Setting @start_position differs from just passing over a +shortened string and setting #G_REGEX_MATCH_NOTBOL in the +case of a pattern that begins with any kind of lookbehind +assertion, such as "\b". + + + + + + a #GRegex structure + + + + the string to perform matches against + + + + the length of @string, or -1 if @string is nul-terminated + + + + starting index of the string to match + + + + text to replace each match with + + + + options for the match + + + + location to store the error occuring, or %NULL to ignore errors + + + + a newly allocated string containing the replacements + +Since: 2.14 + + + Finds the first link in @queue which contains @data. @@ -4699,6 +6701,58 @@ Since: 2.4 + + +Creates a new empty #GBookmarkFile object. + +Use g_bookmark_file_load_from_file(), g_bookmark_file_load_from_data() +or g_bookmark_file_load_from_data_dirs() to read an existing bookmark +file. + + + + + + an empty #GBookmarkFile + +Since: 2.12 + + + + + +Checks whether the bookmark for @uri inside @bookmark has been +registered by application @name. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + the name of the application + + + + return location for a #GError or %NULL + + + + %TRUE if the application @name was found + +Since: 2.12 + + + Removes and returns the link at the given position. @@ -4760,44 +6814,41 @@ available. - + -Returns the values associated with @key under @group_name as -integers. - -If @key cannot be found then the return value is undefined and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if -the values associated with @key cannot be interpreted as integers -then the return value is also undefined and @error is set to -#G_KEY_FILE_ERROR_INVALID_VALUE. +Decreases the reference count of the asynchronous @queue by 1 and +releases the lock. This function must be called while holding the +@queue's lock. If the reference count went to 0, the @queue will be +destroyed and the memory allocated will be freed. +@Deprecated: Since 2.8, reference counting is done atomically +so g_async_queue_unref() can be used regardless of the @queue's +lock. - - a #GKeyFile - - - - a group name - - - - a key - - - - the number of integers returned - - - - return location for a #GError + + a #GAsyncQueue. - the values associated with the key as a integer + + -Since: 2.6 + + +Returns: the description + + + + + a #GOptionContext + + + + the description + +Since: 2.12 @@ -4824,6 +6875,59 @@ without having to repeatedly scan for the end. + + +Inserts a byte into a #GString, expanding it if necessary. + + + + + + a #GString + + + + the position to insert the byte + + + + the byte to insert + + + + @string + + + + + +Gets the time the bookmark for @uri was added to @bookmark + +In the event the URI cannot be found, -1 is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + return location for a #GError, or %NULL + + + + a timestamp + +Since: 2.12 + + + Close an IO channel. Any pending data to be written will be @@ -4852,7 +6956,7 @@ last reference is dropped using g_io_channel_unref(). -Convert a string from UCS-4 to UTF-16. A 0 word will be +Convert a string from UCS-4 to UTF-16. A 0 character will be added to the result after the converted text. @@ -4863,8 +6967,8 @@ added to the result after the converted text. - the maximum length of @str to use. If @len &lt; 0, then -the string is terminated with a 0 character. + the maximum length (number of characters) of @str to use. +If @len &lt; 0, then the string is terminated with a 0 character. @@ -4874,9 +6978,9 @@ is stored here. - location to store number of words written, or %NULL. -The value stored here does not include the trailing -0 word. + location to store number of &lt;type&gt;gunichar2&lt;/type&gt; +written, or %NULL. The value stored here does not +include the trailing 0. @@ -4895,8 +6999,7 @@ error occurs, %NULL will be returned and -Returns the number of tasks still unprocessed in @pool. - +Return value: the number of unprocessed tasks @@ -4925,32 +7028,32 @@ threads. - + -Opens a temporary file. See the mkstemp() documentation -on most UNIX-like systems. This is a portability wrapper, which simply calls -mkstemp() on systems that have it, and implements -it in GLib otherwise. +Sets @description as the description of the bookmark for @uri. -The parameter is a string that should match the rules for -mkstemp(), i.e. end in "XXXXXX". The X string will -be modified to form the name of a file that didn't exist. -The string should be in the GLib file name encoding. Most importantly, -on Windows it should be in UTF-8. +If @uri is %NULL, the description of @bookmark is set. +If a bookmark for @uri cannot be found then it is created. + +Since: 2.12 - - template filename + + a #GBookmarkFile + + + + a valid URI or %NULL + + + + a string - A file handle (as from open()) to the file -opened for reading and writing. The file is opened in binary mode -on platforms where there is a difference. The file handle should be -closed with close(). In case of errors, -1 is returned. - + @@ -4968,14 +7071,16 @@ overlong encodings of valid characters. - the maximum number of bytes to read, or -1, for no maximum. + the maximum number of bytes to read, or -1, for no maximum or +if @p is nul-terminated the resulting character. If @p points to a partial sequence at the end of a string that could begin a valid -character, returns (gunichar)-2; otherwise, if @p does not point -to a valid UTF-8 encoded Unicode character, returns (gunichar)-1. +character (or if @max_len is zero), returns (gunichar)-2; +otherwise, if @p does not point to a valid UTF-8 encoded +Unicode character, returns (gunichar)-1. @@ -5036,6 +7141,88 @@ using that function. If you supplied a @key_destroy_func when creating the + + +Removes the source with the given id from the default main context. +The id of +a #GSource is given by g_source_get_id(), or will be returned by the +functions g_source_attach(), g_idle_add(), g_idle_add_full(), +g_timeout_add(), g_timeout_add_full(), g_child_watch_add(), +g_child_watch_add_full(), g_io_add_watch(), and g_io_add_watch_full(). + +See also g_source_destroy(). + + + + + + the ID of the source to remove. + + + + %TRUE if the source was found and removed. + + + + + +Sets a function to be called at regular intervals, with @priority. +The function is called repeatedly until it returns %FALSE, at which +point the timeout is automatically destroyed and the function will +not be called again. + +Unlike g_timeout_add(), this function operates at whole second granularity. +The initial starting point of the timer is determined by the implementation +and the implementation is expected to group multiple timers together so that +they fire all at the same time. +To allow this grouping, the @interval to the first timer is rounded +and can deviate up to one second from the specified interval. +Subsequent timer iterations will generally run at the specified interval. + +Note that timeout functions may be delayed, due to the processing of other +event sources. Thus they should not be relied on for precise timing. +After each call to the timeout function, the time of the next +timeout is recalculated based on the current time and the given @interval + +If you want timing more precise than whole seconds, use g_timeout_add() +instead. + +The grouping of timers to fire at the same time results in a more power +and CPU efficient behavior so if your timer is in multiples of seconds +and you don't require the first timer exactly one second from now, the +use of g_timeout_add_seconds() is preferred over g_timeout_add(). + + + + + + the priority of the timeout source. Typically this will be in +the range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH. + + + + the time between calls to the function, in seconds + + + + function to call + + + + data to pass to @function + + + + function to call when the timeout is removed, or %NULL + + + + the ID (greater than 0) of the event source. + +Since: 2.14 + + + Inserts @data into @queue using @func to determine the new position. @@ -5057,7 +7244,7 @@ Since: 2.4 called with two elements of the @queue and @user_data. It should return 0 if the elements are equal, a negative value if the first element comes before the second, and a positive value if the second -element comes after the first. +element comes before the first. @@ -5068,15 +7255,34 @@ element comes after the first. + + +Inserts a copy of a string into a #GString, +expanding it if necessary. + + + + + + a #GString + + + + the position to insert the copy of the string + + + + the string to insert + + + + @string + + + -Returns a base directory in which to store user-specific application -configuration information such as user preferences and settings. - -On UNIX platforms this is determined using the mechanisms described in -the &lt;ulink url="http://www.freedesktop.org/Standards/basedir-spec"&gt; -XDG Base Directory Specification&lt;/ulink&gt; - +Return value: a string owned by GLib that must not be modified @@ -5151,9 +7357,7 @@ Since: 2.6 -Returns the length of the given %NULL-terminated -string array @str_array. - +Return value: length of @str_array. @@ -5170,8 +7374,7 @@ Since: 2.6 -Returns the position of @link_ in @queue. - +Return value: The position of @link_, or -1 if the link is @@ -5191,20 +7394,21 @@ Since: 2.4 - + -Gets the poll function set by g_main_context_set_poll_func(). - +On some platforms, notably WIN32, the #GPid type represents a resource +which must be closed to prevent resource leaking. g_spawn_close_pid() +is provided for this purpose. It should be used on all platforms, even +though it doesn't do anything under UNIX. - - a #GMainContext + + The process identifier to close - the poll function - + @@ -5267,13 +7471,40 @@ Since: 2.6 + + +Sets a list of group names for the item with URI @uri. Each previously +set group name list is removed. + +If @uri cannot be found then an item for it is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + an item's URI + + + + an array of group names, or %NULL to remove all groups + + + + number of group name values in @groups + + + + + + -Returns whether the file/socket/whatever associated with @channel -will be closed when @channel receives its final unref and is -destroyed. The default value of this is %TRUE for channels created -by g_io_channel_new_file (), and %FALSE for all other channels. - +Return value: Whether the channel will be closed on the final unref of @@ -5289,10 +7520,7 @@ the GIOChannel data structure. -Returns all groups in the key file loaded with @key_file. The -array of returned groups will be %NULL-terminated, so @length may -optionally be %NULL. - +Return value: a newly-allocated %NULL-terminated array of strings. @@ -5331,7 +7559,8 @@ Increases the reference count on a source by one. Converts a string which is in the encoding used by GLib for filenames into a UTF-8 string. Note that on Windows GLib uses UTF-8 -for filenames. +for filenames; on other platforms, this function indirectly depends on +the &lt;link linkend="setlocale"&gt;current locale&lt;/link&gt;. @@ -5393,6 +7622,52 @@ of the string @needle. + + +Returns: #GRegex object used in @match_info + + + + + a #GMatchInfo + + + + #GRegex object used in @match_info + +Since: 2.14 + + + + + +Calls @func for each item in the range (@begin, @end) passing +@user_data to the function. + +Since: 2.14 + + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + a #GFunc + + + + user data passed to @func + + + + + + Tries to become the owner of the specified context, @@ -5422,21 +7697,61 @@ this thread is now the owner of @context. - + -Sets whether a source can be called recursively. If @can_recurse is -%TRUE, then while the source is being dispatched then this source -will be processed normally. Otherwise, all processing of this -source is blocked until the dispatch function returns. +Sets the value of a date from a &lt;type&gt;time_t&lt;/type&gt; value. + +To set the value of a date to the current day, you could write: +&lt;informalexample&gt;&lt;programlisting&gt; +g_date_set_time_t (date, time (NULL)); +&lt;/programlisting&gt;&lt;/informalexample&gt; + +Since: 2.10 - - a #GSource + + a #GDate - - whether recursion is allowed for this source + + &lt;type&gt;time_t&lt;/type&gt; value to set + + + + + + + + +Places a comment above @key from @group_name. +@group_name. If @key is %NULL then @comment will +be written above @group_name. If both @key +and @group_name are NULL, then @comment will +be written above the first group in the file. + +Since: 2.6 + + + + + a #GKeyFile + + + + a group name, or %NULL + + + + a key + + + + a comment + + + + return location for a #GError @@ -5453,30 +7768,6 @@ source is blocked until the dispatch function returns. - - -An implementation of the standard printf() function which supports -positional parameters, as specified in the Single Unix Specification. - - - - - - a standard printf() format string, but notice -&lt;link linkend="string-precision"&gt;string precision pitfalls&lt;/link&gt;. - - - - the arguments to insert in the output. - - - - the number of characters printed. - -Since: 2.2 - - - Adds a #GOptionGroup to the @context, so that parsing with @context @@ -5560,15 +7851,15 @@ to the string. - a #GString. + a #GString - a Unicode character. + a Unicode character - @string. + @string @@ -5600,11 +7891,51 @@ Since: 2.4 + + +Scans for a match in @string for @pattern. + +This function is equivalent to g_regex_match() but it does not +require to compile the pattern with g_regex_new(), avoiding some +lines of code when you need just to do a match without extracting +substrings, capture counts, and so on. + +If this function is to be called on the same @pattern more than +once, it's more efficient to compile the pattern once with +g_regex_new() and then use g_regex_match(). + + + + + + the regular expression + + + + the string to scan for matches + + + + compile options for the regular expression + + + + match options + + + + %TRUE is the string matched, %FALSE otherwise + +Since: 2.14 + + + Converts a string which is in the encoding used for strings by the C runtime (usually the same as that used by the operating -system) in the current locale into a UTF-8 string. +system) in the &lt;link linkend="setlocale"&gt;current locale&lt;/link&gt; into a +UTF-8 string. @@ -5647,13 +7978,7 @@ errors. Any of the errors in #GConvertError may occur. -Returns the value associated with @key under @group_name. - -In the event the key cannot be found, %NULL is returned and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. In the -event that the @group_name cannot be found, %NULL is returned -and @error is set to #G_KEY_FILE_ERROR_GROUP_NOT_FOUND. - +Return value: a newly allocated string or %NULL if the specified @@ -5700,6 +8025,80 @@ this source. + + +Using the standard algorithm for regular expression matching only +the longest match in the string is retrieved, it is not possibile +to obtain all the available matches. For instance matching +"&lt;a&gt; &lt;b&gt; &lt;c&gt;" against the pattern "&lt;.*&gt;" +you get "&lt;a&gt; &lt;b&gt; &lt;c&gt;". + +This function uses a different algorithm (called DFA, i.e. deterministic +finite automaton), so it can retrieve all the possible matches, all +starting at the same point in the string. For instance matching +"&lt;a&gt; &lt;b&gt; &lt;c&gt;" against the pattern "&lt;.*&gt;" +you would obtain three matches: "&lt;a&gt; &lt;b&gt; &lt;c&gt;", +"&lt;a&gt; &lt;b&gt;" and "&lt;a&gt;". + +The number of matched strings is retrieved using +g_match_info_get_match_count(). To obtain the matched strings and +their position you can use, respectively, g_match_info_fetch() and +g_match_info_fetch_pos(). Note that the strings are returned in +reverse order of length; that is, the longest matching string is +given first. + +Note that the DFA algorithm is slower than the standard one and it +is not able to capture substrings, so backreferences do not work. + +Setting @start_position differs from just passing over a shortened +string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern +that begins with any kind of lookbehind assertion, such as "\b". + +A #GMatchInfo structure, used to get information on the match, is +stored in @match_info if not %NULL. Note that if @match_info is +not %NULL then it is created even if the function returns %FALSE, +i.e. you must free it regardless if regular expression actually +matched. + + + + + + a #GRegex structure from g_regex_new() + + + + the string to scan for matches + + + + the length of @string, or -1 if @string is nul-terminated + + + + starting index of the string to match + + + + match options + + + + pointer to location where to store the #GMatchInfo, +or %NULL if you do not need it + + + + location to store the error occuring, or %NULL to ignore errors + + + + %TRUE is the string matched, %FALSE otherwise + +Since: 2.14 + + + Gets the real name of the user. This usually comes from the user's entry @@ -5731,99 +8130,122 @@ If called on a %NULL value, g_strfreev() simply returns. - + -An implementation of the standard fprintf() function which supports -positional parameters, as specified in the Single Unix Specification. +Adds a byte onto the end of a #GString, expanding +it if necessary. - - the stream to write to. + + a #GString - - a standard printf() format string, but notice -&lt;link linkend="string-precision"&gt;string precision pitfalls&lt;/link&gt;. - - - - the list of arguments to insert in the output. - - - - the number of characters printed. - -Since: 2.2 - - - - - -Determines the numeric value of a character as a hexidecimal -digit. Differs from g_unichar_xdigit_value() because it takes -a char, so there's no worry about sign extension if characters -are signed. - - - - - an ASCII character. + the byte to append onto the end of @string - If @c is a hex digit (according to -g_ascii_isxdigit()), its numeric value. Otherwise, -1. + @string - + -Converts a string to a #gdouble value. -This function behaves like the standard strtod() function -does in the C locale. It does this without actually -changing the current locale, since that would not be -thread-safe. - -This function is typically used when reading configuration -files or other non-user input that should be locale independent. -To handle input from the user you should normally use the -locale-sensitive system strtod() function. - -To convert from a #gdouble to a string in a locale-insensitive -way, use g_ascii_dtostr(). - -If the correct value would cause overflow, plus or minus %HUGE_VAL -is returned (according to the sign of the value), and %ERANGE is -stored in %errno. If the correct value would cause underflow, -zero is returned and %ERANGE is stored in %errno. - -This function resets %errno before calling strtod() so that -you can reliably detect overflow and underflow. +Associates a new value with @key under @group_name. If @key +cannot be found then it is created. If @group_name cannot be +found then it is created. +Since: 2.6 - - the string to convert to a numeric value. + + a #GKeyFile - - if non-%NULL, it returns the character after -the last character used in the conversion. + + a group name + + + + a key + + + + a string - the #gdouble value. + + + + + +Set the pointer at the specified location to %NULL. + + + + + the memory address of the pointer. + + + + + + + + +Associates a list of integer values with @key under +@group_name. If @key cannot be found then it is created. + +Since: 2.6 + + + + + a #GKeyFile + + + + a group name + + + + a key + + + + an array of integer values + + + + number of integer values in @list + + + + + + + + +Returns: a pointer into @file_name after the root component. + + + + + a file name. + + + + a pointer into @file_name after the root component. -Returns the length of the string in characters. - +Return value: the length of the string in characters @@ -5894,6 +8316,27 @@ Dispatches all pending sources. + + +Swaps the items pointed to by @a and @b. It is allowed for @a and @b +to point into difference sequences. + +Since: 2.14 + + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + + + Gets the last component of the filename. If @file_name ends with a @@ -5935,6 +8378,46 @@ Since: 2.4 + + +Inserts @data into @queue using @func to determine the new +position. + +This function requires that the @queue is sorted before pushing on +new elements. + +This function is called while holding the @queue's lock. + +For an example of @func see g_async_queue_sort(). + +Since: 2.10 + + + + + a #GAsyncQueue + + + + the @data to push into the @queue + + + + the #GCompareDataFunc is used to sort @queue. This function +is passed two elements of the @queue. The function should return +0 if they are equal, a negative value if the first element +should be higher in the @queue or a positive value if the first +element should be lower in the @queue than the second element. + + + + user data passed to @func. + + + + + + Enables or disables automatic generation of &lt;option&gt;--help&lt;/option&gt; @@ -5959,32 +8442,32 @@ Since: 2.6 - + -Find the rightmost occurrence of the given ISO10646 character -in a UTF-8 encoded string, while limiting the search to @len bytes. -If @len is -1, allow unbounded search. +Writes a formatted string into a #GString. +This is similar to the standard sprintf() function, +except that the #GString buffer automatically expands +to contain the results. The previous contents of the +#GString are destroyed. +Deprecated: This function has been renamed to g_string_printf(). - - a nul-terminated UTF-8 encoded string + + a #GString - - the maximum length of @p + + the string format. See the sprintf() documentation - - a ISO10646 character + + the parameters to insert into the format string - %NULL if the string does not contain the character, -otherwise, a pointer to the start of the rightmost occurrence of the -character in the string. - + @@ -6007,7 +8490,7 @@ Since: 2.6 Calls the given function for each node in the #GTree. -Deprecated: The order of a balanced tree is somewhat arbitrary. If you +Deprecated:2.2: The order of a balanced tree is somewhat arbitrary. If you just want to visit all nodes in sorted order, use g_tree_foreach() instead. If you really need to visit nodes in a different order, consider using an &lt;link linkend="glib-N-ary-Trees"&gt;N-ary Tree&lt;/link&gt;. @@ -6036,11 +8519,35 @@ function returns %TRUE, the traversal is stopped. + + +Overwrites part of a string, lengthening it if necessary. + + + + + + a #GString + + + + the position at which to start overwriting + + + + the string that will overwrite the @string starting at @pos + + + + @string + +Since: 2.14 + + + -Returns the next random #gint32 from @rand_ equally distributed over -the range [@begin..@end-1]. - +Return value: A random number. @@ -6075,18 +8582,19 @@ used in the GLib API is always UTF-8 and said environment variables have no effect. &lt;envar&gt;G_FILENAME_ENCODING&lt;/envar&gt; may be set to a comma-separated list -of character set names. The special token "@locale" is taken to mean the -character set for the current locale. If &lt;envar&gt;G_FILENAME_ENCODING&lt;/envar&gt; -is not set, but &lt;envar&gt;G_BROKEN_FILENAMES&lt;/envar&gt; is, the character set of -the current locale is taken as the filename encoding. If neither environment -variable is set, UTF-8 is taken as the filename encoding, but the character +of character set names. The special token "&commat;locale" is taken to +mean the character set for the &lt;link linkend="setlocale"&gt;current +locale&lt;/link&gt;. If &lt;envar&gt;G_FILENAME_ENCODING&lt;/envar&gt; is not set, but +&lt;envar&gt;G_BROKEN_FILENAMES&lt;/envar&gt; is, the character set of the current +locale is taken as the filename encoding. If neither environment variable +is set, UTF-8 is taken as the filename encoding, but the character set of the current locale is also put in the list of encodings. The returned @charsets belong to GLib and must not be freed. Note that on Unix, regardless of the locale character set or -&lt;envar&gt;G_FILENAME_ENCODING&lt;/envar&gt; value, the actual file names present on a -system might be in any random encoding or just gibberish. +&lt;envar&gt;G_FILENAME_ENCODING&lt;/envar&gt; value, the actual file names present +on a system might be in any random encoding or just gibberish. @@ -6102,6 +8610,25 @@ Since: 2.6 + + +Gets the pattern string associated with @regex, i.e. a copy of +the string passed to g_regex_new(). + + + + + + a #GRegex structure + + + + the pattern of @regex + +Since: 2.14 + + + Gets the "current time" to be used when checking @@ -6143,10 +8670,26 @@ function must be called while holding the @queue's lock. + + +Returns: the number of the highest back reference + + + + + a #GRegex + + + + the number of the highest back reference + +Since: 2.14 + + + -Returns the last link @queue. - +Return value: the last link in @queue, or %NULL if @queue is empty @@ -6211,6 +8754,111 @@ of the separator are ignored. + + +Determines the numeric value of a character as a hexidecimal +digit. Differs from g_unichar_xdigit_value() because it takes +a char, so there's no worry about sign extension if characters +are signed. + + + + + + an ASCII character. + + + + If @c is a hex digit (according to +g_ascii_isxdigit()), its numeric value. Otherwise, -1. + + + + + +Retrieves the description of the bookmark for @uri. + +In the event the URI cannot be found, %NULL is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + return location for a #GError, or %NULL + + + + a newly allocated string or %NULL if the specified +URI cannot be found. + +Since: 2.12 + + + + + +Frees the memory allocated for @seq. If @seq has a data destroy +function associated with it, that function is called on all items in +@seq. + +Since: 2.14 + + + + + a #GSequence + + + + + + + + +Sets the seed for the global random number generator, which is used +by the &lt;function&gt;g_random_*&lt;/function&gt; functions, to @seed. + + + + + a value to reinitialize the global random number generator. + + + + + + + + +Adds a new item to the end of @seq. + + + + + + a #GSequencePointer + + + + the data for the new item + + + + an iterator pointing to the new item + +Since: 2.14 + + + Sets the priority of a source. While the main loop is being @@ -6231,13 +8879,111 @@ at a higher (numerically smaller) priority are ready to be dispatched. + + +Breaks the string on the pattern, and returns an array of +the tokens. If the pattern contains capturing parentheses, +then the text for each of the substrings will also be returned. +If the pattern does not match anywhere in the string, then the +whole string is returned as the first token. + +This function is equivalent to g_regex_split() but it does +not require to compile the pattern with g_regex_new(), avoiding +some lines of code when you need just to do a split without +extracting substrings, capture counts, and so on. + +If this function is to be called on the same @pattern more than +once, it's more efficient to compile the pattern once with +g_regex_new() and then use g_regex_split(). + +As a special case, the result of splitting the empty string "" +is an empty vector, not a vector containing a single string. +The reason for this special case is that being able to represent +a empty vector is typically more useful than consistent handling +of empty elements. If you do need to represent empty elements, +you'll need to check for the empty string before calling this +function. + +A pattern that can match empty strings splits @string into +separate characters wherever it matches the empty string between +characters. For example splitting "ab c" using as a separator +"\s*", you will get "a", "b" and "c". + + + + + + the regular expression + + + + the string to scan for matches + + + + compile options for the regular expression + + + + match options + + + + a %NULL-terminated gchar ** array. Free it using g_strfreev() + +Since: 2.14 + + + + + +Calls @func for each item in the sequence passing @user_data +to the function. + +Since: 2.14 + + + + + a #GSequence + + + + the function to call for each item in @seq + + + + user data passed to @func + + + + + + + + +Removes all keys and their associated values from a #GHashTable +without calling the key and value destroy functions. + +Since: 2.12 + + + + + a #GHashTable. + + + + + + Opens a file for writing in the preferred directory for temporary files (as returned by g_get_tmp_dir()). -@tmpl should be a string in the GLib file name encoding ending with -six 'X' characters, as the parameter to g_mkstemp() (or mkstemp()). +@tmpl should be a string in the GLib file name encoding containing +a sequence of six 'X' characters, as the parameter to g_mkstemp(). However, unlike these functions, the template should only be a basename, no directory components are allowed. If template is %NULL, a default template is used. @@ -6253,7 +8999,8 @@ The returned name is in the GLib file name encoding. - Template for file name, as in g_mkstemp(), basename only + Template for file name, as in g_mkstemp(), basename only, +or %NULL, to a default template @@ -6294,10 +9041,7 @@ polled for a particular context. -Returns the numeric ID for a particular source. The ID of a source -is unique within a particular main loop context. The reverse -mapping from ID to source is done by g_main_context_find_source_by_id(). - +Return value: the ID (greater than 0) for the source @@ -6306,17 +9050,13 @@ mapping from ID to source is done by g_main_context_find_source_by_id(). - the ID for the source + the ID (greater than 0) for the source -Returns the contents of a #GMappedFile. - -Note that the contents may not be zero-terminated, -even if the #GMappedFile is backed by a text file. - +Returns: the contents of @file. @@ -6355,7 +9095,7 @@ parameter, when using pointers as keys in a #GHashTable. -Creates a new #GHashTable. +Creates a new #GHashTable with a reference count of 1. @@ -6398,6 +9138,59 @@ Gets the number of nodes in a #GTree. + + +Loads a bookmark file from memory into an empty #GBookmarkFile +structure. If the object cannot be created then @error is set to a +#GBookmarkFileError. + + + + + + an empty #GBookmarkFile struct + + + + desktop bookmarks loaded in memory + + + + the length of @data in bytes + + + + return location for a #GError, or %NULL + + + + %TRUE if a desktop bookmark could be loaded. + +Since: 2.12 + + + + + +A convenience function to use gettext() for translating +user-visible strings. + +Since: 2.12 + + + + + a #GOptionContext + + + + the domain to use + + + + + + The setlocale() function in the Microsoft C library uses locale @@ -6416,48 +9209,20 @@ g_free(). - + -Creates a new #GTree with a comparison function that accepts user data. -See g_tree_new() for more details. - +Return value: the #GSequence that @iter points into. - - qsort()-style comparison function. - - - - data to pass to comparison function. + + a #GSequenceIter - a new #GTree. - - + the #GSequence that @iter points into. - - -Returns the value of an environment variable. The name and value -are in the GLib file name encoding. On UNIX, this means the actual -bytes which might or might not be in some consistent character set -and encoding. On Windows, it is in UTF-8. On Windows, in case the -environment variable's value contains references to other -environment variables, they are expanded. - - - - - - the environment variable to get, in the GLib file name encoding. - - - - the value of the environment variable, or %NULL if -the environment variable is not found. The returned string may be -overwritten by the next call to g_getenv(), g_setenv() or -g_unsetenv(). +Since: 2.14 @@ -6478,27 +9243,31 @@ Since: 2.2 - + -Create a directory if it doesn't already exist. Create intermediate -parent directories as needed, too. +A wrapper for the POSIX rename() function. The rename() function +renames a file, moving it between directories if required. + +See your C library manual for more details about how rename() works +on your system. Note in particular that on Win9x it is not possible +to rename a file if a file with the new name already exists. Also +it is not possible in general on Windows to rename an open file. - + + a pathname in the GLib file name encoding (UTF-8 on Windows) + + + a pathname in the GLib file name encoding - - permissions to use for newly created directories - - - 0 if the directory already exists, or was successfully -created. Returns -1 if an error occurred, with errno set. + 0 if the renaming succeeded, -1 if an error occurred -Since: 2.8 +Since: 2.6 @@ -6630,6 +9399,43 @@ g_unichar_isdigit()), its numeric value. Otherwise, -1. + + +Removes application registered with @name from the list of applications +that have registered a bookmark for @uri inside @bookmark. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. +In the event that no application with name @app_name has registered +a bookmark for @uri, %FALSE is returned and error is set to +#G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + the name of the application + + + + return location for a #GError or %NULL + + + + %TRUE if the application was successfully removed. + +Since: 2.12 + + + Calls a function for each element of a #GPtrArray. @@ -6654,6 +9460,30 @@ Since: 2.4 + + +Copies the bytes from a string into a #GString, +destroying any previous contents. It is rather like +the standard strcpy() function, except that you do not +have to worry about having enough space to copy the string. + + + + + + the destination #GString. Its current contents +are destroyed. + + + + the string to copy into @string + + + + @string + + + Sets a #GOptionGroup as main group of the @context. @@ -6716,8 +9546,7 @@ codes are those in the #GFileError enumeration. In the error case, -Returns the number of currently unused threads. - +Return value: the number of currently unused threads @@ -6726,22 +9555,24 @@ Returns the number of currently unused threads. - + -Pushes the @data into the @queue. @data must not be %NULL. +Cuts off the end of the GString, leaving the first @len bytes. + - - a #GAsyncQueue. + + a #GString - - @data to push into the @queue. + + the new size of @string - + @string + @@ -6776,15 +9607,7 @@ Since: 2.6 -Returns the values associated with @key under @group_name as -booleans. If @group_name is %NULL, the start_group is used. - -If @key cannot be found then the return value is undefined and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. Likewise, if -the values associated with @key cannot be interpreted as booleans -then the return value is also undefined and @error is set to -#G_KEY_FILE_ERROR_INVALID_VALUE. - +Return value: the values associated with the key as a list of @@ -6809,7 +9632,8 @@ then the return value is also undefined and @error is set to - the values associated with the key as a boolean + the values associated with the key as a list of +booleans, or %NULL if the key was not found or could not be parsed. Since: 2.6 @@ -6842,21 +9666,97 @@ Since: 2.6 - + -Determines whether a character is a control character. -Given some UTF-8 text, obtain a character value with -g_utf8_get_char(). +Makes a copy of @error. - - a Unicode character + + a #GError - %TRUE if @c is a control character + a new #GError + + + + + +Retrieves the position of the capturing parentheses named @name. + +If @name is a valid sub pattern name but it didn't match anything +(e.g. sub pattern "X", matching "b" against "(?P&lt;X&gt;a)?b") +then @start_pos and @end_pos are set to -1 and %TRUE is returned. + + + + + + #GMatchInfo structure + + + + name of the subexpression + + + + pointer to location where to store the start position + + + + pointer to location where to store the end position + + + + %TRUE if the position was fetched, %FALSE otherwise. If +the position cannot be fetched, @start_pos and @end_pos are left +unchanged + +Since: 2.14 + + + + + +Breaks the string on the pattern, and returns an array of the tokens. +If the pattern contains capturing parentheses, then the text for each +of the substrings will also be returned. If the pattern does not match +anywhere in the string, then the whole string is returned as the first +token. + +As a special case, the result of splitting the empty string "" is an +empty vector, not a vector containing a single string. The reason for +this special case is that being able to represent a empty vector is +typically more useful than consistent handling of empty elements. If +you do need to represent empty elements, you'll need to check for the +empty string before calling this function. + +A pattern that can match empty strings splits @string into separate +characters wherever it matches the empty string between characters. +For example splitting "ab c" using as a separator "\s*", you will get +"a", "b" and "c". + + + + + + a #GRegex structure + + + + the string to split with the pattern + + + + match time option flags + + + + a %NULL-terminated gchar ** array. Free it using g_strfreev() + +Since: 2.14 @@ -6923,28 +9823,50 @@ Reads data from a #GIOChannel. %G_IO_ERROR_NONE if the operation was successful. -Deprecated: Use g_io_channel_read_chars() instead. +Deprecated:2.2: Use g_io_channel_read_chars() instead. - + -Converts from a pointer to position within a string to a integer -character offset. +Convert a string from a 32-bit fixed width representation as UCS-4. +to UTF-8. The result will be terminated with a 0 byte. - a UTF-8 encoded string + a UCS-4 encoded string - - a pointer to a position within @str + + the maximum length (number of characters) of @str to use. +If @len &lt; 0, then the string is terminated with a 0 character. + + + + location to store number of characters read, or %NULL. + + + + location to store number of bytes written or %NULL. +The value here stored does not include the trailing 0 +byte. + + + + location to store the error occuring, or %NULL to ignore +errors. Any of the errors in #GConvertError other than +%G_CONVERT_ERROR_NO_CONVERSION may occur. - the resulting character offset + a pointer to a newly allocated UTF-8 string. +This value must be freed with g_free(). If an +error occurs, %NULL will be returned and +@error set. In that case, @items_read will be +set to the position of the first invalid input +character. @@ -7001,32 +9923,65 @@ to the type of source you are using. - + -Removes the source with the given id from the default main context. The id of -a #GSource is given by g_source_get_id(), or will be returned by the -functions g_source_attach(), g_idle_add(), g_idle_add_full(), -g_timeout_add(), g_timeout_add_full(), g_child_watch_add(), -g_child_watch_add_full(), g_io_add_watch(), and g_io_add_watch_full(). +Like g_sequence_sort(), but uses a #GSequenceIterCompareFunc instead +of a GCompareDataFunc as the compare function -See also g_source_destroy(). +Since: 2.14 + + + + + a #GSequence + + + + the #GSequenceItercompare used to compare iterators in the +sequence. It is called with two iterators pointing into @seq. It should +return 0 if the iterators are equal, a negative value if the first +iterator comes before the second, and a positive value if the second +iterator comes before the first. + + + + user data passed to @cmp_func + + + + + + + + +This function outputs @bookmark as a string. - - the id of the source to remove. + + a #GBookmarkFile + + + + return location for the length of the returned string, or %NULL + + + + return location for a #GError, or %NULL - %TRUE if the source was found and removed. + a newly allocated string holding +the contents of the #GBookmarkFile + +Since: 2.12 -Returns the #GMainContext of @loop. - +Return value: the #GMainContext of @loop @@ -7080,36 +10035,21 @@ converted to uppercase. - + -Places a comment above @key from @group_name. -@group_name. If @key is %NULL then @comment will -be written above @group_name. If both @key -and @group_name are NULL, then @comment will -be written above the first group in the file. - -Since: 2.6 +Sets whether a source can be called recursively. If @can_recurse is +%TRUE, then while the source is being dispatched then this source +will be processed normally. Otherwise, all processing of this +source is blocked until the dispatch function returns. - - a #GKeyFile + + a #GSource - - a group name, or %NULL - - - - a key - - - - a comment - - - - return location for a #GError + + whether recursion is allowed for this source @@ -7147,32 +10087,27 @@ g_io_channel_set_encoding () for details. - + -Open a file @filename as a #GIOChannel using mode @mode. This -channel will be closed when the last reference to it is dropped, -so there is no need to call g_io_channel_close() (though doing -so will not cause problems, as long as no attempt is made to -access the channel after it is closed). +An implementation of the standard printf() function which supports +positional parameters, as specified in the Single Unix Specification. - - A string containing the name of a file. + + a standard printf() format string, but notice +&lt;link linkend="string-precision"&gt;string precision pitfalls&lt;/link&gt;. - - One of "r", "w", "a", "r+", "w+", "a+". These have -the same meaning as in fopen(). - - - - A location to return an error of type %G_FILE_ERROR. + + the arguments to insert in the output. - A #GIOChannel on success, %NULL on failure. + the number of characters printed. + +Since: 2.2 @@ -7202,6 +10137,23 @@ Since: 2.4 + + +Removes all the elements in @queue. If queue elements contain +dynamically-allocated memory, they should be freed first. + +Since: 2.14 + + + + + a #GQueue + + + + + + Sets an environment variable. Both the variable's name and value @@ -7234,6 +10186,57 @@ Since: 2.4 + + +Replaces occurances of the pattern in regex with the output of +@eval for that occurance. + +Setting @start_position differs from just passing over a shortened +string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern +that begins with any kind of lookbehind assertion, such as "\b". + + + + + + a #GRegex structure from g_regex_new() + + + + string to perform matches against + + + + the length of @string, or -1 if @string is nul-terminated + + + + starting index of the string to match + + + + options for the match + + + + a function to call for each match + + + + user data to pass to the function + + + + location to store the error occuring, or %NULL to ignore errors + + + + a newly allocated string containing the replacements + +Since: 2.14 + + + Looks up a key in the #GHashTable, returning the original key and the @@ -7265,10 +10268,44 @@ for example before calling g_hash_table_remove(). + + +Retrieves the MIME type of the resource pointed by @uri. + +In the event the URI cannot be found, %NULL is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. In the +event that the MIME type cannot be found, %NULL is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_INVALID_VALUE. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + return location for a #GError, or %NULL + + + + a newly allocated string or %NULL if the specified +URI cannot be found. + +Since: 2.12 + + + Turns off flag values for a data list. See g_datalist_unset_flags() +Since: 2.8 + @@ -7299,6 +10336,9 @@ insignificant, thus producing the ordering "event.c" "eventgenera would like to treat numbers intelligently so that "file1" "file10" "file5" is sorted as "file1" "file5" "file10". +Note that this function depends on the +&lt;link linkend="setlocale"&gt;current locale&lt;/link&gt;. + @@ -7384,6 +10424,68 @@ g_free(). Otherwise %NULL and @error will be set. + + +Inserts the (@begin, @end) range at the destination pointed to by ptr. +The @begin and @end iters must point into the same sequence. It is +allowed for @dest to point to a different sequence than the one pointed +into by @begin and @end. + +If @dest is NULL, the range indicated by @begin and @end is +removed from the sequence. If @dest iter points to a place within +the (@begin, @end) range, the range does not move. + +Since: 2.14 + + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + + + + + +Sets the last time the bookmark for @uri was last modified. + +If no bookmark for @uri is found then it is created. + +The "modified" time should only be set when the bookmark's meta-data +was actually changed. Every function of #GBookmarkFile that +modifies a bookmark also changes the modification time, except for +g_bookmark_file_set_visited(). + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + a timestamp or -1 to use the current time + + + + + + Searches the string @haystack for the last occurrence @@ -7411,6 +10513,24 @@ to @haystack_len. + + +Return value: the value of the environment variable, or %NULL if + + + + + the environment variable to get, in the GLib file name encoding. + + + + the value of the environment variable, or %NULL if +the environment variable is not found. The returned string may be +overwritten by the next call to g_getenv(), g_setenv() or +g_unsetenv(). + + + Releases ownership of a context previously acquired by this thread @@ -7442,14 +10562,13 @@ Converts all upper case ASCII letters to lower case ASCII letters. passed-in @string pointer, with all the upper case characters converted to lower case in place, with -semantics that exactly match g_ascii_tolower. +semantics that exactly match g_ascii_tolower(). -Returns the @n'th element of @queue. - +Return value: The data for the @n'th element of @queue, or %NULL if @n is @@ -7469,6 +10588,44 @@ Since: 2.4 + + +Gets the icon of the bookmark for @uri. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + return location for the icon's location or %NULL + + + + return location for the icon's MIME type or %NULL + + + + return location for a #GError or %NULL + + + + %TRUE if the icon for the bookmark for the URI was found. +You should free the returned strings. + +Since: 2.12 + + + Flushes the write buffer for the GIOChannel. @@ -7513,28 +10670,96 @@ Since: 2.2 - + -Removes @link_ from @queue and frees it. +Sets @mime_type as the MIME type of the bookmark for @uri. -@link_ must be part of @queue. +If a bookmark for @uri cannot be found then it is created. -Since: 2.4 +Since: 2.12 - - a #GQueue + + a #GBookmarkFile - - a #GList link that &lt;emphasis&gt;must&lt;/emphasis&gt; be part of @queue + + a valid URI + + + + a MIME type + + +Scans for a match in string for the pattern in @regex. +The @match_options are combined with the match options specified +when the @regex structure was created, letting you have more +flexibility in reusing #GRegex structures. + +A #GMatchInfo structure, used to get information on the match, +is stored in @match_info if not %NULL. Note that if @match_info +is not %NULL then it is created even if the function returns %FALSE, +i.e. you must free it regardless if regular expression actually matched. + +To retrieve all the non-overlapping matches of the pattern in +string you can use g_match_info_next(). + +&lt;informalexample&gt;&lt;programlisting&gt; +static void +print_uppercase_words (const gchar *string) +{ +/&ast; Print all uppercase-only words. &ast;/ +GRegex *regex; +GMatchInfo *match_info; +&nbsp; +regex = g_regex_new ("[A-Z]+", 0, 0, NULL); +g_regex_match (regex, string, 0, &amp;match_info); +while (g_match_info_matches (match_info)) +{ +gchar *word = g_match_info_fetch (match_info, 0); +g_print ("Found: %s\n", word); +g_free (word); +g_match_info_next (match_info, NULL); +} +g_match_info_free (match_info); +g_regex_unref (regex); +} +&lt;/programlisting&gt;&lt;/informalexample&gt; + + + + + + a #GRegex structure from g_regex_new() + + + + the string to scan for matches + + + + match options + + + + pointer to location where to store the #GMatchInfo, +or %NULL if you do not need it + + + + %TRUE is the string matched, %FALSE otherwise + +Since: 2.14 + + + Sets the seed for the random number generator #GRand to @seed. @@ -7585,6 +10810,27 @@ Since: 2.6 + + +Determines if a character is titlecase. Some characters in +Unicode which are composites, such as the DZ digraph +have three case variants instead of just two. The titlecase +form is used at the beginning of a word where only the +first letter is capitalized. The titlecase form of the DZ +digraph is U+01F2 LATIN CAPITAL LETTTER D WITH SMALL LETTER Z. + + + + + + a Unicode character + + + + %TRUE if the character is titlecase + + + Increases the reference count on a #GMainLoop object by one. @@ -7603,12 +10849,7 @@ Increases the reference count on a #GMainLoop object by one. -Returns all keys for the group name @group_name. The array of -returned keys will be %NULL-terminated, so @length may -optionally be %NULL. In the event that the @group_name cannot -be found, %NULL is returned and @error is set to -#G_KEY_FILE_ERROR_GROUP_NOT_FOUND. - +Return value: a newly-allocated %NULL-terminated array of @@ -7636,6 +10877,41 @@ Since: 2.6 + + +Changes the URI of a bookmark item from @old_uri to @new_uri. Any +existing bookmark for @new_uri will be overwritten. If @new_uri is +%NULL, then the bookmark is removed. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + a valid URI, or %NULL + + + + return location for a #GError or %NULL + + + + %TRUE if the URI was successfully changed + +Since: 2.12 + + + A wrapper for the POSIX open() function. The open() function is @@ -7670,6 +10946,32 @@ Since: 2.6 + + +Determines whether a character is a mark (non-spacing mark, +combining mark, or enclosing mark in Unicode speak). +Given some UTF-8 text, obtain a character value +with g_utf8_get_char(). + +Note: in most cases where isalpha characters are allowed, +ismark characters should be allowed to as they are essential +for writing most European languages as well as many non-Latin +scripts. + + + + + + a Unicode character + + + + %TRUE if @c is a mark character + +Since: 2.14 + + + Checks whether the allocator used by g_malloc() is the system's @@ -7688,6 +10990,60 @@ A different allocator can be set using g_mem_set_vtable(). + + +Gets the registration informations of @app_name for the bookmark for +@uri. See g_bookmark_file_set_app_info() for more informations about +the returned data. + +The string returned in @app_exec must be freed. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. In the +event that no application with name @app_name has registered a bookmark +for @uri, %FALSE is returned and error is set to +#G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED. In the event that unquoting +the command line fails, an error of the #G_SHELL_ERROR domain is +set and %FALSE is returned. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + an application's name + + + + location for the command line of the application, or %NULL + + + + return location for the registration count, or %NULL + + + + return location for the last registration time, or %NULL + + + + return location for a #GError, or %NULL + + + + %TRUE on success. + +Since: 2.12 + + + Looks whether the string @str begins with @prefix. @@ -7710,10 +11066,54 @@ Since: 2.2 + + +Retrieves the position of the @match_num&lt;!-- --&gt;'th capturing +parentheses. 0 is the full text of the match, 1 is the first +paren set, 2 the second, and so on. + +If @match_num is a valid sub pattern but it didn't match anything +(e.g. sub pattern 1, matching "b" against "(a)?b") then @start_pos +and @end_pos are set to -1 and %TRUE is returned. + +If the match was obtained using the DFA algorithm, that is using +g_regex_match_all() or g_regex_match_all_full(), the retrieved +position is not that of a set of parentheses but that of a matched +substring. Substrings are matched in reverse order of length, so +0 is the longest match. + + + + + + #GMatchInfo structure + + + + number of the sub expression + + + + pointer to location where to store the start position + + + + pointer to location where to store the end position + + + + %TRUE if the position was fetched, %FALSE otherwise. If +the position cannot be fetched, @start_pos and @end_pos are left +unchanged + +Since: 2.14 + + + -Parses a string containing debugging options separated -by ':' into a %guint containing bit flags. This is used +Parses a string containing debugging options +into a %guint containing bit flags. This is used within GDK and GTK+ to parse the debug options passed on the command line or through environment variables. @@ -7721,8 +11121,8 @@ command line or through environment variables. - a list of debug options separated by ':' or "all" -to set all flags. + a list of debug options separated by colons, spaces, or +commas; or the string "all" to set all flags. @@ -7795,21 +11195,53 @@ is empty. - + -Determines whether a character is a lowercase letter. -Given some UTF-8 text, obtain a character value with -g_utf8_get_char(). +Convert a string from UTF-16 to UTF-8. The result will be +terminated with a 0 byte. + +Note that the input is expected to be already in native endianness, +an initial byte-order-mark character is not handled specially. +g_convert() can be used to convert a byte buffer of UTF-16 data of +ambiguous endianess. - - a Unicode character + + a UTF-16 encoded string + + + + the maximum length (number of &lt;type&gt;gunichar2&lt;/type&gt;) of @str to use. +If @len &lt; 0, then the string is terminated with a 0 character. + + + + location to store number of words read, or %NULL. +If %NULL, then %G_CONVERT_ERROR_PARTIAL_INPUT will be +returned in case @str contains a trailing partial +character. If an error occurs then the index of the +invalid input is stored here. + + + + location to store number of bytes written, or %NULL. +The value stored here does not include the trailing +0 byte. + + + + location to store the error occuring, or %NULL to ignore +errors. Any of the errors in #GConvertError other than +%G_CONVERT_ERROR_NO_CONVERSION may occur. - %TRUE if @c is a lowercase letter + a pointer to a newly allocated UTF-8 string. +This value must be freed with g_free(). If an +error occurs, %NULL will be returned and +@error set. @@ -7837,6 +11269,71 @@ Since: 2.2 + + +Sets the icon for the bookmark for @uri. If @href is %NULL, unsets +the currently set icon. + +If no bookmark for @uri is found it is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + the URI of the icon for the bookmark, or %NULL + + + + the MIME type of the icon for the bookmark + + + + + + + + +Checks whether @group appears in the list of groups to which +the bookmark for @uri belongs to. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + the group name to be searched + + + + return location for a #GError, or %NULL + + + + %TRUE if @group was found. + +Since: 2.12 + + + Creates a new random number generator initialized with a seed taken @@ -7856,7 +11353,16 @@ the current time (as a fallback). Calls the given function for key/value pairs in the #GHashTable until @predicate returns %TRUE. The function is passed the key and value of each pair, and the given @user_data parameter. The hash table may not -be modified while iterating over it (you can't add/remove items). +be modified while iterating over it (you can't add/remove items). + +Note, that hash tables are really only optimized for forward lookups, +i.e. g_hash_table_lookup(). +So code that frequently issues g_hash_table_find() or +g_hash_table_foreach() (e.g. in the order of once per every entry in a +hash table) should probably be reworked to use additional or different +data structures for reverse lookups (keep in mind that an O(n) find/foreach +operation issued for all n values in a hash table ends up needing O(n*n) +operations). @@ -7874,40 +11380,70 @@ be modified while iterating over it (you can't add/remove items). - The value of the first key/value pair is returned, for which -func evaluates to %TRUE. If no pair with the requested property is found, + The value of the first key/value pair is returned, for which +func evaluates to %TRUE. If no pair with the requested property is found, %NULL is returned. Since: 2.4 - + -Gets the name of the program. This name should &lt;emphasis&gt;not&lt;/emphasis&gt; -be localized, contrast with g_get_application_name(). -(If you are using GDK or GTK+ the program name is set in gdk_init(), -which is called by gtk_init(). The program name is found by taking -the last component of &lt;literal&gt;argv[0]&lt;/literal&gt;.) +Return value: the data that @iter points to + + + + + a #GSequenceIter + + + + the data that @iter points to + +Since: 2.14 + + + + + +Inserts @data into @sequence using @func to determine the new position. +The sequence must already be sorted according to @cmp_func; otherwise the +new position of @data is undefined. + + a #GSequence + + + + the data to insert + + + + the #GCompareDataFunc used to compare items in the sequence. It +is called with two items of the @seq and @user_data. It should +return 0 if the items are equal, a negative value if the first +item comes before the second, and a positive value if the second +item comes before the first. + + + + user data passed to @cmp_func. + + - the name of the program. The returned string belongs -to GLib and must not be modified or freed. + a #GSequenceIter pointing to the new item. + +Since: 2.14 -Returns a base directory in which to store non-essential, cached -data specific to particular user. - -On UNIX platforms this is determined using the mechanisms described in -the &lt;ulink url="http://www.freedesktop.org/Standards/basedir-spec"&gt; -XDG Base Directory Specification&lt;/ulink&gt; - +Return value: a string owned by GLib that must not be modified @@ -7944,36 +11480,96 @@ semantics for what constitutes the "current" line number other than - + -Associates a new value with @key under @group_name. If @key -cannot be found then it is created. If @group_name cannot be -found then it is created. - -Since: 2.6 +Return value: a #GSequenceIter pointing to the next position after @iter. - - a #GKeyFile + + a #GSequenceIter - - a group name + + a #GSequenceIter pointing to the next position after @iter. + +Since: 2.14 + + + + + +Open a file @filename as a #GIOChannel using mode @mode. This +channel will be closed when the last reference to it is dropped, +so there is no need to call g_io_channel_close() (though doing +so will not cause problems, as long as no attempt is made to +access the channel after it is closed). + + + + + + A string containing the name of a file. - - a key + + One of "r", "w", "a", "r+", "w+", "a+". These have +the same meaning as in fopen(). - - a string + + A location to return an error of type %G_FILE_ERROR. + + + + A #GIOChannel on success, %NULL on failure. + + + + + +This function will set the maximum @interval that a thread waiting +in the pool for new tasks can be idle for before being +stopped. This function is similar to calling +g_thread_pool_stop_unused_threads() on a regular timeout, except, +this is done on a per thread basis. + +By setting @interval to 0, idle threads will not be stopped. + +This function makes use of g_async_queue_timed_pop () using +@interval. + +Since: 2.10 + + + + + the maximum @interval (1/1000ths of a second) a thread +can be idle. + + +Converts a pointer to a #gint to a hash value. +It can be passed to g_hash_table_new() as the @hash_func parameter, +when using pointers to integers values as keys in a #GHashTable. + + + + + + a pointer to a #gint key + + + + a hash value corresponding to the key. + + + Creates a new #GMainLoop structure. @@ -7996,64 +11592,69 @@ is not very important since calling g_main_loop_run() will set this to - + -Gets the current flags for a #GIOChannel, including read-only -flags such as %G_IO_FLAG_IS_READABLE. - -The values of the flags %G_IO_FLAG_IS_READABLE and %G_IO_FLAG_IS_WRITEABLE -are cached for internal use by the channel when it is created. -If they should change at some later point (e.g. partial shutdown -of a socket with the UNIX shutdown() function), the user -should immediately call g_io_channel_get_flags () to update -the internal values of these flags. +Checks whether a source is allowed to be called recursively. +see g_source_set_can_recurse(). - - a #GIOChannel + + a #GSource - the flags which are set on the channel + whether recursion is allowed. - + -Loads a key file into an empty #GKeyFile structure. -If the file could not be loaded then %error is set to -either a #GFileError or #GKeyFileError. - +Return value: whether @iter is the begin iterator - - an empty #GKeyFile struct - - - - the path of a filename to load, in the GLib file name encoding - - - - flags from #GKeyFileFlags - - - - return location for a #GError, or %NULL + + a #GSequenceIter - %TRUE if a key file could be loaded, %FALSE othewise -Since: 2.6 + whether @iter is the begin iterator + +Since: 2.14 + + +Writes a formatted string into a #GString. +This is similar to the standard sprintf() function, +except that the #GString buffer automatically expands +to contain the results. The previous contents of the +#GString are destroyed. + + + + + a #GString + + + + the string format. See the printf() documentation + + + + the parameters to insert into the format string + + + + + + -Finds the leftmost occurrence of the given ISO10646 character +Finds the leftmost occurrence of the given Unicode character in a UTF-8 encoded string, while limiting the search to @len bytes. If @len is -1, allow unbounded search. @@ -8069,7 +11670,7 @@ If @len is -1, allow unbounded search. - a ISO10646 character + a Unicode character @@ -8081,11 +11682,7 @@ the character in the string. -Returns a newly-allocated string containing the path of the -subdirectory @subdir in the return value from calling -g_win32_get_package_installation_directory() with the @package and -@dll_name parameters. - +Returns: a string containing the complete path to @subdir inside @@ -8109,15 +11706,43 @@ value should be freed with g_free() when no longer needed. + + +Return value: an #GSequenceIter pointing to the position where @data + + + + + a #GSequence + + + + data for the new item + + + + the #GCompareDataFunc used to compare items in the sequence. It +is called with two items of the @seq and @user_data. It should +return 0 if the items are equal, a negative value if the first +item comes before the second, and a positive value if the second +item comes before the first. + + + + user data passed to @cmp_func. + + + + an #GSequenceIter pointing to the position where @data +would have been inserted according to @cmp_func and @cmp_data. + +Since: 2.14 + + + -Returns the values associated with @key under @group_name. - -In the event the key cannot be found, %NULL is returned and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. In the -event that the @group_name cannot be found, %NULL is returned -and @error is set to #G_KEY_FILE_ERROR_GROUP_NOT_FOUND. - +Return value: a %NULL-terminated string array or %NULL if the specified @@ -8149,40 +11774,40 @@ Since: 2.6 - + -Retrieves the name of the next entry in the directory. The '.' and -'..' entries are omitted. On Windows, the returned name is in -UTF-8. On Unix, it is in the on-disk encoding. +Decreases reference count of @regex by 1. When reference count drops +to zero, it frees all the memory associated with the regex structure. +Since: 2.14 - - a #GDir* created by g_dir_open() + + a #GRegex - The entry's name or %NULL if there are no -more entries. The return value is owned by GLib and -must not be modified or freed. - + - + -Increases the reference count of the asynchronous @queue by 1. You -do not need to hold the lock to call this function. +Gets the height of a #GTree. + +If the #GTree contains no nodes, the height is 0. +If the #GTree contains only one root node the height is 1. +If the root node has children the height is 2, etc. - - a #GAsyncQueue. + + a #GTree. - the @queue that was passed in (since 2.6) + the height of the #GTree. @@ -8237,6 +11862,55 @@ consistent on a machine. On Windows, it is always UTF-8. + + +Usually if the string passed to g_regex_match*() matches as far as +it goes, but is too short to match the entire pattern, %FALSE is +returned. There are circumstances where it might be helpful to +distinguish this case from other cases in which there is no match. + +Consider, for example, an application where a human is required to +type in data for a field with specific formatting requirements. An +example might be a date in the form ddmmmyy, defined by the pattern +"^\d?\d(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d\d$". +If the application sees the user’s keystrokes one by one, and can +check that what has been typed so far is potentially valid, it is +able to raise an error as soon as a mistake is made. + +GRegex supports the concept of partial matching by means of the +#G_REGEX_MATCH_PARTIAL flag. When this is set the return code for +g_regex_match() or g_regex_match_full() is, as usual, %TRUE +for a complete match, %FALSE otherwise. But, when these functions +return %FALSE, you can check if the match was partial calling +g_match_info_is_partial_match(). + +When using partial matching you cannot use g_match_info_fetch*(). + +Because of the way certain internal optimizations are implemented +the partial matching algorithm cannot be used with all patterns. +So repeated single characters such as "a{2,4}" and repeated single +meta-sequences such as "\d+" are not permitted if the maximum number +of occurrences is greater than one. Optional items such as "\d?" +(where the maximum is one) are permitted. Quantifiers with any values +are permitted after parentheses, so the invalid examples above can be +coded thus "(a){2,4}" and "(\d)+". If #G_REGEX_MATCH_PARTIAL is set +for a pattern that does not conform to the restrictions, matching +functions return an error. + + + + + + a #GMatchInfo structure + + + + %TRUE if the match was partial, %FALSE otherwise + +Since: 2.14 + + + Stops a #GMainLoop from running. Any calls to g_main_loop_run() @@ -8252,43 +11926,50 @@ for the loop will return. - + -Associates a list of integer values with @key under -@group_name. If @key cannot be found then it is created. +Converts a string to a #gdouble value. +This function behaves like the standard strtod() function +does in the C locale. It does this without actually +changing the current locale, since that would not be +thread-safe. + +This function is typically used when reading configuration +files or other non-user input that should be locale independent. +To handle input from the user you should normally use the +locale-sensitive system strtod() function. + +To convert from a #gdouble to a string in a locale-insensitive +way, use g_ascii_dtostr(). + +If the correct value would cause overflow, plus or minus %HUGE_VAL +is returned (according to the sign of the value), and %ERANGE is +stored in %errno. If the correct value would cause underflow, +zero is returned and %ERANGE is stored in %errno. + +This function resets %errno before calling strtod() so that +you can reliably detect overflow and underflow. -Since: 2.6 - - a #GKeyFile + + the string to convert to a numeric value. - - a group name - - - - a key - - - - an array of integer values - - - - number of integer values in @list + + if non-%NULL, it returns the character after +the last character used in the conversion. - + the #gdouble value. + -Returns the link at the given position - +Return value: The link at the @n'th position, or %NULL if @n is off the @@ -8316,7 +11997,7 @@ Converts a single character to UTF-8. - a ISO10646 character code + a Unicode character code @@ -8330,6 +12011,41 @@ and nothing will be written to @outbuf. + + +Bundles up pointers to each of the matching substrings from a match +and stores them in an array of gchar pointers. The first element in +the returned array is the match number 0, i.e. the entire matched +text. + +If a sub pattern didn't match anything (e.g. sub pattern 1, matching +"b" against "(a)?b") then an empty string is inserted. + +If the last match was obtained using the DFA algorithm, that is using +g_regex_match_all() or g_regex_match_all_full(), the retrieved +strings are not that matched by sets of parentheses but that of the +matched substring. Substrings are matched in reverse order of length, +so the first one is the longest match. + +The strings are fetched from the string passed to the match function, +so you cannot call this function after freeing the string. + + + + + + a #GMatchInfo structure + + + + a %NULL-terminated array of gchar * pointers. It must be +freed using g_strfreev(). If the previous match failed %NULL is +returned + +Since: 2.14 + + + Same as the standard UNIX routine iconv_close(), but @@ -8357,6 +12073,10 @@ more convenient than the raw iconv wrappers. Increases the reference count of the asynchronous @queue by 1. +@Deprecated: Since 2.8, reference counting is done atomically +so g_async_queue_ref() can be used regardless of the @queue's +lock. + @@ -8398,6 +12118,39 @@ case independent form of @str. + + +Compare two strings, ignoring the case of ASCII characters. + +Unlike the BSD strcasecmp() function, this only recognizes standard +ASCII letters and ignores the locale, treating all non-ASCII +bytes as if they are not letters. + +This function should be used only on strings that are known to be +in encodings where the bytes corresponding to ASCII letters always +represent themselves. This includes UTF-8 and the ISO-8859-* +charsets, but not for instance double-byte encodings like the +Windows Codepage 932, where the trailing bytes of double-byte +characters include all ASCII letters. If you compare two CP932 +strings using this function, you will get false matches. + + + + + + string to compare with @s2. + + + + string to compare with @s1. + + + + 0 if the strings match, a negative value if @s1 &lt; @s2, +or a positive value if @s1 &gt; @s2. + + + Converts a sequence of bytes encoded as UTF-8 to a Unicode character. @@ -8440,10 +12193,7 @@ g_utf8_get_char(). -Returns the default main context. This is the main context used -for main loop functions when a main loop is not explicitly -specified. - +Return value: the default main context. @@ -8452,6 +12202,22 @@ specified. + + +Frees all memory allocated by the #GStringChunk. +After calling g_string_chunk_free() it is not safe to +access any of the strings which were contained within it. + + + + + a #GStringChunk + + + + + + Convert a character to ASCII upper case. @@ -8478,19 +12244,24 @@ If @c is not an ASCII lower case letter, - + -Returns %TRUE if the queue is empty. +Quotes a string so that the shell (/bin/sh) will interpret the +quoted string to mean @unquoted_string. If you pass a filename to +the shell, for example, you should first quote it with this +function. The return value must be freed with g_free(). The +quoting style used is undefined (single or double quotes may be +used). - - a #GQueue. + + a literal string - %TRUE if the queue is empty. + quoted string @@ -8575,6 +12346,112 @@ always, string-&gt;str[string-&gt;len] will be a nul byte.) + + +Removes @group from the list of groups to which the bookmark +for @uri belongs to. + +In the event the URI cannot be found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. +In the event no group was defined, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_INVALID_VALUE. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + the group name to be removed + + + + return location for a #GError, or %NULL + + + + %TRUE if @group was successfully removed. + +Since: 2.12 + + + + + +Sets the meta-data of application @name inside the list of +applications that have registered a bookmark for @uri inside +@bookmark. + +You should rarely use this function; use g_bookmark_file_add_application() +and g_bookmark_file_remove_application() instead. + +@name can be any UTF-8 encoded string used to identify an +application. +@exec can have one of these two modifiers: "%f", which will +be expanded as the local file name retrieved from the bookmark's +URI; "%u", which will be expanded as the bookmark's URI. +The expansion is done automatically when retrieving the stored +command line using the g_bookmark_file_get_app_info() function. +@count is the number of times the application has registered the +bookmark; if is &lt; 0, the current registration count will be increased +by one, if is 0, the application with @name will be removed from +the list of registered applications. +@stamp is the Unix time of the last registration; if it is -1, the +current time will be used. + +If you try to remove an application by setting its registration count to +zero, and no bookmark for @uri is found, %FALSE is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND; similarly, +in the event that no application @name has registered a bookmark +for @uri, %FALSE is returned and error is set to +#G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED. Otherwise, if no bookmark +for @uri is found, one is created. + + + + + + a #GBookmarkFile + + + + a valid URI + + + + an application's name + + + + an application's command line + + + + the number of registrations done for this application + + + + the time of the last registration for this application + + + + return location for a #GError or %NULL + + + + %TRUE if the application's meta-data was successfully +changed. + +Since: 2.12 + + + Splits @string into a number of tokens not containing any of the characters @@ -8626,7 +12503,7 @@ Since: 2.4 -Finds a #GSource given a pair of context and ID +Finds a #GSource given a pair of context and ID. @@ -8636,7 +12513,7 @@ Finds a #GSource given a pair of context and ID - the source ID, as returned by g_source_get_id() + the source ID, as returned by g_source_get_id(). @@ -8672,6 +12549,24 @@ Since: 2.6 + + +Returns: %TRUE if the previous match operation succeeded, + + + + + a #GMatchInfo structure + + + + %TRUE if the previous match operation succeeded, +%FALSE otherwise + +Since: 2.14 + + + Prepares to poll sources within a main loop. The resulting information @@ -8695,6 +12590,68 @@ prior to polling. + + +This function looks for a key file named @file in the paths +specified in @search_dirs, loads the file into @key_file and +Return value: %TRUE if a key file could be loaded, %FALSE othewise + + + + + an empty #GKeyFile struct + + + + a relative path to a filename to open and parse + + + + %NULL-terminated array of directories to search + + + + return location for a string containing the full path +of the file, or %NULL + + + + flags from #GKeyFileFlags + + + + return location for a #GError, or %NULL + + + + %TRUE if a key file could be loaded, %FALSE othewise + +Since: 2.14 + + + + + +Retrieves every value inside @hash_table. The returned data is +valid until @hash_table is modified. + + + + + + a #GHashTable + + + + a #GList containing all the values inside the hash +table. The content of the list is owned by the hash table and +should not be modified or freed. Use g_list_free() when done +using the list. + +Since: 2.14 + + + Sets the function which is used to translate user-visible @@ -8729,29 +12686,24 @@ Since: 2.6 - + -Pops data from the @queue. If no data is received before @end_time, -%NULL is returned. This function must be called while holding the -@queue's lock. - -To easily calculate @end_time a combination of g_get_current_time() -and g_time_val_add() can be used. +Creates a new string @length bytes long filled with @fill_char. +The returned string should be freed when no longer needed. - - a #GAsyncQueue. + + the length of the new string - - a #GTimeVal, determining the final time. + + the byte to fill the string with - data from the queue or %NULL, when no data is -received before @end_time. + a newly-allocated string filled the @fill_char @@ -8913,6 +12865,43 @@ Since: 2.6 + + +Sets the function used to sort the list of tasks. This allows the +tasks to be processed by a priority determined by @func, and not +just in the order in which they were added to the pool. + +Note, if the maximum number of threads is more than 1, the order +that threads are executed can not be guranteed 100%. Threads are +scheduled by the operating system and are executed at random. It +cannot be assumed that threads are executed in the order they are +created. + +Since: 2.10 + + + + + a #GThreadPool + + + + the #GCompareDataFunc used to sort the list of tasks. +This function is passed two tasks. It should return +0 if the order in which they are handled does not matter, +a negative value if the first task should be processed before +the second or a positive value if the second task should be +processed first. + + + + user data passed to @func. + + + + + + A wrapper for the POSIX creat() function. The creat() function is @@ -8977,8 +12966,8 @@ terminated with a 0 character. - the maximum length of @str to use. If @len &lt; 0, then -the string is terminated with a 0 character. + the maximum length (number of &lt;type&gt;gunichar2&lt;/type&gt;) of @str to use. +If @len &lt; 0, then the string is terminated with a 0 character. @@ -9038,6 +13027,36 @@ so that the distance from the root to every leaf is as small as possible. + + +Flush the status from a sequence of calls to g_base64_encode_step(). + + + + + + whether to break long lines + + + + pointer to destination buffer + + + + Saved state from g_base64_encode_step() + + + + Saved state from g_base64_encode_step() + + + + The number of bytes of output that was written + +Since: 2.12 + + + Releases the queue's lock. @@ -9075,6 +13094,25 @@ descriptor to watch. + + +Atomically decrements the reference count of @hash_table by one. +If the reference count drops to 0, all keys and values will be +destroyed, and all memory allocated by the hash table is released. +This function is MT-safe and may be called from any thread. + +Since: 2.10 + + + + + a valid #GHashTable. + + + + + + Creates a new random number generator initialized with @seed. @@ -9091,6 +13129,23 @@ Creates a new random number generator initialized with @seed. + + +Return value: Whether @iter is the end iterator. + + + + + a #GSequenceIter + + + + Whether @iter is the end iterator. + +Since: 2.14 + + + Removes the last element of the queue. @@ -9108,22 +13163,45 @@ is empty. - + -Returns a pointer into @file_name after the root component, i.e. after -the "/" in UNIX or "C:\" under Windows. If @file_name is not an absolute -path it returns %NULL. +Inserts @data into @queue using @func to determine the new +position. +This function requires that the @queue is sorted before pushing on +new elements. + +This function will lock @queue before it sorts the queue and unlock +it when it is finished. + +For an example of @func see g_async_queue_sort(). + +Since: 2.10 - - a file name. + + a #GAsyncQueue + + + + the @data to push into the @queue + + + + the #GCompareDataFunc is used to sort @queue. This function +is passed two elements of the @queue. The function should return +0 if they are equal, a negative value if the first element +should be higher in the @queue or a positive value if the first +element should be lower in the @queue than the second element. + + + + user data passed to @func. - a pointer into @file_name after the root component. - + @@ -9144,22 +13222,36 @@ g_unichar_isxdigit()), its numeric value. Otherwise, -1. + + +Appends a formatted string onto the end of a #GString. +This function is is similar to g_string_append_printf() +except that the arguments to the format string are passed +as a va_list. + +Since: 2.14 + + + + + a #GString + + + + the string format. See the printf() documentation + + + + the list of arguments to insert in the output + + + + + + -Returns version information for the Windows operating system the -code is running on. See MSDN documentation for the GetVersion() -function. To summarize, the most significant bit is one on Win9x, -and zero on NT-based systems. The least significant byte is 4 on -Windows NT 4, 5 on Windows XP. Software that needs really detailled -version and feature information should use Win32 API like -GetVersionEx() and VerifyVersionInfo(). - -If there is an environment variable &lt;envar&gt;G_WIN32_PRETEND_WIN9X&lt;/envar&gt; -defined (with any value), this function always returns a version -code for Windows 9x. This is mainly an internal debugging aid for -GTK+ and GLib developers, to be able to check the code paths for -Windows 9x. - +Returns: The version information. @@ -9233,31 +13325,49 @@ filename, or %NULL on an error. - + -Pops data from the @queue. If no data is received before @end_time, -%NULL is returned. - -To easily calculate @end_time a combination of g_get_current_time() -and g_time_val_add() can be used. - +Returns: %TRUE if automatic help generation is turned on. - - a #GAsyncQueue. - - - - a #GTimeVal, determining the final time. + + a #GOptionContext - data from the queue or %NULL, when no data is -received before @end_time. + %TRUE if automatic help generation is turned on. + +Since: 2.6 + + +Adds a string to be displayed in &lt;option&gt;--help&lt;/option&gt; output +after the list of options. This text often includes a bug reporting +address. + +Note that the summary is translated (see +g_option_context_set_translate_func()). + +Since: 2.12 + + + + + a #GOptionContext + + + + a string to be shown in &lt;option&gt;--help&lt;/option&gt; output +after the list of options, or %NULL + + + + + + Sets the name of the program. This name should &lt;emphasis&gt;not&lt;/emphasis&gt; @@ -9322,12 +13432,30 @@ course the name of the program to execute. By default, the name of the program must be a full path; the &lt;envar&gt;PATH&lt;/envar&gt; shell variable will only be searched if you pass the %G_SPAWN_SEARCH_PATH flag. -On Windows, the low-level child process creation API -(CreateProcess())doesn't use argument vectors, +On Windows, note that all the string or string vector arguments to +this function and the other g_spawn*() functions are in UTF-8, the +GLib file name encoding. Unicode characters that are not part of +the system codepage passed in argument vectors will be correctly +available in the spawned program only if it uses wide character API +to retrieve its command line. For C programs built with Microsoft's +tools it is enough to make the program have a wmain() instead of +main(). wmain() has a wide character argument vector as parameter. + +At least currently, mingw doesn't support wmain(), so if you use +mingw to develop the spawned program, it will have to call the +undocumented function __wgetmainargs() to get the wide character +argument vector and environment. See gspawn-win32-helper.c in the +GLib sources or init.c in the mingw runtime sources for a prototype +for that function. Alternatively, you can retrieve the Win32 system +level wide character command line passed to the spawned program +using the GetCommandLineW() function. + +On Windows the low-level child process creation API +&lt;function&gt;CreateProcess()&lt;/function&gt; doesn't use argument vectors, but a command line. The C runtime library's &lt;function&gt;spawn*()&lt;/function&gt; family of functions (which g_spawn_async_with_pipes() eventually calls) paste the argument -vector elements into a command line, and the C runtime startup code +vector elements together into a command line, and the C runtime startup code does a corresponding reconstruction of an argument vector from the command line, to be passed to main(). Complications arise when you have argument vector elements that contain spaces of double quotes. The @@ -9385,22 +13513,22 @@ exec(). That is, @child_setup is called just before calling exec() in the child. Obviously actions taken in this function will only affect the child, not the parent. On Windows, there is no separate fork() and exec() -functionality. Child processes are created and run right away with -one API call, CreateProcess(). @child_setup is +functionality. Child processes are created and run with +a single API call, CreateProcess(). @child_setup is called in the parent process just before creating the child process. You should carefully consider what you do in @child_setup if you intend your software to be portable to Windows. If non-%NULL, @child_pid will on Unix be filled with the child's process ID. You can use the process ID to send signals to the -child, or to waitpid() if you specified the +child, or to use g_child_watch_add() (or waitpid()) if you specified the %G_SPAWN_DO_NOT_REAP_CHILD flag. On Windows, @child_pid will be filled with a handle to the child process only if you specified the %G_SPAWN_DO_NOT_REAP_CHILD flag. You can then access the child process using the Win32 API, for example wait for its termination with the &lt;function&gt;WaitFor*()&lt;/function&gt; functions, or examine its exit code with GetExitCodeProcess(). You should close the handle -with CloseHandle() when you no longer need it. +with CloseHandle() or g_spawn_close_pid() when you no longer need it. If non-%NULL, the @standard_input, @standard_output, @standard_error locations will be filled with file descriptors for writing to the child's @@ -9409,14 +13537,16 @@ The caller of g_spawn_async_with_pipes() must close these file descriptors when they are no longer in use. If these parameters are %NULL, the corresponding pipe won't be created. -If @standard_input is NULL, the child's standard input is attached to /dev/null -unless %G_SPAWN_CHILD_INHERITS_STDIN is set. +If @standard_input is NULL, the child's standard input is attached to +/dev/null unless %G_SPAWN_CHILD_INHERITS_STDIN is set. -If @standard_error is NULL, the child's standard error goes to the same location -as the parent's standard error unless %G_SPAWN_STDERR_TO_DEV_NULL is set. +If @standard_error is NULL, the child's standard error goes to the same +location as the parent's standard error unless %G_SPAWN_STDERR_TO_DEV_NULL +is set. -If @standard_output is NULL, the child's standard output goes to the same location -as the parent's standard output unless %G_SPAWN_STDOUT_TO_DEV_NULL is set. +If @standard_output is NULL, the child's standard output goes to the same +location as the parent's standard output unless %G_SPAWN_STDOUT_TO_DEV_NULL +is set. @error can be %NULL to ignore errors, or non-%NULL to report errors. If an error is set, the function returns %FALSE. Errors @@ -9431,19 +13561,26 @@ and @standard_error will not be filled with valid values. If @child_pid is not %NULL and an error does not occur then the returned pid must be closed using g_spawn_close_pid(). +&lt;note&gt;&lt;para&gt; +If you are writing a GTK+ application, and the program you +are spawning is a graphical application, too, then you may +want to use gdk_spawn_on_screen_with_pipes() instead to ensure that +the spawned program opens its windows no the right screen. +&lt;/para&gt;&lt;/note&gt; + - child's current working directory, or %NULL to inherit parent's + child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding - child's argument vector + child's argument vector, in the GLib file name encoding - child's environment, or %NULL to inherit parent's + child's environment, or %NULL to inherit parent's, in the GLib file name encoding @@ -9483,31 +13620,83 @@ pid must be closed using g_spawn_close_pid(). - + -This function cannot be called on a channel with %NULL encoding. +Return value: The #GSequenceIter at position @pos + + + + + a #GSequence + + + + a position in @seq, or -1 for the end. + + + + The #GSequenceIter at position @pos + +Since: 2.14 + + + + + +Converts from a pointer to position within a string to a integer +character offset. + +Since 2.10, this function allows @pos to be before @str, and returns +a negative offset in this case. - - a #GIOChannel + + a UTF-8 encoded string - - a character - - - - A location to return an error of type #GConvertError -or #GIOChannelError + + a pointer to a position within @str - a #GIOStatus + the resulting character offset + + +Sets the time the bookmark for @uri was last visited. + +If no bookmark for @uri is found then it is created. + +The "visited" time should only be set if the bookmark was launched, +either using the command line retrieved by g_bookmark_file_get_app_info() +or by the default application for the bookmark's MIME type, retrieved +using g_bookmark_file_get_mime_type(). Changing the "visited" time +does not affect the "modified" time. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI + + + + a timestamp or -1 to use the current time + + + + + + Copies a #GRand into a new one with the same exact state as before. @@ -9538,8 +13727,9 @@ waitpid(); standard UNIX macros such as WIFEXITED() and WEXITSTATUS() must be used to evaluate the exit status. If an error occurs, no data is returned in @standard_output, @standard_error, or @exit_status. -This function calls g_spawn_async_with_pipes() internally; see that function -for full details on the other parameters. +This function calls g_spawn_async_with_pipes() internally; see that +function for full details on the other parameters and details on +how these functions work on Windows. @@ -9591,8 +13781,7 @@ for full details on the other parameters. -Returns the position of the first element in @queue which contains @data. - +Return value: The position of the first element in @queue which contains @data, or -1 if no element in @queue contains @data. @@ -9611,53 +13800,31 @@ Since: 2.4 - + -Convert a string from UTF-16 to UTF-8. The result will be -terminated with a 0 byte. - -Note that the input is expected to be already in native endianness, -an initial byte-order-mark character is not handled specially. -g_convert() can be used to convert a byte buffer of UTF-16 data of -ambiguous endianess. +Find the rightmost occurrence of the given Unicode character +in a UTF-8 encoded string, while limiting the search to @len bytes. +If @len is -1, allow unbounded search. - - a UTF-16 encoded string + + a nul-terminated UTF-8 encoded string - the maximum length of @str to use. If @len &lt; 0, then -the string is terminated with a 0 character. + the maximum length of @p - - location to store number of words read, or %NULL. -If %NULL, then %G_CONVERT_ERROR_PARTIAL_INPUT will be -returned in case @str contains a trailing partial -character. If an error occurs then the index of the -invalid input is stored here. - - - - location to store number of bytes written, or %NULL. -The value stored here does not include the trailing -0 byte. - - - - location to store the error occuring, or %NULL to ignore -errors. Any of the errors in #GConvertError other than -%G_CONVERT_ERROR_NO_CONVERSION may occur. + + a Unicode character - a pointer to a newly allocated UTF-8 string. -This value must be freed with g_free(). If an -error occurs, %NULL will be returned and -@error set. + %NULL if the string does not contain the character, +otherwise, a pointer to the start of the rightmost occurrence of the +character in the string. @@ -9703,6 +13870,23 @@ calls g_error_free() on *@err and sets *@err to %NULL. + + +Return value: the end iterator for @seq + + + + + a #GSequence + + + + the end iterator for @seq + +Since: 2.14 + + + Convert a character to ASCII lower case. @@ -9731,8 +13915,7 @@ If @c is not an ASCII upper case letter, -Returns the number of items in @queue. - +Return value: The number of items in @queue. @@ -9801,9 +13984,7 @@ Since: 2.2 -Returns a random #gint32 equally distributed over the range -[@begin..@end-1]. - +Return value: A random number. @@ -9834,6 +14015,8 @@ See g_datalist_set_flags(). the flags of the datalist + +Since: 2.8 @@ -9880,7 +14063,7 @@ It returns a pointer into the given file name string. the name of the file without any leading directory components. -Deprecated: Use g_path_get_basename() instead, but notice that +Deprecated:2.2: Use g_path_get_basename() instead, but notice that g_path_get_basename() allocates new memory for the returned string, unlike this function which returns a pointer into the argument. @@ -9914,8 +14097,7 @@ Since: 2.6 -Returns whether @channel is buffered. - +Return Value: %TRUE if the @channel is buffered. @@ -9928,47 +14110,75 @@ Returns whether @channel is buffered. - + -Converts a string from UTF-8 to the encoding used for strings by -the C runtime (usually the same as that used by the operating -system) in the current locale. +Reads all the remaining data from the file. - - a UTF-8 encoded string + + a #GIOChannel - - the length of the string, or -1 if the string is -nul-terminated&lt;footnoteref linkend="nul-unsafe"/&gt;. + + Location to store a pointer to a string holding +the remaining data in the #GIOChannel. This data should +be freed with g_free() when no longer needed. This +data is terminated by an extra nul character, but there +may be other nuls in the intervening data. - - location to store the number of bytes in the -input string that were successfully converted, or %NULL. -Even if the conversion was successful, this may be -less than @len if there were partial characters -at the end of the input. If the error -#G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value -stored will the byte offset after the last valid -input sequence. - - - - the number of bytes stored in the output buffer (not -including the terminating nul). + + Location to store length of the data - location to store the error occuring, or %NULL to ignore -errors. Any of the errors in #GConvertError may occur. + A location to return an error of type #GConvertError +or #GIOChannelError - The converted string, or %NULL on an error. + %G_IO_STATUS_NORMAL on success. +This function never returns %G_IO_STATUS_EOF. + + + + + +Removes the item pointed to by @iter. It is an error to pass the +end iterator to this function. + +If the sequnce has a data destroy function associated with it, this +function is called on the data for the removed item. + +Since: 2.14 + + + + + a #GSequenceIter + + + + + + + + +Determines whether a character is a lowercase letter. +Given some UTF-8 text, obtain a character value with +g_utf8_get_char(). + + + + + + a Unicode character + + + + %TRUE if @c is a lowercase letter @@ -9993,8 +14203,7 @@ available immediately. -Return value: The main loop recursion level in the current thread - +Returns the depth of the stack of calls to @@ -10112,22 +14321,21 @@ there is more work to do. - + -Sets the character which is used to separate -values in lists. Typically ';' or ',' are used -as separators. The default list separator is ';'. +Removes all keys and their associated values from a #GHashTable. -Since: 2.6 +If the #GHashTable was created using g_hash_table_new_full(), the keys +and values are freed using the supplied destroy functions, otherwise you +have to make sure that any dynamically allocated values are freed +yourself. + +Since: 2.12 - - a #GKeyFile - - - - the separator + + a #GHashTable @@ -10136,9 +14344,7 @@ Since: 2.6 -Returns the next random #gdouble from @rand_ equally distributed over -the range [@begin..@end). - +Return value: A random number. @@ -10196,19 +14402,17 @@ Converts a #GString to uppercase. - the #GString + @string -Deprecated: This function uses the locale-specific toupper() function, -which is almost never the right thing. Use g_string_ascii_up() or -g_utf8_strup() instead. +Deprecated:2.2: This function uses the locale-specific +toupper() function, which is almost never the right thing. +Use g_string_ascii_up() or g_utf8_strup() instead. -Returns %TRUE if @error matches @domain and @code, %FALSE -otherwise. - +Return value: whether @error has @domain and @code @@ -10229,6 +14433,26 @@ otherwise. + + +Creates a new #GString, with enough space for @dfl_size +bytes. This is useful if you are going to add a lot of +text to the string and don't want it to be reallocated +too often. + + + + + + the default size of the space allocated to +hold the string + + + + the new #GString + + + Return the path to the lib\locale subfolder of the GLib @@ -10244,13 +14468,17 @@ interface. -Converts a filename into a valid UTF-8 string. The -conversion is not necessarily reversible, so you -should keep the original around and use the return -value of this function only for display purposes. -Unlike g_filename_to_utf8(), the result is guaranteed -to be non-NULL even if the filename actually isn't in the GLib -file name encoding. +Converts a filename into a valid UTF-8 string. The conversion is +not necessarily reversible, so you should keep the original around +and use the return value of this function only for display purposes. +Unlike g_filename_to_utf8(), the result is guaranteed to be non-%NULL +even if the filename actually isn't in the GLib file name encoding. + +If GLib can not make sense of the encoding of @filename, as a last resort it +replaces unknown characters with U+FFFD, the Unicode replacement character. +You can search the result for the UTF-8 encoding of this character (which is +"\357\277\275" in octal notation) to find out if @filename was in an invalid +encoding. If you know the whole pathname of the file you should use g_filename_display_basename(), since that allows location-based @@ -10390,45 +14618,76 @@ to do. - + -Reads a line, including the terminating character(s), -from a #GIOChannel into a newly-allocated string. -@str_return will contain allocated memory if the return -is %G_IO_STATUS_NORMAL. +Increases reference count of @regex by 1. - - a #GIOChannel - - - - The line read from the #GIOChannel, including the -line terminator. This data should be freed with g_free() -when no longer needed. This is a nul-terminated string. -If a @length of zero is returned, this will be %NULL instead. - - - - location to store length of the read data, or %NULL - - - - location to store position of line terminator, or %NULL - - - - A location to return an error of type #GConvertError -or #GIOChannelError + + a #GRegex - the status of the operation. + @regex + +Since: 2.14 + + +Adds a byte onto the start of a #GString, +expanding it if necessary. + + + + + + a #GString + + + + the byte to prepend on the start of the #GString + + + + @string + + + + + +Moves the data pointed to a new position as indicated by @cmp_func. This +function should be called for items in a sequence already sorted according +to @cmp_func whenever some aspect of an item changes so that @cmp_func +may return different values for that item. + +Since: 2.14 + + + + + A #GSequenceIter + + + + the #GCompareDataFunc used to compare items in the sequence. It +is called with two items of the @seq and @user_data. It should +return 0 if the items are equal, a negative value if the first +item comes before the second, and a positive value if the second +item comes before the first. + + + + user data passed to @cmp_func. + + + + + + An auxiliary function for gettext() support (see Q_()). @@ -10489,23 +14748,73 @@ of records that need to be stored. -Gets the current user's home directory. +Gets the current user's home directory as defined in the +password database. Note that in contrast to traditional UNIX tools, this function prefers &lt;filename&gt;passwd&lt;/filename&gt; entries over the &lt;envar&gt;HOME&lt;/envar&gt; -environment variable. +environment variable. + +One of the reasons for this decision is that applications in many +cases need special handling to deal with the case where +&lt;envar&gt;HOME&lt;/envar&gt; is +&lt;simplelist&gt; +&lt;member&gt;Not owned by the user&lt;/member&gt; +&lt;member&gt;Not writeable&lt;/member&gt; +&lt;member&gt;Not even readable&lt;/member&gt; +&lt;/simplelist&gt; +Since applications are in general &lt;emphasis&gt;not&lt;/emphasis&gt; written +to deal with these situations it was considered better to make +g_get_homedir() not pay attention to &lt;envar&gt;HOME&lt;/envar&gt; and to +return the real home directory for the user. If applications +want to pay attention to &lt;envar&gt;HOME&lt;/envar&gt;, they can do: +&lt;informalexample&gt;&lt;programlisting&gt; +const char *homedir = g_getenv ("HOME"); +if (!homedir) +homedir = g_get_homedir (&lt;!-- --&gt;); +&lt;/programlisting&gt;&lt;/informalexample&gt; - the current user's home directory. + the current user's home directory + + +Copies a block of memory @len bytes long, from @src to @dest. +The source and destination areas may overlap. + +In order to use this function, you must include +&lt;filename&gt;string.h&lt;/filename&gt; yourself, because this macro will +typically simply resolve to memmove() and GLib does not include +&lt;filename&gt;string.h&lt;/filename&gt; for you. + + + + + the destination address to copy the bytes to. + + + + the source address to copy the bytes from. + + + + the number of bytes to copy. + + + + + + -Frees the memory allocated for the #GQueue. +Frees the memory allocated for the #GQueue. Only call this function if +@queue was created with g_queue_new(). If queue elements contain +dynamically-allocated memory, they should be freed first. @@ -10517,6 +14826,31 @@ Frees the memory allocated for the #GQueue. + + +Returns: the expanded string, or %NULL if an error occurred + + + + + a #GMatchInfo or %NULL + + + + the string to expand + + + + location to store the error occuring, or %NULL to ignore errors + + + + the expanded string, or %NULL if an error occurred + +Since: 2.14 + + + Loads a key file from memory into an empty #GKeyFile structure. If @@ -10566,19 +14900,13 @@ Converts all lower case ASCII letters to upper case ASCII letters. passed-in @string pointer, with all the lower case characters converted to upper case in place, with -semantics that exactly match g_ascii_toupper. +semantics that exactly match g_ascii_toupper(). -Returns the value associated with @key under @group_name. - -In the event the key cannot be found, %NULL is returned and -@error is set to #G_KEY_FILE_ERROR_KEY_NOT_FOUND. In the -event that the @group_name cannot be found, %NULL is returned -and @error is set to #G_KEY_FILE_ERROR_GROUP_NOT_FOUND. - +Return value: a newly allocated string or %NULL if the specified @@ -10631,8 +14959,7 @@ for example if elements are still open. -Returns the maximal number of threads for @pool. - +Return value: the maximal number of threads @@ -10689,6 +15016,38 @@ loop with an external event loop. + + +Compiles the regular expression to an internal form, and does +the initial setup of the #GRegex structure. + + + + + + the regular expression + + + + compile options for the regular expression + + + + match options for the regular expression + + + + return location for a #GError + + + + a #GRegex structure. Call g_regex_unref() when you +are done with it + +Since: 2.14 + + + Removes the last element of the queue. @@ -10725,8 +15084,8 @@ timeout is recalculated based on the current time and the given interval - the priority of the idle source. Typically this will be in the -range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. + the priority of the timeout source. Typically this will be in +the range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH. @@ -10743,11 +15102,76 @@ range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. - function to call when the idle is removed, or %NULL + function to call when the timeout is removed, or %NULL - the id of event source. + the ID (greater than 0) of the event source. + + + + + +Return value: %TRUE if the source has been destroyed + + + + + a #GSource + + + + %TRUE if the source has been destroyed + +Since: 2.12 + + + + + +Sets the value of a date from a #GTimeVal value. Note that the +@tv_usec member is ignored, because #GDate can't make use of the +additional precision. + +Since: 2.10 + + + + + a #GDate + + + + #GTimeVal value to set + + + + + + + + +Determines if a given character typically takes zero width when rendered. +The return value is %TRUE for all non-spacing and enclosing marks +(e.g., combining accents), format characters, zero-width +space, but not U+00AD SOFT HYPHEN. + +A typical use of this function is with one of g_unichar_iswide() or +g_unichar_iswide_cjk() to determine the number of cells a string occupies +when displayed on a grid display (terminals). However, note that not all +terminals support zero-width rendering of zero-width marks. + + + + + + a Unicode character + + + + %TRUE if the character has zero width + +Since: 2.14 @@ -10779,50 +15203,67 @@ utility functions with it.) + + +Checks whether @replacement is a valid replacement string +(see g_regex_replace()), i.e. that all escape sequences in +it are valid. + +If @has_references is not %NULL then @replacement is checked +for pattern references. For instance, replacement text 'foo\n' +does not contain references and may be evaluated without information +about actual match, but '\0\1' (whole match followed by first +subpattern) requires valid #GMatchInfo object. + + + + + + the replacement string + + + + location to store information about +references in @replacement or %NULL + + + + location to store error + + + + whether @replacement is a valid replacement string + +Since: 2.14 + + + + + +Decode a sequence of Base-64 encoded text into binary data + + + + + + zero-terminated string with base64 text to decode + + + + The length of the decoded data is written here + + + + a newly allocated buffer containing the binary data +that @text represents + +Since: 2.12 + + + -Returns %TRUE if any of the tests in the bitfield @test are -%TRUE. For example, &lt;literal&gt;(G_FILE_TEST_EXISTS | -G_FILE_TEST_IS_DIR)&lt;/literal&gt; will return %TRUE if the file exists; -the check whether it's a directory doesn't matter since the existence -test is %TRUE. With the current set of available tests, there's no point -passing in more than one test at a time. - -Apart from %G_FILE_TEST_IS_SYMLINK all tests follow symbolic links, -so for a symbolic link to a regular file g_file_test() will return -%TRUE for both %G_FILE_TEST_IS_SYMLINK and %G_FILE_TEST_IS_REGULAR. - -Note, that for a dangling symbolic link g_file_test() will return -%TRUE for %G_FILE_TEST_IS_SYMLINK and %FALSE for all other flags. - -You should never use g_file_test() to test whether it is safe -to perform an operation, because there is always the possibility -of the condition changing before you actually perform the operation. -For example, you might think you could use %G_FILE_TEST_IS_SYMLINK -to know whether it is is safe to write to a file without being -tricked into writing into a different location. It doesn't work! - -&lt;informalexample&gt;&lt;programlisting&gt; -/&ast; DON'T DO THIS &ast;/ -if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK)) { -fd = g_open (filename, O_WRONLY); -/&ast; write to fd &ast;/ -} -&lt;/programlisting&gt;&lt;/informalexample&gt; - -Another thing to note is that %G_FILE_TEST_EXISTS and -%G_FILE_TEST_IS_EXECUTABLE are implemented using the access() -system call. This usually doesn't matter, but if your program -is setuid or setgid it means that these tests will give you -the answer for the real user ID and group ID, rather than the -effective user ID and group ID. - -On Windows, there are no symlinks, so testing for -%G_FILE_TEST_IS_SYMLINK will always return %FALSE. Testing for -%G_FILE_TEST_IS_EXECUTABLE will just check that the file exists and -its name indicates that it is executable, checking for well-known -extensions and those listed in the %PATHEXT environment variable. - +Return value: whether a test was %TRUE @@ -10839,29 +15280,97 @@ extensions and those listed in the %PATHEXT environment variable. - + -Returns the length of the queue, negative values mean waiting -threads, positive values mean available entries in the -@queue. Actually this function returns the number of data items in -the queue minus the number of waiting threads. Thus a return value -of 0 could mean 'n' entries in the queue and 'n' thread waiting. -That can happen due to locking of the queue or due to -scheduling. This function must be called while holding the @queue's -lock. +Searches the string @haystack for the first occurrence +of the string @needle, limiting the length of the search +to @haystack_len. - - a #GAsyncQueue. + + a string. + + + + the maximum length of @haystack. + + + + the string to search for. - the length of the @queue. + a pointer to the found occurrence, or +%NULL if not found. + + +Converts a #gdouble to a string, using the '.' as +decimal point. To format the number you pass in +a printf()-style format string. Allowed conversion +specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'. + +If you just want to want to serialize the value into a +string, use g_ascii_dtostr(). + + + + + + A buffer to place the resulting string in + + + + The length of the buffer. + + + + The printf()-style format to use for the +code to use for converting. + + + + The #gdouble to convert + + + + The pointer to the buffer with the converted string. + + + + + +Sets @title as the title of the bookmark for @uri inside the +bookmark file @bookmark. + +If @uri is %NULL, the title of @bookmark is set. + +If a bookmark for @uri cannot be found then it is created. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + a valid URI or %NULL + + + + a UTF-8 encoded string + + + + + + Sets the maximal allowed number of threads for @pool. A value of -1 @@ -10943,7 +15452,7 @@ is fairly complex.) - %TRUE if @c is a punctuation character + %TRUE if @c is a space character @@ -10993,19 +15502,89 @@ error occurs, %NULL will be returned and - + -Makes a copy of @error. +Searches a #GTree using @search_func. + +The @search_func is called with a pointer to the key of a key/value pair in +the tree, and the passed in @user_data. If @search_func returns 0 for a +key/value pair, then g_tree_search_func() will return the value of that +pair. If @search_func returns -1, searching will proceed among the +key/value pairs that have a smaller key; if @search_func returns 1, +searching will proceed among the key/value pairs that have a larger key. - - a #GError + + a #GTree. + + + + a function used to search the #GTree. + + + + the data passed as the second argument to the @search_func +function. - a new #GError + the value corresponding to the found key, or %NULL if the key +was not found. + + + + + +Gets the name of the program. This name should &lt;emphasis&gt;not&lt;/emphasis&gt; +be localized, contrast with g_get_application_name(). +(If you are using GDK or GTK+ the program name is set in gdk_init(), +which is called by gtk_init(). The program name is found by taking +the last component of &lt;literal&gt;argv[0]&lt;/literal&gt;.) + + + + + + the name of the program. The returned string belongs +to GLib and must not be modified or freed. + + + + + +Inserts @len bytes of @val into @string at @pos. +Because @len is provided, @val may contain embedded +nuls and need not be nul-terminated. If @pos is -1, +bytes are inserted at the end of the string. + +Since this function does not stop at nul bytes, it is +the caller's responsibility to ensure that @val has at +least @len addressable bytes. + + + + + + a #GString + + + + position in @string where insertion should +happen, or -1 for at the end + + + + bytes to insert + + + + number of bytes of @val to insert + + + + @string @@ -11039,27 +15618,58 @@ so that the distance from the root to every leaf is as small as possible. - + -Converts all lower case ASCII letters to upper case ASCII letters. +This function creates a new thread pool. + +Whenever you call g_thread_pool_push(), either a new thread is +created or an unused one is reused. At most @max_threads threads +are running concurrently for this thread pool. @max_threads = -1 +allows unlimited threads to be created for this thread pool. The +newly created or reused thread now executes the function @func with +the two arguments. The first one is the parameter to +g_thread_pool_push() and the second one is @user_data. + +The parameter @exclusive determines, whether the thread pool owns +all threads exclusive or whether the threads are shared +globally. If @exclusive is %TRUE, @max_threads threads are started +immediately and they will run exclusively for this thread pool until +it is destroyed by g_thread_pool_free(). If @exclusive is %FALSE, +threads are created, when needed and shared between all +non-exclusive thread pools. This implies that @max_threads may not +be -1 for exclusive thread pools. + +@error can be %NULL to ignore errors, or non-%NULL to report +errors. An error can only occur when @exclusive is set to %TRUE and +not all @max_threads threads could be created. - - a string. + + a function to execute in the threads of the new thread pool - - length of @str in bytes, or -1 if @str is nul-terminated. + + user data that is handed over to @func every time it +is called + + + + the maximal number of threads to execute concurrently in +the new thread pool, -1 means no limit + + + + should this thread pool be exclusive? + + + + return location for error - a newly allocated string, with all the lower case -characters in @str converted to upper case, with -semantics that exactly match g_ascii_toupper(). (Note -that this is unlike the old g_strup(), which modified -the string in place.) + the new #GThreadPool @@ -11080,7 +15690,36 @@ that context. - the ID for the source within the #GMainContext + the ID (greater than 0) for the source within the +#GMainContext. + + + + + +An implementation of the standard fprintf() function which supports +positional parameters, as specified in the Single Unix Specification. + + + + + + the stream to write to. + + + + a standard printf() format string, but notice +&lt;link linkend="string-precision"&gt;string precision pitfalls&lt;/link&gt;. + + + + the list of arguments to insert in the output. + + + + the number of characters printed. + +Since: 2.2 @@ -11172,7 +15811,8 @@ If the key does not exist in the #GTree, the function does nothing. - %TRUE if the key was found (prior to 2.8, this function returned nothing) + %TRUE if the key was found (prior to 2.8, this function returned +nothing) @@ -11215,6 +15855,35 @@ Creates a new asynchronous queue with the initial reference count of 1. Specifies a function to be called at normal program termination. +Since GLib 2.8.2, on Windows g_atexit() actually is a preprocessor +macro that maps to a call to the atexit() function in the C +library. This means that in case the code that calls g_atexit(), +i.e. atexit(), is in a DLL, the function will be called when the +DLL is detached from the program. This typically makes more sense +than that the function is called when the GLib DLL is detached, +which happened earlier when g_atexit() was a function in the GLib +DLL. + +The behaviour of atexit() in the context of dynamically loaded +modules is not formally specified and varies wildly. + +On POSIX systems, calling g_atexit() (or atexit()) in a dynamically +loaded module which is unloaded before the program terminates might +well cause a crash at program exit. + +Some POSIX systems implement atexit() like Windows, and have each +dynamically loaded module maintain an own atexit chain that is +called when the module is unloaded. + +On other POSIX systems, before a dynamically loaded module is +unloaded, the registered atexit functions (if any) residing in that +module are called, regardless where the code that registered them +resided. This is presumably the most robust approach. + +As can be seen from the above, for portability it's best to avoid +calling g_atexit() (or atexit()) except in the main executable of a +program. + @@ -11228,11 +15897,11 @@ Specifies a function to be called at normal program termination. Compares two strings for ordering using the linguistically -correct rules for the current locale. When sorting a large -number of strings, it will be significantly faster to -obtain collation keys with g_utf8_collate_key() and -compare the keys with strcmp() when -sorting instead of sorting the original strings. +correct rules for the &lt;link linkend="setlocale"&gt;current locale&lt;/link&gt;. +When sorting a large number of strings, it will be significantly +faster to obtain collation keys with g_utf8_collate_key() and +compare the keys with strcmp() when sorting instead of sorting +the original strings. @@ -11251,6 +15920,83 @@ sorting instead of sorting the original strings. + + +See g_spawn_async_with_pipes() for a full description; this function +simply calls the g_spawn_async_with_pipes() without any pipes. + +&lt;note&gt;&lt;para&gt; +If you are writing a GTK+ application, and the program you +are spawning is a graphical application, too, then you may +want to use gdk_spawn_on_screen() instead to ensure that +the spawned program opens its windows on the right screen. +&lt;/para&gt;&lt;/note&gt; + + + + + + child's current working directory, or %NULL to inherit parent's + + + + child's argument vector + + + + child's environment, or %NULL to inherit parent's + + + + flags from #GSpawnFlags + + + + function to run in the child just before exec() + + + + user data for @child_setup + + + + return location for child process ID, or %NULL + + + + return location for error + + + + %TRUE on success, %FALSE if error is set + + + + + +Pops data from the @queue. If no data is received before @end_time, +%NULL is returned. + +To easily calculate @end_time a combination of g_get_current_time() +and g_time_val_add() can be used. + + + + + + a #GAsyncQueue. + + + + a #GTimeVal, determining the final time. + + + + data from the queue or %NULL, when no data is +received before @end_time. + + + Splits an URI list conforming to the text/uri-list @@ -11273,43 +16019,32 @@ Since: 2.6 - + -Converts a string to a #guint64 value. -This function behaves like the standard strtoull() function -does in the C locale. It does this without actually -changing the current locale, since that would not be -thread-safe. - -This function is typically used when reading configuration -files or other non-user input that should be locale independent. -To handle input from the user you should normally use the -locale-sensitive system strtoull() function. - -If the correct value would cause overflow, %G_MAXUINT64 -is returned, and %ERANGE is stored in %errno. +Inserts a new key and value into a #GHashTable. +If the key already exists in the #GHashTable its current value is replaced +with the new value. If you supplied a @value_destroy_func when creating the +#GHashTable, the old value is freed using that function. If you supplied +a @key_destroy_func when creating the #GHashTable, the passed key is freed +using that function. - - the string to convert to a numeric value. + + a #GHashTable. - - if non-%NULL, it returns the character after -the last character used in the conversion. + + a key to insert. - - to be used for the conversion, 2..36 or 0 + + the value to associate with the key. - the #guint64 value. - -Since: 2.2 - + @@ -11330,22 +16065,27 @@ data, only one will be destroyed. - + -Returns the week of the year, where weeks are interpreted according -to ISO 8601. +Removes a key and its associated value from a #GTree without calling +the key and value destroy functions. + +If the key does not exist in the #GTree, the function does nothing. - - a valid #GDate + + a #GTree. + + + + the key to remove. - ISO 8601 week number of the year. - -Since: 2.6 + %TRUE if the key was found (prior to 2.8, this function returned +nothing) @@ -11449,21 +16189,75 @@ don't want to supply such a function. - + -On some platforms, notably WIN32, the #GPid type represents a resource -which must be closed to prevent resource leaking. g_spawn_close_pid() -is provided for this purpose. It should be used on all platforms, even -though it doesn't do anything under UNIX. +Gets the poll function set by g_main_context_set_poll_func(). + - - The process identifier to close + + a #GMainContext - + the poll function + + + + + +Adds a copy of @string to the #GStringChunk, unless the same +string has already been added to the #GStringChunk with +g_string_chunk_insert_const(). + +This function is useful if you need to copy a large number +of strings but do not want to waste space storing duplicates. +But you must remember that there may be several pointers to +the same string, and so any changes made to the strings +should be done very carefully. + +Note that g_string_chunk_insert_const() will not return a +pointer to a string added with g_string_chunk_insert(), even +if they do match. + + + + + + a #GStringChunk + + + + the string to add + + + + a pointer to the new or existing copy of @string +within the #GStringChunk + + + + + +Frees the memory allocated for the #GString. +If @free_segment is %TRUE it also frees the character data. + + + + + + a #GString + + + + if %TRUE the actual character data is freed as well + + + + the character data of @string +(i.e. %NULL if @free_segment is %TRUE) + @@ -11484,6 +16278,29 @@ or has no upper case equivalent @c is returned unchanged. + + +Removes all items in the (@begin, @end) range. + +If the sequence has a data destroy function associated with it, this +function is called on the data for the removed items. + +Since: 2.14 + + + + + a #GSequenceIter + + + + a #GSequenceIter + + + + + + This sets the string that #GIOChannel uses to determine @@ -11521,7 +16338,9 @@ positional parameters, as specified in the Single Unix Specification. - the buffer to hold the output. + A pointer to a memory buffer to contain the resulting string. It +is up to the caller to ensure that the allocated buffer is large +enough to hold the formatted result @@ -11566,7 +16385,7 @@ characters of the strings. 0 if the strings match, a negative value if @s1 &lt; @s2, or a positive value if @s1 &gt; @s2. -Deprecated: The problem with g_strncasecmp() is that it does the +Deprecated:2.2: The problem with g_strncasecmp() is that it does the comparison by calling toupper()/tolower(). These functions are locale-specific and operate on single bytes. However, it is impossible to handle things correctly from an I18N standpoint by operating on @@ -11603,6 +16422,23 @@ Computes the canonical decomposition of a Unicode character. + + +Return value: the begin iterator for @seq. + + + + + a #GSequence + + + + the begin iterator for @seq. + +Since: 2.14 + + + Expires a single cache bucket @bucket. This should only ever be @@ -11626,44 +16462,55 @@ search for it ourselves. - + -Creates a new child_watch source. - -The source will not initially be associated with any #GMainContext -and must be added to one with g_source_attach() before it will be -executed. - -Note that on platforms where #GPid must be explicitely closed -(see g_spawn_close_pid()) @pid must not be closed while the -source is still active. Typically, you will want to call -g_spawn_close_pid() in the callback function for the source. - -Note further that using g_child_watch_source_new() is not -compatible with calling &lt;literal&gt;waitpid(-1)&lt;/literal&gt; in -the application. Calling waitpid() for individual pids will -still work fine. +Creates a new #GTree with a comparison function that accepts user data. +See g_tree_new() for more details. - - process id of a child process to watch. On Windows, a HANDLE -for the process to watch (which actually doesn't have to be a child). + + qsort()-style comparison function. + + + + data to pass to comparison function. - the newly-created child watch source - -Since: 2.4 + a new #GTree. + + +Removes the specified group, @group_name, +from the key file. + +Since: 2.6 + + + + + a #GKeyFile + + + + a group name + + + + return location for a #GError or %NULL + + + + + + -Returns the next random #guint32 from @rand_ equally distributed over -the range [0..2^32-1]. - +Return value: A random number. @@ -11676,6 +16523,67 @@ the range [0..2^32-1]. + + +Determines if a character is typically rendered in a double-width +cell under legacy East Asian locales. If a character is wide according to +g_unichar_iswide(), then it is also reported wide with this function, but +the converse is not necessarily true. See the +&lt;ulink url="http://www.unicode.org/reports/tr11/"&gt;Unicode Standard +Annex #11&lt;/ulink&gt; for details. + + + + + + a Unicode character + + + + %TRUE if the character is wide in legacy East Asian locales + +Since: 2.12 + + + + + +Sets the function which is used to translate the contexts +user-visible strings, for &lt;option&gt;--help&lt;/option&gt; output. +If @func is %NULL, strings are not translated. + +Note that option groups have their own translation functions, +this function only affects the @parameter_string (see g_option_context_new()), +the summary (see g_option_context_set_summary()) and the description +(see g_option_context_set_description()). + +If you are using gettext(), you only need to set the translation +domain, see g_context_group_set_translation_domain(). + +Since: 2.12 + + + + + a #GOptionContext + + + + the #GTranslateFunc, or %NULL + + + + user data to pass to @func, or %NULL + + + + a function which gets called to free @data, or %NULL + + + + + + This function returns a #GIOCondition depending on whether there @@ -11704,6 +16612,9 @@ be modified while iterating over it (you can't add/remove items). To remove all items matching a predicate, use g_hash_table_foreach_remove(). +See g_hash_table_find() for performance caveats for linear +order searches in contrast to g_hash_table_lookup(). + @@ -11724,16 +16635,7 @@ g_hash_table_foreach_remove(). -Returns the values associated with @key under @group_name -translated in the given @locale if available. If @locale is -%NULL then the current locale is assumed. - -If @key cannot be found then %NULL is returned and @error is set to -#G_KEY_FILE_ERROR_KEY_NOT_FOUND. If the values associated -with @key cannot be interpreted or no suitable translations -can be found then the untranslated values are returned. -The returned array is %NULL-terminated, so @length may optionally be %NULL. - +Return value: a newly allocated %NULL-terminated string array @@ -11770,20 +16672,98 @@ Since: 2.6 - + -Set the pointer at the specified location to %NULL. +Sorts @queue using @func. + +This function is called while holding the @queue's lock. + +Since: 2.10 - - the memory address of the pointer. + + a #GAsyncQueue + + + + the #GCompareDataFunc is used to sort @queue. This +function is passed two elements of the @queue. The function +should return 0 if they are equal, a negative value if the +first element should be higher in the @queue or a positive +value if the first element should be lower in the @queue than +the second element. + + + + user data passed to @func + + +Reads a line, including the terminating character(s), +from a #GIOChannel into a newly-allocated string. +@str_return will contain allocated memory if the return +is %G_IO_STATUS_NORMAL. + + + + + + a #GIOChannel + + + + The line read from the #GIOChannel, including the +line terminator. This data should be freed with g_free() +when no longer needed. This is a nul-terminated string. +If a @length of zero is returned, this will be %NULL instead. + + + + location to store length of the read data, or %NULL + + + + location to store position of line terminator, or %NULL + + + + A location to return an error of type #GConvertError +or #GIOChannelError + + + + the status of the operation. + + + + + +Return value: a #GSequenceIter which is @delta positions away from @iter. + + + + + a #GSequenceIter + + + + A positive or negative number indicating how many positions away +from @iter the returned #GSequenceIter will be. + + + + a #GSequenceIter which is @delta positions away from @iter. + +Since: 2.14 + + + Associates a string value for @key and @locale under @@ -11832,7 +16812,7 @@ into the string at the given position. the position at which to insert character, or -1 to -append at the end of the string. +append at the end of the string @@ -11844,13 +16824,120 @@ append at the end of the string. + + +Frees a #GBookmarkFile. + +Since: 2.12 + + + + + a #GBookmarkFile + + + + + + + + +Scans for a match in string for the pattern in @regex. +The @match_options are combined with the match options specified +when the @regex structure was created, letting you have more +flexibility in reusing #GRegex structures. + +Setting @start_position differs from just passing over a shortened +string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern +that begins with any kind of lookbehind assertion, such as "\b". + +A #GMatchInfo structure, used to get information on the match, is +stored in @match_info if not %NULL. Note that if @match_info is +not %NULL then it is created even if the function returns %FALSE, +i.e. you must free it regardless if regular expression actually +matched. + +@string is not copied and is used in #GMatchInfo internally. If +you use any #GMatchInfo method (except g_match_info_free()) after +freeing or modifying @string then the behaviour is undefined. + +To retrieve all the non-overlapping matches of the pattern in +string you can use g_match_info_next(). + +&lt;informalexample&gt;&lt;programlisting&gt; +static void +print_uppercase_words (const gchar *string) +{ +/&ast; Print all uppercase-only words. &ast;/ +GRegex *regex; +GMatchInfo *match_info; +GError *error = NULL; +&nbsp; +regex = g_regex_new ("[A-Z]+", 0, 0, NULL); +g_regex_match_full (regex, string, -1, 0, 0, &amp;match_info, &amp;error); +while (g_match_info_matches (match_info)) +{ +gchar *word = g_match_info_fetch (match_info, 0); +g_print ("Found: %s\n", word); +g_free (word); +g_match_info_next (match_info, &amp;error); +} +g_match_info_free (match_info); +g_regex_unref (regex); +if (error != NULL) +{ +g_printerr ("Error while matching: %s\n", error-&gt;message); +g_error_free (error); +} +} +&lt;/programlisting&gt;&lt;/informalexample&gt; + + + + + + a #GRegex structure from g_regex_new() + + + + the string to scan for matches + + + + the length of @string, or -1 if @string is nul-terminated + + + + starting index of the string to match + + + + match options + + + + pointer to location where to store the #GMatchInfo, +or %NULL if you do not need it + + + + location to store the error occuring, or %NULL to ignore errors + + + + %TRUE is the string matched, %FALSE otherwise + +Since: 2.14 + + + -Obtains the character set for the current locale; you might use -this character set as an argument to g_convert(), to convert from -the current locale's encoding to some other encoding. (Frequently -g_locale_to_utf8() and g_locale_from_utf8() are nice shortcuts, -though.) +Obtains the character set for the &lt;link linkend="setlocale"&gt;current +locale&lt;/link&gt;; you might use this character set as an argument to +g_convert(), to convert from the current locale's encoding to some +other encoding. (Frequently g_locale_to_utf8() and g_locale_from_utf8() +are nice shortcuts, though.) The return value is %TRUE if the locale's encoding is UTF-8, in that case you can perhaps avoid calling g_convert(). @@ -11923,11 +17010,11 @@ of line endings and attribute values. - length of @text in bytes + length of @text in bytes, or -1 if the text is nul-terminated - escaped text + a newly allocated string with the escaped text @@ -11951,6 +17038,11 @@ If automatic &lt;option&gt;--help&lt;/option&gt; support is enab this function will produce help output to stdout and call &lt;literal&gt;exit (0)&lt;/literal&gt;. +Note that function depends on the +&lt;link linkend="setlocale"&gt;current locale&lt;/link&gt; for +automatic character set conversion of string and filename +arguments. + @@ -11959,11 +17051,11 @@ call &lt;literal&gt;exit (0)&lt;/literal&gt;. - a pointer to the number of command line arguments. + a pointer to the number of command line arguments - a pointer to the array of command line arguments. + a pointer to the array of command line arguments @@ -11978,6 +17070,23 @@ Since: 2.6 + + +Returns: a canonical representation for the string + + + + + a static string + + + + a canonical representation for the string + +Since: 2.10 + + + Splits a string into a maximum of @max_tokens pieces, using the given @@ -12015,40 +17124,53 @@ g_strfreev() to free it. - + -Quotes a string so that the shell (/bin/sh) will interpret the -quoted string to mean @unquoted_string. If you pass a filename to -the shell, for example, you should first quote it with this -function. The return value must be freed with g_free(). The -quoting style used is undefined (single or double quotes may be -used). - +Returns: %TRUE if the queue is empty. - - a literal string + + a #GQueue. - quoted string + %TRUE if the queue is empty. - + -Frees a #GError and associated resources. +Creates a new #GHashTable like g_hash_table_new() with a reference count +of 1 and allows to specify functions to free the memory allocated for the +key and value that get called when removing the entry from the #GHashTable. - - a #GError + + a function to create a hash value from a key. + + + + a function to check two keys for equality. + + + + a function to free the memory allocated for the key +used when removing the entry from the #GHashTable or %NULL if you +don't want to supply such a function. + + + + a function to free the memory allocated for the +value used when removing the entry from the #GHashTable or %NULL if +you don't want to supply such a function. - + a new #GHashTable. + @@ -12065,6 +17187,11 @@ thus works for both files and directories. Note however, that on Windows, it is in general not possible to remove a file that is open to some process, or mapped into memory. +If this function fails on Windows you can't infer too much from the +errno value. rmdir() is tried regardless of what caused remove() to +fail. Any errno value set by remove() will be overwritten by that +set by rmdir(). + @@ -12080,6 +17207,29 @@ Since: 2.6 + + +Retrieves the number of the subexpression named @name. + + + + + + #GRegex structure + + + + name of the subexpression + + + + The number of the subexpression or -1 if @name +does not exists + +Since: 2.14 + + + Passes the results of polling back to the main loop. @@ -12125,7 +17275,9 @@ it would be returned by waitpid(); standard UNIX macros such as WIFEXITED() and WEXITSTATUS() must be used to evaluate the exit status. On Windows, please note the implications of g_shell_parse_argv() -parsing @command_line. Space is a separator, and backslashes are +parsing @command_line. Parsing is done according to Unix shell rules, not +Windows command interpreter rules. +Space is a separator, and backslashes are special. Thus you cannot simply pass a @command_line containing canonical Windows paths, like "c:\\program files\\app\\app.exe", as the backslashes will be eaten, and the space will act as a @@ -12160,6 +17312,59 @@ separator. You need to enclose such paths with single quotes, like + + +Sorts @seq using @cmp_func. + +Since: 2.14 + + + + + a #GSequence + + + + the #GCompareDataFunc used to sort @seq. This function is +passed two items of @seq and should return 0 if they are equal, +a negative value fi the first comes before the second, and a +positive value if the second comes before the first. + + + + user data passed to @cmp_func + + + + + + + + +Adds a string to be displayed in &lt;option&gt;--help&lt;/option&gt; output +before the list of options. This is typically a summary of the +program functionality. + +Note that the summary is translated (see +g_option_context_set_translate_func(), g_option_context_set_translation_domain()). + +Since: 2.12 + + + + + a #GOptionContext + + + + a string to be shown in &lt;option&gt;--help&lt;/option&gt; output +before the list of options, or %NULL + + + + + + Behaves exactly like g_build_filename(), but takes the path elements @@ -12223,26 +17428,17 @@ or #GIOChannelError - + -Checks whether a source is allowed to be called recursively. -see g_source_set_can_recurse(). +Gets the current flags for a #GIOChannel, including read-only +flags such as %G_IO_FLAG_IS_READABLE. - - - - - a #GSource - - - - whether recursion is allowed. - - - - - -Reads all the remaining data from the file. +The values of the flags %G_IO_FLAG_IS_READABLE and %G_IO_FLAG_IS_WRITEABLE +are cached for internal use by the channel when it is created. +If they should change at some later point (e.g. partial shutdown +of a socket with the UNIX shutdown() function), the user +should immediately call g_io_channel_get_flags () to update +the internal values of these flags. @@ -12251,88 +17447,94 @@ Reads all the remaining data from the file. a #GIOChannel - - Location to store a pointer to a string holding -the remaining data in the #GIOChannel. This data should -be freed with g_free() when no longer needed. This -data is terminated by an extra nul character, but there -may be other nuls in the intervening data. + + the flags which are set on the channel + + + + + +Converts a string from UTF-8 to the encoding used for strings by +the C runtime (usually the same as that used by the operating +system) in the &lt;link linkend="setlocale"&gt;current locale&lt;/link&gt;. + + + + + + a UTF-8 encoded string - - Location to store length of the data + + the length of the string, or -1 if the string is +nul-terminated&lt;footnoteref linkend="nul-unsafe"/&gt;. + + + + location to store the number of bytes in the +input string that were successfully converted, or %NULL. +Even if the conversion was successful, this may be +less than @len if there were partial characters +at the end of the input. If the error +#G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value +stored will the byte offset after the last valid +input sequence. + + + + the number of bytes stored in the output buffer (not +including the terminating nul). - A location to return an error of type #GConvertError -or #GIOChannelError + location to store the error occuring, or %NULL to ignore +errors. Any of the errors in #GConvertError may occur. - %G_IO_STATUS_NORMAL on success. -This function never returns %G_IO_STATUS_EOF. + The converted string, or %NULL on an error. - + -The buffering state can only be set if the channel's encoding -is %NULL. For any other encoding, the channel must be buffered. +Sets the character which is used to separate +values in lists. Typically ';' or ',' are used +as separators. The default list separator is ';'. -A buffered channel can only be set unbuffered if the channel's -internal buffers have been flushed. Newly created channels or -channels which have returned %G_IO_STATUS_EOF -not require such a flush. For write-only channels, a call to -g_io_channel_flush () is sufficient. For all other channels, -the buffers may be flushed by a call to g_io_channel_seek_position (). -This includes the possibility of seeking with seek type %G_SEEK_CUR -and an offset of zero. Note that this means that socket-based -channels cannot be set unbuffered once they have had data -read from them. - -On unbuffered channels, it is safe to mix read and write -calls from the new and old APIs, if this is necessary for -maintaining old code. - -The default state of the channel is buffered. +Since: 2.6 - - a #GIOChannel + + a #GKeyFile - - whether to set the channel buffered or unbuffered + + the separator - + -Compare two strings, ignoring the case of ASCII characters. - -Unlike the BSD strcasecmp() function, this only recognizes standard -ASCII letters and ignores the locale, treating all non-ASCII -characters as if they are not letters. +Creates a new #GTree. - - string to compare with @s2. - - - - string to compare with @s1. + + the function used to order the nodes in the #GTree. +It should return values similar to the standard strcmp() function - +0 if the two arguments are equal, a negative value if the first argument +comes before the second, or a positive value if the first argument comes +after the second. - an integer less than, equal to, or greater than -zero if @s1 is found, respectively, to be less than, -to match, or to be greater than @s2. + a new #GTree. @@ -12350,6 +17552,11 @@ After each call to the timeout function, the time of the next timeout is recalculated based on the current time and the given interval (it does not try to 'catch up' time lost in delays). +If you want to have a timer in the "seconds" range and do not care +about the exact time of the first call of the timer, use the +g_timeout_add_seconds() function; this function allows for more +optimizations and more efficient system power usage. + @@ -12367,14 +17574,13 @@ timeout is recalculated based on the current time and the given interval - the id of event source. + the ID (greater than 0) of the event source. -Returns the length of the contents of a #GMappedFile. - +Returns: the length of the contents of @file. @@ -12389,28 +17595,72 @@ Since: 2.8 - + -Inserts a new key and value into a #GHashTable. +Loads a key file into an empty #GKeyFile structure. +If the file could not be loaded then %error is set to +either a #GFileError or #GKeyFileError. -If the key already exists in the #GHashTable its current value is replaced -with the new value. If you supplied a @value_destroy_func when creating the -#GHashTable, the old value is freed using that function. If you supplied -a @key_destroy_func when creating the #GHashTable, the passed key is freed -using that function. - - a #GHashTable. + + an empty #GKeyFile struct - - a key to insert. + + the path of a filename to load, in the GLib file name encoding - - the value to associate with the key. + + flags from #GKeyFileFlags + + + + return location for a #GError, or %NULL + + + + %TRUE if a key file could be loaded, %FALSE othewise +Since: 2.6 + + + + + +A statically-allocated #GQueue must be initialized with this function +before it can be used. Alternatively you can initialize it with +#G_QUEUE_INIT. It is not necessary to initialize queues created with +g_queue_new(). + +Since: 2.14 + + + + + an uninitialized #GQueue + + + + + + + + +Removes @link_ from @queue and frees it. + +@link_ must be part of @queue. + +Since: 2.4 + + + + + a #GQueue + + + + a #GList link that &lt;emphasis&gt;must&lt;/emphasis&gt; be part of @queue @@ -12435,14 +17685,7 @@ Since: 2.4 -Returns the length of the queue, negative values mean waiting -threads, positive values mean available entries in the -@queue. Actually this function returns the number of data items in -the queue minus the number of waiting threads. Thus a return value -of 0 could mean 'n' entries in the queue and 'n' thread waiting. -That can happen due to locking of the queue or due to -scheduling. - +Return value: the length of the @queue. @@ -12455,6 +17698,76 @@ scheduling. + + +Converts a string to a #gint64 value. +This function behaves like the standard strtoll() function +does in the C locale. It does this without actually +changing the current locale, since that would not be +thread-safe. + +This function is typically used when reading configuration +files or other non-user input that should be locale independent. +To handle input from the user you should normally use the +locale-sensitive system strtoll() function. + +If the correct value would cause overflow, %G_MAXINT64 or %G_MININT64 +is returned, and %ERANGE is stored in %errno. If the base is +outside the valid range, zero is returned, and %EINVAL is stored +in %errno. If the string conversion fails, zero is returned, and +@endptr returns @nptr (if @endptr is non-%NULL). + + + + + + the string to convert to a numeric value. + + + + if non-%NULL, it returns the character after +the last character used in the conversion. + + + + to be used for the conversion, 2..36 or 0 + + + + the #gint64 value or zero on error. + +Since: 2.12 + + + + + +Escapes the special characters used for regular expressions +in @string, for instance "a.b*c" becomes "a\.b\*c". This +function is useful to dynamically generate regular expressions. + +@string can contain nul characters that are replaced with "\0", +in this case remember to specify the correct length of @string +in @length. + + + + + + the string to escape + + + + the length of @string, or -1 if @string is nul-terminated + + + + a newly-allocated escaped string + +Since: 2.14 + + + This function cannot be called on a channel with %NULL encoding. @@ -12484,6 +17797,7 @@ or #GIOChannelError A wrapper for the POSIX mkdir() function. The mkdir() function attempts to create a directory with the given name and permissions. +The mode argument is ignored on Windows. See the C library manual for more details about mkdir(). @@ -12506,24 +17820,119 @@ Since: 2.6 - + -Determines if a character is titlecase. Some characters in -Unicode which are composites, such as the DZ digraph -have three case variants instead of just two. The titlecase -form is used at the beginning of a word where only the -first letter is capitalized. The titlecase form of the DZ -digraph is U+01F2 LATIN CAPITAL LETTTER D WITH SMALL LETTER Z. +Returns: the summary + + + + + a #GOptionContext + + + + the summary + +Since: 2.12 + + + + + +Converts @time_ into a ISO 8601 encoded string, relative to the +Coordinated Universal Time (UTC). - - a Unicode character + + a #GTimeVal - %TRUE if the character is titlecase + a newly allocated string containing a ISO 8601 date + +Since: 2.12 + + + + + +Return value: the path to the specified special directory, or %NULL + + + + + the logical id of special directory + + + + the path to the specified special directory, or %NULL +if the logical id was not found. The returned string is owned by +GLib and should not be modified or freed. + +Since: 2.14 + + + + + +Sets the source functions (can be used to override +default implementations) of an unattached source. + +Since: 2.12 + + + + + a #GSource + + + + the new #GSourceFuncs + + + + + + + + +Using the standard algorithm for regular expression matching only +the longest match in the string is retrieved. This function uses +a different algorithm so it can retrieve all the possible matches. +For more documentation see g_regex_match_all_full(). + +A #GMatchInfo structure, used to get information on the match, is +stored in @match_info if not %NULL. Note that if @match_info is +not %NULL then it is created even if the function returns %FALSE, +i.e. you must free it regardless if regular expression actually +matched. + + + + + + a #GRegex structure from g_regex_new() + + + + the string to scan for matches + + + + match options + + + + pointer to location where to store the #GMatchInfo, +or %NULL if you do not need it + + + + %TRUE is the string matched, %FALSE otherwise + +Since: 2.14 @@ -12586,29 +17995,85 @@ Since: 2.4 - + -Given a position @p with a UTF-8 encoded string @str, find the start -of the previous UTF-8 character starting before @p. Returns %NULL if no -UTF-8 characters are present in @p before @str. +Gets the time the bookmark for @uri was last visited. -@p does not have to be at the beginning of a UTF-8 character. No check -is made to see if the character found is actually valid other than -it starts with an appropriate byte. +In the event the URI cannot be found, -1 is returned and +@error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. - - pointer to the beginning of a UTF-8 encoded string + + a #GBookmarkFile - - pointer to some position within @str + + a valid URI + + + + return location for a #GError, or %NULL - a pointer to the found character or %NULL. + a timestamp. + +Since: 2.12 + + + + + +The buffering state can only be set if the channel's encoding +is %NULL. For any other encoding, the channel must be buffered. + +A buffered channel can only be set unbuffered if the channel's +internal buffers have been flushed. Newly created channels or +channels which have returned %G_IO_STATUS_EOF +not require such a flush. For write-only channels, a call to +g_io_channel_flush () is sufficient. For all other channels, +the buffers may be flushed by a call to g_io_channel_seek_position (). +This includes the possibility of seeking with seek type %G_SEEK_CUR +and an offset of zero. Note that this means that socket-based +channels cannot be set unbuffered once they have had data +read from them. + +On unbuffered channels, it is safe to mix read and write +calls from the new and old APIs, if this is necessary for +maintaining old code. + +The default state of the channel is buffered. + + + + + a #GIOChannel + + + + whether to set the channel buffered or unbuffered + + + + + + + + +Creates a new empty #GKeyFile object. Use +g_key_file_load_from_file(), g_key_file_load_from_data(), +g_key_file_load_from_dirs() or g_key_file_load_from_data_dirs() to +read an existing key file. + + + + + + an empty #GKeyFile. + +Since: 2.6 diff --git a/libs/glibmm2/glib/src/glib_docs_override.xml b/libs/glibmm2/glib/src/glib_docs_override.xml index 093d936b96..3ad6b3a584 100644 --- a/libs/glibmm2/glib/src/glib_docs_override.xml +++ b/libs/glibmm2/glib/src/glib_docs_override.xml @@ -1,2 +1,151 @@ + + + Adds a string to be displayed in --help output before the list of options. This + is typically a summary of the program functionality. + + Note that the summary is translated (see set_translate_func(), + set_translation_domain()). + + Since: 2.14 + + + + + a string to be shown in --help output before the list of + options + + + + + + + + + Returns: the summary + See set_summary() for more information + + + + + the summary + + Since: 2.14 + + + + + + Adds a string to be displayed in --help output after the list of + options. This text often includes a bug reporting address. + + Note that the summary is translated (see set_translate_func()). + + Since: 2.14 + + + + + a string to be shown in --help output + after the list of options + + + + + + + + + Returns: the description + See set_description() for more information + + + + + the description + + Since: 2.14 + + + + + + A convenience function to use gettext() for translating + user-visible strings. + + Since: 2.14 + + + + + the domain to use + + + + + + + + + +Return value: the value associated with the key as a double, or + + + + + a #GKeyFile + + + + a group name + + + + a key + + + + return location for a #GError + + + + the value associated with the key as a double, or +0.0 if the key was not found or could not be parsed. + +Since: 2.14 + + + + + + +Associates a new double value with @key under @group_name. +If @key cannot be found then it is created. + +Since: 2.14 + + + + + a #GKeyFile + + + + a group name + + + + a key + + + + an double value + + + + + + + + diff --git a/libs/glibmm2/glib/src/glib_enums.defs b/libs/glibmm2/glib/src/glib_enums.defs index 3a379676c0..46b366fb1c 100644 --- a/libs/glibmm2/glib/src/glib_enums.defs +++ b/libs/glibmm2/glib/src/glib_enums.defs @@ -1,15 +1,21 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gbsearcharray.h +;; From /opt/gnome218/include/glib-2.0/glib/gbookmarkfile.h -(define-flags-extended BSearchArrayFlags +(define-enum-extended BookmarkFileError (in-module "G") - (c-name "GBSearchArrayFlags") + (c-name "GBookmarkFileError") (values - '("align-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2" "1 << 0") - '("auto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK" "1 << 1") + '("invalid-uri" "G_BOOKMARK_FILE_ERROR_INVALID_URI" "0") + '("invalid-value" "G_BOOKMARK_FILE_ERROR_INVALID_VALUE" "1") + '("app-not-registered" "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED" "2") + '("uri-not-found" "G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND" "3") + '("read" "G_BOOKMARK_FILE_ERROR_READ" "4") + '("unknown-encoding" "G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING" "5") + '("write" "G_BOOKMARK_FILE_ERROR_WRITE" "6") + '("file-not-found" "G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND" "7") ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gconvert.h +;; From /opt/gnome218/include/glib-2.0/glib/gconvert.h (define-enum-extended ConvertError (in-module "G") @@ -24,7 +30,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gdate.h +;; From /opt/gnome218/include/glib-2.0/glib/gdate.h (define-enum-extended DateDMY (in-module "G") @@ -71,17 +77,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gdebug.h - -(define-flags-extended DebugFlag - (in-module "G") - (c-name "GDebugFlag") - (values - '("s" "G_DEBUG_FATAL_WARNINGS" "1 << 0") - ) -) - -;; From /home/murrayc/cvs/gnome212/glib/glib/gfileutils.h +;; From /opt/gnome218/include/glib-2.0/glib/gfileutils.h (define-enum-extended FileError (in-module "G") @@ -127,7 +123,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/ghook.h +;; From /opt/gnome218/include/glib-2.0/glib/ghook.h (define-flags-extended HookFlagMask (in-module "G") @@ -139,7 +135,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/giochannel.h +;; From /opt/gnome218/include/glib-2.0/glib/giochannel.h (define-enum-extended IOError (in-module "G") @@ -210,7 +206,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gkeyfile.h +;; From /opt/gnome218/include/glib-2.0/glib/gkeyfile.h (define-enum-extended KeyFileError (in-module "G") @@ -235,7 +231,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gmarkup.h +;; From /opt/gnome218/include/glib-2.0/glib/gmarkup.h (define-enum-extended MarkupError (in-module "G") @@ -254,11 +250,12 @@ (in-module "G") (c-name "GMarkupParseFlags") (values - '("g" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG" "1 << 0") + '("do-not-use-this-unsupported-flag" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG" "1 << 0") + '("treat-cdata-as-text" "G_MARKUP_TREAT_CDATA_AS_TEXT" "1 << 1") ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gmessages.h +;; From /opt/gnome218/include/glib-2.0/glib/gmessages.h (define-flags-extended LogLevelFlags (in-module "G") @@ -276,7 +273,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gnode.h +;; From /opt/gnome218/include/glib-2.0/glib/gnode.h (define-flags-extended TraverseFlags (in-module "G") @@ -302,7 +299,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/goption.h +;; From /opt/gnome218/include/glib-2.0/glib/goption.h (define-flags-extended OptionFlags (in-module "G") @@ -329,6 +326,8 @@ '("filename" "G_OPTION_ARG_FILENAME" "4") '("string-array" "G_OPTION_ARG_STRING_ARRAY" "5") '("filename-array" "G_OPTION_ARG_FILENAME_ARRAY" "6") + '("double" "G_OPTION_ARG_DOUBLE" "7") + '("int64" "G_OPTION_ARG_INT64" "8") ) ) @@ -342,7 +341,57 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gscanner.h +;; From /opt/gnome218/include/glib-2.0/glib/gregex.h + +(define-enum-extended RegexError + (in-module "G") + (c-name "GRegexError") + (values + '("compile" "G_REGEX_ERROR_COMPILE" "0") + '("optimize" "G_REGEX_ERROR_OPTIMIZE" "1") + '("replace" "G_REGEX_ERROR_REPLACE" "2") + '("match" "G_REGEX_ERROR_MATCH" "3") + ) +) + +(define-flags-extended RegexCompileFlags + (in-module "G") + (c-name "GRegexCompileFlags") + (values + '("caseless" "G_REGEX_CASELESS" "1 << 0") + '("multiline" "G_REGEX_MULTILINE" "1 << 1") + '("dotall" "G_REGEX_DOTALL" "1 << 2") + '("extended" "G_REGEX_EXTENDED" "1 << 3") + '("anchored" "G_REGEX_ANCHORED" "1 << 4") + '("dollar-endonly" "G_REGEX_DOLLAR_ENDONLY" "1 << 5") + '("ungreedy" "G_REGEX_UNGREEDY" "1 << 9") + '("raw" "G_REGEX_RAW" "1 << 11") + '("no-auto-capture" "G_REGEX_NO_AUTO_CAPTURE" "1 << 12") + '("optimize" "G_REGEX_OPTIMIZE" "1 << 13") + '("dupnames" "G_REGEX_DUPNAMES" "1 << 19") + '("newline-cr" "G_REGEX_NEWLINE_CR" "1 << 20") + '("newline-lf" "G_REGEX_NEWLINE_LF" "1 << 21") + '("newline-crlf" "G_REGEX_NEWLINE_CRLF" "0x100000") + ) +) + +(define-flags-extended RegexMatchFlags + (in-module "G") + (c-name "GRegexMatchFlags") + (values + '("anchored" "G_REGEX_MATCH_ANCHORED" "1 << 4") + '("notbol" "G_REGEX_MATCH_NOTBOL" "1 << 7") + '("noteol" "G_REGEX_MATCH_NOTEOL" "1 << 8") + '("notempty" "G_REGEX_MATCH_NOTEMPTY" "1 << 10") + '("partial" "G_REGEX_MATCH_PARTIAL" "1 << 15") + '("newline-cr" "G_REGEX_MATCH_NEWLINE_CR" "1 << 20") + '("newline-lf" "G_REGEX_MATCH_NEWLINE_LF" "1 << 21") + '("newline-crlf" "G_REGEX_MATCH_NEWLINE_CRLF" "0x100000") + '("newline-any" "G_REGEX_MATCH_NEWLINE_ANY" "1 << 22") + ) +) + +;; From /opt/gnome218/include/glib-2.0/glib/gscanner.h (define-enum-extended ErrorType (in-module "G") @@ -359,38 +408,7 @@ ) ) -(define-enum-extended TokenType - (in-module "G") - (c-name "GTokenType") - (values - '("eof" "G_TOKEN_EOF" "0") - '("left-paren" "G_TOKEN_LEFT_PAREN" "'gmmproc_cannot_handle_quoted_left_bracket'") - '("right-paren" "G_TOKEN_RIGHT_PAREN" "'gmmproc_cannot_handle_quoted_right_bracket'") - '("left-curly" "G_TOKEN_LEFT_CURLY" "'{'") - '("right-curly" "G_TOKEN_RIGHT_CURLY" "']'") - '("left-brace" "G_TOKEN_LEFT_BRACE" "'['") - '("right-brace" "G_TOKEN_RIGHT_BRACE" "']'") - '("equal-sign" "G_TOKEN_EQUAL_SIGN" "'='") - '("comma" "G_TOKEN_COMMA" "','") - '("none" "G_TOKEN_NONE" "256") - '("error" "G_TOKEN_ERROR" "257") - '("char" "G_TOKEN_CHAR" "258") - '("binary" "G_TOKEN_BINARY" "259") - '("octal" "G_TOKEN_OCTAL" "260") - '("int" "G_TOKEN_INT" "261") - '("hex" "G_TOKEN_HEX" "262") - '("float" "G_TOKEN_FLOAT" "263") - '("string" "G_TOKEN_STRING" "264") - '("symbol" "G_TOKEN_SYMBOL" "265") - '("identifier" "G_TOKEN_IDENTIFIER" "266") - '("identifier-null" "G_TOKEN_IDENTIFIER_NULL" "267") - '("comment-single" "G_TOKEN_COMMENT_SINGLE" "268") - '("comment-multi" "G_TOKEN_COMMENT_MULTI" "269") - '("last" "G_TOKEN_LAST" "270") - ) -) - -;; From /home/murrayc/cvs/gnome212/glib/glib/gshell.h +;; From /opt/gnome218/include/glib-2.0/glib/gshell.h (define-enum-extended ShellError (in-module "G") @@ -402,7 +420,22 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gspawn.h +;; From /opt/gnome218/include/glib-2.0/glib/gslice.h + +(define-enum-extended SliceConfig + (in-module "G") + (c-name "GSliceConfig") + (values + '("always-malloc" "G_SLICE_CONFIG_ALWAYS_MALLOC" "1") + '("bypass-magazines" "G_SLICE_CONFIG_BYPASS_MAGAZINES" "2") + '("working-set-msecs" "G_SLICE_CONFIG_WORKING_SET_MSECS" "3") + '("color-increment" "G_SLICE_CONFIG_COLOR_INCREMENT" "4") + '("chunk-sizes" "G_SLICE_CONFIG_CHUNK_SIZES" "5") + '("contention-counter" "G_SLICE_CONFIG_CONTENTION_COUNTER" "6") + ) +) + +;; From /opt/gnome218/include/glib-2.0/glib/gspawn.h (define-enum-extended SpawnError (in-module "G") @@ -444,7 +477,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gstrfuncs.h +;; From /opt/gnome218/include/glib-2.0/glib/gstrfuncs.h (define-flags-extended AsciiType (in-module "G") @@ -464,7 +497,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gthread.h +;; From /opt/gnome218/include/glib-2.0/glib/gthread.h (define-enum-extended ThreadError (in-module "G") @@ -495,7 +528,7 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gunicode.h +;; From /opt/gnome218/include/glib-2.0/glib/gunicode.h (define-enum-extended UnicodeType (in-module "G") @@ -569,6 +602,86 @@ '("unknown" "G_UNICODE_BREAK_UNKNOWN" "28") '("next-line" "G_UNICODE_BREAK_NEXT_LINE" "29") '("word-joiner" "G_UNICODE_BREAK_WORD_JOINER" "30") + '("hangul-l-jamo" "G_UNICODE_BREAK_HANGUL_L_JAMO" "31") + '("hangul-v-jamo" "G_UNICODE_BREAK_HANGUL_V_JAMO" "32") + '("hangul-t-jamo" "G_UNICODE_BREAK_HANGUL_T_JAMO" "33") + '("hangul-lv-syllable" "G_UNICODE_BREAK_HANGUL_LV_SYLLABLE" "34") + '("hangul-lvt-syllable" "G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE" "35") + ) +) + +(define-enum-extended UnicodeScript + (in-module "G") + (c-name "GUnicodeScript") + (values + '("invalid-code" "G_UNICODE_SCRIPT_INVALID_CODE" "-1") + '("common" "G_UNICODE_SCRIPT_COMMON" "0") + '("inherited" "G_UNICODE_SCRIPT_INHERITED" "1") + '("arabic" "G_UNICODE_SCRIPT_ARABIC" "2") + '("armenian" "G_UNICODE_SCRIPT_ARMENIAN" "3") + '("bengali" "G_UNICODE_SCRIPT_BENGALI" "4") + '("bopomofo" "G_UNICODE_SCRIPT_BOPOMOFO" "5") + '("cherokee" "G_UNICODE_SCRIPT_CHEROKEE" "6") + '("coptic" "G_UNICODE_SCRIPT_COPTIC" "7") + '("cyrillic" "G_UNICODE_SCRIPT_CYRILLIC" "8") + '("deseret" "G_UNICODE_SCRIPT_DESERET" "9") + '("devanagari" "G_UNICODE_SCRIPT_DEVANAGARI" "10") + '("ethiopic" "G_UNICODE_SCRIPT_ETHIOPIC" "11") + '("georgian" "G_UNICODE_SCRIPT_GEORGIAN" "12") + '("gothic" "G_UNICODE_SCRIPT_GOTHIC" "13") + '("greek" "G_UNICODE_SCRIPT_GREEK" "14") + '("gujarati" "G_UNICODE_SCRIPT_GUJARATI" "15") + '("gurmukhi" "G_UNICODE_SCRIPT_GURMUKHI" "16") + '("han" "G_UNICODE_SCRIPT_HAN" "17") + '("hangul" "G_UNICODE_SCRIPT_HANGUL" "18") + '("hebrew" "G_UNICODE_SCRIPT_HEBREW" "19") + '("hiragana" "G_UNICODE_SCRIPT_HIRAGANA" "20") + '("kannada" "G_UNICODE_SCRIPT_KANNADA" "21") + '("katakana" "G_UNICODE_SCRIPT_KATAKANA" "22") + '("khmer" "G_UNICODE_SCRIPT_KHMER" "23") + '("lao" "G_UNICODE_SCRIPT_LAO" "24") + '("latin" "G_UNICODE_SCRIPT_LATIN" "25") + '("malayalam" "G_UNICODE_SCRIPT_MALAYALAM" "26") + '("mongolian" "G_UNICODE_SCRIPT_MONGOLIAN" "27") + '("myanmar" "G_UNICODE_SCRIPT_MYANMAR" "28") + '("ogham" "G_UNICODE_SCRIPT_OGHAM" "29") + '("old-italic" "G_UNICODE_SCRIPT_OLD_ITALIC" "30") + '("oriya" "G_UNICODE_SCRIPT_ORIYA" "31") + '("runic" "G_UNICODE_SCRIPT_RUNIC" "32") + '("sinhala" "G_UNICODE_SCRIPT_SINHALA" "33") + '("syriac" "G_UNICODE_SCRIPT_SYRIAC" "34") + '("tamil" "G_UNICODE_SCRIPT_TAMIL" "35") + '("telugu" "G_UNICODE_SCRIPT_TELUGU" "36") + '("thaana" "G_UNICODE_SCRIPT_THAANA" "37") + '("thai" "G_UNICODE_SCRIPT_THAI" "38") + '("tibetan" "G_UNICODE_SCRIPT_TIBETAN" "39") + '("canadian-aboriginal" "G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL" "40") + '("yi" "G_UNICODE_SCRIPT_YI" "41") + '("tagalog" "G_UNICODE_SCRIPT_TAGALOG" "42") + '("hanunoo" "G_UNICODE_SCRIPT_HANUNOO" "43") + '("buhid" "G_UNICODE_SCRIPT_BUHID" "44") + '("tagbanwa" "G_UNICODE_SCRIPT_TAGBANWA" "45") + '("braille" "G_UNICODE_SCRIPT_BRAILLE" "46") + '("cypriot" "G_UNICODE_SCRIPT_CYPRIOT" "47") + '("limbu" "G_UNICODE_SCRIPT_LIMBU" "48") + '("osmanya" "G_UNICODE_SCRIPT_OSMANYA" "49") + '("shavian" "G_UNICODE_SCRIPT_SHAVIAN" "50") + '("linear-b" "G_UNICODE_SCRIPT_LINEAR_B" "51") + '("tai-le" "G_UNICODE_SCRIPT_TAI_LE" "52") + '("ugaritic" "G_UNICODE_SCRIPT_UGARITIC" "53") + '("new-tai-lue" "G_UNICODE_SCRIPT_NEW_TAI_LUE" "54") + '("buginese" "G_UNICODE_SCRIPT_BUGINESE" "55") + '("glagolitic" "G_UNICODE_SCRIPT_GLAGOLITIC" "56") + '("tifinagh" "G_UNICODE_SCRIPT_TIFINAGH" "57") + '("syloti-nagri" "G_UNICODE_SCRIPT_SYLOTI_NAGRI" "58") + '("old-persian" "G_UNICODE_SCRIPT_OLD_PERSIAN" "59") + '("kharoshthi" "G_UNICODE_SCRIPT_KHAROSHTHI" "60") + '("unknown" "G_UNICODE_SCRIPT_UNKNOWN" "61") + '("balinese" "G_UNICODE_SCRIPT_BALINESE" "62") + '("cuneiform" "G_UNICODE_SCRIPT_CUNEIFORM" "63") + '("phoenician" "G_UNICODE_SCRIPT_PHOENICIAN" "64") + '("phags-pa" "G_UNICODE_SCRIPT_PHAGS_PA" "65") + '("nko" "G_UNICODE_SCRIPT_NKO" "66") ) ) @@ -577,7 +690,7 @@ (c-name "GNormalizeMode") (values '("default" "G_NORMALIZE_DEFAULT" "0") - '("nfd" "G_NORMALIZE_NFD" "0") + '("nfd" "G_NORMALIZE_NFD" "#error") '("default-compose" "G_NORMALIZE_DEFAULT_COMPOSE" "1") '("nfc" "G_NORMALIZE_NFC" "1") '("all" "G_NORMALIZE_ALL" "2") @@ -587,96 +700,21 @@ ) ) -;; From /home/murrayc/cvs/gnome212/glib/gobject/gparam.h +;; From /opt/gnome218/include/glib-2.0/glib/gutils.h -(define-flags-extended ParamFlags +(define-enum-extended UserDirectory (in-module "G") - (c-name "GParamFlags") + (c-name "GUserDirectory") (values - '("readable" "G_PARAM_READABLE" "1 << 0") - '("writable" "G_PARAM_WRITABLE" "1 << 1") - '("construct" "G_PARAM_CONSTRUCT" "1 << 2") - '("construct-only" "G_PARAM_CONSTRUCT_ONLY" "1 << 3") - '("lax-validation" "G_PARAM_LAX_VALIDATION" "1 << 4") - '("static-name" "G_PARAM_STATIC_NAME" "1 << 5") - '("static-blurb" "G_PARAM_STATIC_BLURB" "1 << 7") - ) -) - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gsignal.h - -(define-flags-extended SignalFlags - (in-module "G") - (c-name "GSignalFlags") - (values - '("run-first" "G_SIGNAL_RUN_FIRST" "1 << 0") - '("run-last" "G_SIGNAL_RUN_LAST" "1 << 1") - '("run-cleanup" "G_SIGNAL_RUN_CLEANUP" "1 << 2") - '("no-recurse" "G_SIGNAL_NO_RECURSE" "1 << 3") - '("detailed" "G_SIGNAL_DETAILED" "1 << 4") - '("action" "G_SIGNAL_ACTION" "1 << 5") - '("no-hooks" "G_SIGNAL_NO_HOOKS" "1 << 6") - ) -) - -(define-flags-extended ConnectFlags - (in-module "G") - (c-name "GConnectFlags") - (values - '("after" "G_CONNECT_AFTER" "1 << 0") - '("swapped" "G_CONNECT_SWAPPED" "1 << 1") - ) -) - -(define-flags-extended SignalMatchType - (in-module "G") - (c-name "GSignalMatchType") - (values - '("id" "G_SIGNAL_MATCH_ID" "1 << 0") - '("detail" "G_SIGNAL_MATCH_DETAIL" "1 << 1") - '("closure" "G_SIGNAL_MATCH_CLOSURE" "1 << 2") - '("func" "G_SIGNAL_MATCH_FUNC" "1 << 3") - '("data" "G_SIGNAL_MATCH_DATA" "1 << 4") - '("unblocked" "G_SIGNAL_MATCH_UNBLOCKED" "1 << 5") - ) -) - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gtype.h - -(define-flags-extended TypeDebugFlags - (in-module "G") - (c-name "GTypeDebugFlags") - (values - '("none" "G_TYPE_DEBUG_NONE" "0") - '("objects" "G_TYPE_DEBUG_OBJECTS" "1 << 0") - '("signals" "G_TYPE_DEBUG_SIGNALS" "1 << 1") - '("mask" "G_TYPE_DEBUG_MASK" "0x03") - ) -) - -(define-enum-extended TypeFundamentalFlags - (in-module "G") - (c-name "GTypeFundamentalFlags") - (values - ) -) - -(define-enum-extended TypeFlags - (in-module "G") - (c-name "GTypeFlags") - (values - ) -) - -;; From /home/murrayc/cvs/gnome212/glib/gmodule/gmodule.h - -(define-flags-extended ModuleFlags - (in-module "G") - (c-name "GModuleFlags") - (values - '("lazy" "G_MODULE_BIND_LAZY" "1 << 0") - '("local" "G_MODULE_BIND_LOCAL" "1 << 1") - '("mask" "G_MODULE_BIND_MASK" "0x03") + '("directory-desktop" "G_USER_DIRECTORY_DESKTOP" "0") + '("directory-documents" "G_USER_DIRECTORY_DOCUMENTS" "1") + '("directory-download" "G_USER_DIRECTORY_DOWNLOAD" "2") + '("directory-music" "G_USER_DIRECTORY_MUSIC" "3") + '("directory-pictures" "G_USER_DIRECTORY_PICTURES" "4") + '("directory-public-share" "G_USER_DIRECTORY_PUBLIC_SHARE" "5") + '("directory-templates" "G_USER_DIRECTORY_TEMPLATES" "6") + '("directory-videos" "G_USER_DIRECTORY_VIDEOS" "7") + '("n-directories" "G_USER_N_DIRECTORIES" "8") ) ) diff --git a/libs/glibmm2/glib/src/glib_functions.defs b/libs/glibmm2/glib/src/glib_functions.defs index 58f949a2e6..c3c64fe72a 100644 --- a/libs/glibmm2/glib/src/glib_functions.defs +++ b/libs/glibmm2/glib/src/glib_functions.defs @@ -1,20 +1,23 @@ ;; -*- scheme -*- ; object definitions ... -(define-object Module - (in-module "GType") - (parent "GObject") - (c-name "GTypeModule") - (gtype-id "G_TYPE_TYPE_MODULE") -) - -(define-object Plugin - (in-module "GType") - (c-name "GTypePlugin") - (gtype-id "G_TYPE_TYPE_PLUGIN") -) - ;; Enumerations and flags ... +(define-enum FileError + (in-module "GBookmark") + (c-name "GBookmarkFileError") + (gtype-id "G_TYPE_BOOKMARK_FILE_ERROR") + (values + '("invalid-uri" "G_BOOKMARK_FILE_ERROR_INVALID_URI") + '("invalid-value" "G_BOOKMARK_FILE_ERROR_INVALID_VALUE") + '("app-not-registered" "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED") + '("uri-not-found" "G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND") + '("read" "G_BOOKMARK_FILE_ERROR_READ") + '("unknown-encoding" "G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING") + '("write" "G_BOOKMARK_FILE_ERROR_WRITE") + '("file-not-found" "G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND") + ) +) + (define-flags ArrayFlags (in-module "GBSearch") (c-name "GBSearchArrayFlags") @@ -92,7 +95,8 @@ (c-name "GDebugFlag") (gtype-id "G_TYPE_DEBUG_FLAG") (values - '("s" "G_DEBUG_FATAL_WARNINGS") + '("warnings" "G_DEBUG_FATAL_WARNINGS") + '("criticals" "G_DEBUG_FATAL_CRITICALS") ) ) @@ -279,7 +283,8 @@ (c-name "GMarkupParseFlags") (gtype-id "G_TYPE_MARKUP_PARSE_FLAGS") (values - '("g" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG") + '("do-not-use-this-unsupported-flag" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG") + '("treat-cdata-as-text" "G_MARKUP_TREAT_CDATA_AS_TEXT") ) ) @@ -353,6 +358,8 @@ '("filename" "G_OPTION_ARG_FILENAME") '("string-array" "G_OPTION_ARG_STRING_ARRAY") '("filename-array" "G_OPTION_ARG_FILENAME_ARRAY") + '("double" "G_OPTION_ARG_DOUBLE") + '("int64" "G_OPTION_ARG_INT64") ) ) @@ -367,6 +374,57 @@ ) ) +(define-enum Error + (in-module "GRegex") + (c-name "GRegexError") + (gtype-id "G_TYPE_REGEX_ERROR") + (values + '("compile" "G_REGEX_ERROR_COMPILE") + '("optimize" "G_REGEX_ERROR_OPTIMIZE") + '("replace" "G_REGEX_ERROR_REPLACE") + '("match" "G_REGEX_ERROR_MATCH") + ) +) + +(define-flags CompileFlags + (in-module "GRegex") + (c-name "GRegexCompileFlags") + (gtype-id "G_TYPE_REGEX_COMPILE_FLAGS") + (values + '("caseless" "G_REGEX_CASELESS") + '("multiline" "G_REGEX_MULTILINE") + '("dotall" "G_REGEX_DOTALL") + '("extended" "G_REGEX_EXTENDED") + '("anchored" "G_REGEX_ANCHORED") + '("dollar-endonly" "G_REGEX_DOLLAR_ENDONLY") + '("ungreedy" "G_REGEX_UNGREEDY") + '("raw" "G_REGEX_RAW") + '("no-auto-capture" "G_REGEX_NO_AUTO_CAPTURE") + '("optimize" "G_REGEX_OPTIMIZE") + '("dupnames" "G_REGEX_DUPNAMES") + '("newline-cr" "G_REGEX_NEWLINE_CR") + '("newline-lf" "G_REGEX_NEWLINE_LF") + '("newline-crlf" "G_REGEX_NEWLINE_CRLF") + ) +) + +(define-flags MatchFlags + (in-module "GRegex") + (c-name "GRegexMatchFlags") + (gtype-id "G_TYPE_REGEX_MATCH_FLAGS") + (values + '("anchored" "G_REGEX_MATCH_ANCHORED") + '("notbol" "G_REGEX_MATCH_NOTBOL") + '("noteol" "G_REGEX_MATCH_NOTEOL") + '("notempty" "G_REGEX_MATCH_NOTEMPTY") + '("partial" "G_REGEX_MATCH_PARTIAL") + '("newline-cr" "G_REGEX_MATCH_NEWLINE_CR") + '("newline-lf" "G_REGEX_MATCH_NEWLINE_LF") + '("newline-crlf" "G_REGEX_MATCH_NEWLINE_CRLF") + '("newline-any" "G_REGEX_MATCH_NEWLINE_ANY") + ) +) + (define-enum Type (in-module "GError") (c-name "GErrorType") @@ -394,6 +452,20 @@ ) ) +(define-enum Config + (in-module "GSlice") + (c-name "GSliceConfig") + (gtype-id "G_TYPE_SLICE_CONFIG") + (values + '("always-malloc" "G_SLICE_CONFIG_ALWAYS_MALLOC") + '("bypass-magazines" "G_SLICE_CONFIG_BYPASS_MAGAZINES") + '("working-set-msecs" "G_SLICE_CONFIG_WORKING_SET_MSECS") + '("color-increment" "G_SLICE_CONFIG_COLOR_INCREMENT") + '("chunk-sizes" "G_SLICE_CONFIG_CHUNK_SIZES") + '("contention-counter" "G_SLICE_CONFIG_CONTENTION_COUNTER") + ) +) + (define-enum Error (in-module "GSpawn") (c-name "GSpawnError") @@ -562,6 +634,87 @@ '("unknown" "G_UNICODE_BREAK_UNKNOWN") '("next-line" "G_UNICODE_BREAK_NEXT_LINE") '("word-joiner" "G_UNICODE_BREAK_WORD_JOINER") + '("hangul-l-jamo" "G_UNICODE_BREAK_HANGUL_L_JAMO") + '("hangul-v-jamo" "G_UNICODE_BREAK_HANGUL_V_JAMO") + '("hangul-t-jamo" "G_UNICODE_BREAK_HANGUL_T_JAMO") + '("hangul-lv-syllable" "G_UNICODE_BREAK_HANGUL_LV_SYLLABLE") + '("hangul-lvt-syllable" "G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE") + ) +) + +(define-enum Script + (in-module "GUnicode") + (c-name "GUnicodeScript") + (gtype-id "G_TYPE_UNICODE_SCRIPT") + (values + '("invalid-code" "G_UNICODE_SCRIPT_INVALID_CODE") + '("common" "G_UNICODE_SCRIPT_COMMON") + '("inherited" "G_UNICODE_SCRIPT_INHERITED") + '("arabic" "G_UNICODE_SCRIPT_ARABIC") + '("armenian" "G_UNICODE_SCRIPT_ARMENIAN") + '("bengali" "G_UNICODE_SCRIPT_BENGALI") + '("bopomofo" "G_UNICODE_SCRIPT_BOPOMOFO") + '("cherokee" "G_UNICODE_SCRIPT_CHEROKEE") + '("coptic" "G_UNICODE_SCRIPT_COPTIC") + '("cyrillic" "G_UNICODE_SCRIPT_CYRILLIC") + '("deseret" "G_UNICODE_SCRIPT_DESERET") + '("devanagari" "G_UNICODE_SCRIPT_DEVANAGARI") + '("ethiopic" "G_UNICODE_SCRIPT_ETHIOPIC") + '("georgian" "G_UNICODE_SCRIPT_GEORGIAN") + '("gothic" "G_UNICODE_SCRIPT_GOTHIC") + '("greek" "G_UNICODE_SCRIPT_GREEK") + '("gujarati" "G_UNICODE_SCRIPT_GUJARATI") + '("gurmukhi" "G_UNICODE_SCRIPT_GURMUKHI") + '("han" "G_UNICODE_SCRIPT_HAN") + '("hangul" "G_UNICODE_SCRIPT_HANGUL") + '("hebrew" "G_UNICODE_SCRIPT_HEBREW") + '("hiragana" "G_UNICODE_SCRIPT_HIRAGANA") + '("kannada" "G_UNICODE_SCRIPT_KANNADA") + '("katakana" "G_UNICODE_SCRIPT_KATAKANA") + '("khmer" "G_UNICODE_SCRIPT_KHMER") + '("lao" "G_UNICODE_SCRIPT_LAO") + '("latin" "G_UNICODE_SCRIPT_LATIN") + '("malayalam" "G_UNICODE_SCRIPT_MALAYALAM") + '("mongolian" "G_UNICODE_SCRIPT_MONGOLIAN") + '("myanmar" "G_UNICODE_SCRIPT_MYANMAR") + '("ogham" "G_UNICODE_SCRIPT_OGHAM") + '("old-italic" "G_UNICODE_SCRIPT_OLD_ITALIC") + '("oriya" "G_UNICODE_SCRIPT_ORIYA") + '("runic" "G_UNICODE_SCRIPT_RUNIC") + '("sinhala" "G_UNICODE_SCRIPT_SINHALA") + '("syriac" "G_UNICODE_SCRIPT_SYRIAC") + '("tamil" "G_UNICODE_SCRIPT_TAMIL") + '("telugu" "G_UNICODE_SCRIPT_TELUGU") + '("thaana" "G_UNICODE_SCRIPT_THAANA") + '("thai" "G_UNICODE_SCRIPT_THAI") + '("tibetan" "G_UNICODE_SCRIPT_TIBETAN") + '("canadian-aboriginal" "G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL") + '("yi" "G_UNICODE_SCRIPT_YI") + '("tagalog" "G_UNICODE_SCRIPT_TAGALOG") + '("hanunoo" "G_UNICODE_SCRIPT_HANUNOO") + '("buhid" "G_UNICODE_SCRIPT_BUHID") + '("tagbanwa" "G_UNICODE_SCRIPT_TAGBANWA") + '("braille" "G_UNICODE_SCRIPT_BRAILLE") + '("cypriot" "G_UNICODE_SCRIPT_CYPRIOT") + '("limbu" "G_UNICODE_SCRIPT_LIMBU") + '("osmanya" "G_UNICODE_SCRIPT_OSMANYA") + '("shavian" "G_UNICODE_SCRIPT_SHAVIAN") + '("linear-b" "G_UNICODE_SCRIPT_LINEAR_B") + '("tai-le" "G_UNICODE_SCRIPT_TAI_LE") + '("ugaritic" "G_UNICODE_SCRIPT_UGARITIC") + '("new-tai-lue" "G_UNICODE_SCRIPT_NEW_TAI_LUE") + '("buginese" "G_UNICODE_SCRIPT_BUGINESE") + '("glagolitic" "G_UNICODE_SCRIPT_GLAGOLITIC") + '("tifinagh" "G_UNICODE_SCRIPT_TIFINAGH") + '("syloti-nagri" "G_UNICODE_SCRIPT_SYLOTI_NAGRI") + '("old-persian" "G_UNICODE_SCRIPT_OLD_PERSIAN") + '("kharoshthi" "G_UNICODE_SCRIPT_KHAROSHTHI") + '("unknown" "G_UNICODE_SCRIPT_UNKNOWN") + '("balinese" "G_UNICODE_SCRIPT_BALINESE") + '("cuneiform" "G_UNICODE_SCRIPT_CUNEIFORM") + '("phoenician" "G_UNICODE_SCRIPT_PHOENICIAN") + '("phags-pa" "G_UNICODE_SCRIPT_PHAGS_PA") + '("nko" "G_UNICODE_SCRIPT_NKO") ) ) @@ -581,113 +734,29 @@ ) ) -(define-flags Flags - (in-module "GParam") - (c-name "GParamFlags") - (gtype-id "G_TYPE_PARAM_FLAGS") +(define-enum Directory + (in-module "GUser") + (c-name "GUserDirectory") + (gtype-id "G_TYPE_USER_DIRECTORY") (values - '("g-param-readable" "G_PARAM_READABLE") - '("g-param-writable" "G_PARAM_WRITABLE") - '("g-param-construct" "G_PARAM_CONSTRUCT") - '("g-param-construct-only" "G_PARAM_CONSTRUCT_ONLY") - '("g-param-lax-validation" "G_PARAM_LAX_VALIDATION") - '("g-param-static-name" "G_PARAM_STATIC_NAME") - '("#ifndef" "#ifndef") - '("#endif" "#endif") - '("g-param-static-blurb" "G_PARAM_STATIC_BLURB") - ) -) - -(define-flags Flags - (in-module "GSignal") - (c-name "GSignalFlags") - (gtype-id "G_TYPE_SIGNAL_FLAGS") - (values - '("run-first" "G_SIGNAL_RUN_FIRST") - '("run-last" "G_SIGNAL_RUN_LAST") - '("run-cleanup" "G_SIGNAL_RUN_CLEANUP") - '("no-recurse" "G_SIGNAL_NO_RECURSE") - '("detailed" "G_SIGNAL_DETAILED") - '("action" "G_SIGNAL_ACTION") - '("no-hooks" "G_SIGNAL_NO_HOOKS") - ) -) - -(define-flags Flags - (in-module "GConnect") - (c-name "GConnectFlags") - (gtype-id "G_TYPE_CONNECT_FLAGS") - (values - '("after" "G_CONNECT_AFTER") - '("swapped" "G_CONNECT_SWAPPED") - ) -) - -(define-flags MatchType - (in-module "GSignal") - (c-name "GSignalMatchType") - (gtype-id "G_TYPE_SIGNAL_MATCH_TYPE") - (values - '("id" "G_SIGNAL_MATCH_ID") - '("detail" "G_SIGNAL_MATCH_DETAIL") - '("closure" "G_SIGNAL_MATCH_CLOSURE") - '("func" "G_SIGNAL_MATCH_FUNC") - '("data" "G_SIGNAL_MATCH_DATA") - '("unblocked" "G_SIGNAL_MATCH_UNBLOCKED") - ) -) - -(define-flags DebugFlags - (in-module "GType") - (c-name "GTypeDebugFlags") - (gtype-id "G_TYPE_TYPE_DEBUG_FLAGS") - (values - '("none" "G_TYPE_DEBUG_NONE") - '("objects" "G_TYPE_DEBUG_OBJECTS") - '("signals" "G_TYPE_DEBUG_SIGNALS") - '("mask" "G_TYPE_DEBUG_MASK") - ) -) - -(define-flags FundamentalFlags - (in-module "GType") - (c-name "GTypeFundamentalFlags") - (gtype-id "G_TYPE_TYPE_FUNDAMENTAL_FLAGS") - (values - '("classed" "G_TYPE_FLAG_CLASSED") - '("instantiatable" "G_TYPE_FLAG_INSTANTIATABLE") - '("derivable" "G_TYPE_FLAG_DERIVABLE") - '("deep-derivable" "G_TYPE_FLAG_DEEP_DERIVABLE") - ) -) - -(define-flags Flags - (in-module "GType") - (c-name "GTypeFlags") - (gtype-id "G_TYPE_TYPE_FLAGS") - (values - '("abstract" "G_TYPE_FLAG_ABSTRACT") - '("value-abstract" "G_TYPE_FLAG_VALUE_ABSTRACT") - ) -) - -(define-flags Flags - (in-module "GModule") - (c-name "GModuleFlags") - (gtype-id "G_TYPE_MODULE_FLAGS") - (values - '("lazy" "G_MODULE_BIND_LAZY") - '("local" "G_MODULE_BIND_LOCAL") - '("mask" "G_MODULE_BIND_MASK") + '("directory-desktop" "G_USER_DIRECTORY_DESKTOP") + '("directory-documents" "G_USER_DIRECTORY_DOCUMENTS") + '("directory-download" "G_USER_DIRECTORY_DOWNLOAD") + '("directory-music" "G_USER_DIRECTORY_MUSIC") + '("directory-pictures" "G_USER_DIRECTORY_PICTURES") + '("directory-public-share" "G_USER_DIRECTORY_PUBLIC_SHARE") + '("directory-templates" "G_USER_DIRECTORY_TEMPLATES") + '("directory-videos" "G_USER_DIRECTORY_VIDEOS") + '("n-directories" "G_USER_N_DIRECTORIES") ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/galias.h +;; From galias.h -;; From /home/murrayc/cvs/gnome212/glib/glib/galloca.h +;; From galloca.h (define-function alloca (c-name "alloca") @@ -698,7 +767,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/garray.h +;; From garray.h (define-function g_array_new (c-name "g_array_new") @@ -1038,7 +1107,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gasyncqueue.h +;; From gasyncqueue.h (define-function g_async_queue_new (c-name "g_async_queue_new") @@ -1100,6 +1169,28 @@ ) ) +(define-method push_sorted + (of-object "GAsyncQueue") + (c-name "g_async_queue_push_sorted") + (return-type "none") + (parameters + '("gpointer" "data") + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) + +(define-method push_sorted_unlocked + (of-object "GAsyncQueue") + (c-name "g_async_queue_push_sorted_unlocked") + (return-type "none") + (parameters + '("gpointer" "data") + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) + (define-method pop (of-object "GAsyncQueue") (c-name "g_async_queue_pop") @@ -1154,15 +1245,35 @@ (return-type "gint") ) +(define-method sort + (of-object "GAsyncQueue") + (c-name "g_async_queue_sort") + (return-type "none") + (parameters + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) + +(define-method sort_unlocked + (of-object "GAsyncQueue") + (c-name "g_async_queue_sort_unlocked") + (return-type "none") + (parameters + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gatomic.h + +;; From gatomic.h (define-function g_atomic_int_exchange_and_add (c-name "g_atomic_int_exchange_and_add") (return-type "gint") (parameters - '("gint*" "atomic") + '("volatile-gint*" "atomic") '("gint" "val") ) ) @@ -1171,7 +1282,7 @@ (c-name "g_atomic_int_add") (return-type "none") (parameters - '("gint*" "atomic") + '("volatile-gint*" "atomic") '("gint" "val") ) ) @@ -1180,7 +1291,7 @@ (c-name "g_atomic_int_compare_and_exchange") (return-type "gboolean") (parameters - '("gint*" "atomic") + '("volatile-gint*" "atomic") '("gint" "oldval") '("gint" "newval") ) @@ -1190,7 +1301,7 @@ (c-name "g_atomic_pointer_compare_and_exchange") (return-type "gboolean") (parameters - '("gpointer*" "atomic") + '("volatile-gpointer*" "atomic") '("gpointer" "oldval") '("gpointer" "newval") ) @@ -1200,7 +1311,16 @@ (c-name "g_atomic_int_get") (return-type "gint") (parameters - '("gint*" "atomic") + '("volatile-gint*" "atomic") + ) +) + +(define-function g_atomic_int_set + (c-name "g_atomic_int_set") + (return-type "none") + (parameters + '("volatile-gint*" "atomic") + '("gint" "newval") ) ) @@ -1208,13 +1328,22 @@ (c-name "g_atomic_pointer_get") (return-type "gpointer") (parameters - '("gpointer*" "atomic") + '("volatile-gpointer*" "atomic") + ) +) + +(define-function g_atomic_pointer_set + (c-name "g_atomic_pointer_set") + (return-type "none") + (parameters + '("volatile-gpointer*" "atomic") + '("gpointer" "newval") ) ) -;; From /home/murrayc/cvs/gnome212/glib/glib/gbacktrace.h +;; From gbacktrace.h (define-function g_on_error_query (c-name "g_on_error_query") @@ -1234,7 +1363,472 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gbsearcharray.h +;; From gbase64.h + +(define-function g_base64_encode_step + (c-name "g_base64_encode_step") + (return-type "gsize") + (parameters + '("const-guchar*" "in") + '("gsize" "len") + '("gboolean" "break_lines") + '("gchar*" "out") + '("gint*" "state") + '("gint*" "save") + ) +) + +(define-function g_base64_encode_close + (c-name "g_base64_encode_close") + (return-type "gsize") + (parameters + '("gboolean" "break_lines") + '("gchar*" "out") + '("gint*" "state") + '("gint*" "save") + ) +) + +(define-function g_base64_encode + (c-name "g_base64_encode") + (return-type "gchar*") + (parameters + '("const-guchar*" "data") + '("gsize" "len") + ) +) + +(define-function g_base64_decode_step + (c-name "g_base64_decode_step") + (return-type "gsize") + (parameters + '("const-gchar*" "in") + '("gsize" "len") + '("guchar*" "out") + '("gint*" "state") + '("guint*" "save") + ) +) + +(define-function g_base64_decode + (c-name "g_base64_decode") + (return-type "guchar*") + (parameters + '("const-gchar*" "text") + '("gsize*" "out_len") + ) +) + + + +;; From gbookmarkfile.h + +(define-function g_bookmark_file_error_quark + (c-name "g_bookmark_file_error_quark") + (return-type "GQuark") +) + +(define-function g_bookmark_file_new + (c-name "g_bookmark_file_new") + (is-constructor-of "GBookmarkFile") + (return-type "GBookmarkFile*") +) + +(define-method free + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_free") + (return-type "none") +) + +(define-method load_from_file + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_load_from_file") + (return-type "gboolean") + (parameters + '("const-gchar*" "filename") + '("GError**" "error") + ) +) + +(define-method load_from_data + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_load_from_data") + (return-type "gboolean") + (parameters + '("const-gchar*" "data") + '("gsize" "length") + '("GError**" "error") + ) +) + +(define-method load_from_data_dirs + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_load_from_data_dirs") + (return-type "gboolean") + (parameters + '("const-gchar*" "file") + '("gchar**" "full_path") + '("GError**" "error") + ) +) + +(define-method to_data + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_to_data") + (return-type "gchar*") + (parameters + '("gsize*" "length") + '("GError**" "error") + ) +) + +(define-method to_file + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_to_file") + (return-type "gboolean") + (parameters + '("const-gchar*" "filename") + '("GError**" "error") + ) +) + +(define-method set_title + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_title") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "title") + ) +) + +(define-method get_title + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_title") + (return-type "gchar*") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method set_description + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_description") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "description") + ) +) + +(define-method get_description + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_description") + (return-type "gchar*") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method set_mime_type + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_mime_type") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "mime_type") + ) +) + +(define-method get_mime_type + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_mime_type") + (return-type "gchar*") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method set_groups + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_groups") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar**" "groups") + '("gsize" "length") + ) +) + +(define-method add_group + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_add_group") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "group") + ) +) + +(define-method has_group + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_has_group") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "group") + '("GError**" "error") + ) +) + +(define-method get_groups + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_groups") + (return-type "gchar**") + (parameters + '("const-gchar*" "uri") + '("gsize*" "length") + '("GError**" "error") + ) +) + +(define-method add_application + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_add_application") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "name") + '("const-gchar*" "exec") + ) +) + +(define-method has_application + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_has_application") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "name") + '("GError**" "error") + ) +) + +(define-method get_applications + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_applications") + (return-type "gchar**") + (parameters + '("const-gchar*" "uri") + '("gsize*" "length") + '("GError**" "error") + ) +) + +(define-method set_app_info + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_app_info") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "name") + '("const-gchar*" "exec") + '("gint" "count") + '("time_t" "stamp") + '("GError**" "error") + ) +) + +(define-method get_app_info + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_app_info") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "name") + '("gchar**" "exec") + '("guint*" "count") + '("time_t*" "stamp") + '("GError**" "error") + ) +) + +(define-method set_is_private + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_is_private") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("gboolean" "is_private") + ) +) + +(define-method get_is_private + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_is_private") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method set_icon + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_icon") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "href") + '("const-gchar*" "mime_type") + ) +) + +(define-method get_icon + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_icon") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("gchar**" "href") + '("gchar**" "mime_type") + '("GError**" "error") + ) +) + +(define-method set_added + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_added") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("time_t" "added") + ) +) + +(define-method get_added + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_added") + (return-type "time_t") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method set_modified + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_modified") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("time_t" "modified") + ) +) + +(define-method get_modified + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_modified") + (return-type "time_t") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method set_visited + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_set_visited") + (return-type "none") + (parameters + '("const-gchar*" "uri") + '("time_t" "visited") + ) +) + +(define-method get_visited + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_visited") + (return-type "time_t") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method has_item + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_has_item") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + ) +) + +(define-method get_size + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_size") + (return-type "gint") +) + +(define-method get_uris + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_get_uris") + (return-type "gchar**") + (parameters + '("gsize*" "length") + ) +) + +(define-method remove_group + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_remove_group") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "group") + '("GError**" "error") + ) +) + +(define-method remove_application + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_remove_application") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("const-gchar*" "name") + '("GError**" "error") + ) +) + +(define-method remove_item + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_remove_item") + (return-type "gboolean") + (parameters + '("const-gchar*" "uri") + '("GError**" "error") + ) +) + +(define-method move_item + (of-object "GBookmarkFile") + (c-name "g_bookmark_file_move_item") + (return-type "gboolean") + (parameters + '("const-gchar*" "old_uri") + '("const-gchar*" "new_uri") + '("GError**" "error") + ) +) + + + +;; From gbsearcharray.h (define-function if (c-name "if") @@ -1254,7 +1848,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gcache.h +;; From gcache.h (define-function g_cache_new (c-name "g_cache_new") @@ -1317,7 +1911,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gcompletion.h +;; From gcompletion.h (define-function g_completion_new (c-name "g_completion_new") @@ -1389,7 +1983,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gconvert.h +;; From gconvert.h (define-function g_convert_error_quark (c-name "g_convert_error_quark") @@ -1405,17 +1999,6 @@ ) ) -(define-function g_iconv - (c-name "g_iconv") - (return-type "size_t") - (parameters - '("gchar**" "inbuf") - '("gsize*" "inbytes_left") - '("gchar**" "outbuf") - '("gsize*" "outbytes_left") - ) -) - (define-method close (of-object "GIConv") (c-name "g_iconv_close") @@ -1566,7 +2149,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gdataset.h +;; From gdataset.h (define-function g_datalist_init (c-name "g_datalist_init") @@ -1698,11 +2281,11 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gdatasetprivate.h +;; From gdatasetprivate.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gdate.h +;; From gdate.h (define-function g_date_new (c-name "g_date_new") @@ -1862,6 +2445,24 @@ ) ) +(define-method set_time_t + (of-object "GDate") + (c-name "g_date_set_time_t") + (return-type "none") + (parameters + '("time_t" "timet") + ) +) + +(define-method set_time_val + (of-object "GDate") + (c-name "g_date_set_time_val") + (return-type "none") + (parameters + '("GTimeVal*" "timeval") + ) +) + (define-method set_time (of-object "GDate") (c-name "g_date_set_time") @@ -2076,11 +2677,11 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gdebug.h +;; From gdebug.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gdir.h +;; From gdir.h (define-function g_dir_open (c-name "g_dir_open") @@ -2112,7 +2713,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gerror.h +;; From gerror.h (define-function g_error_new (c-name "g_error_new") @@ -2189,7 +2790,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gfileutils.h +;; From gfileutils.h (define-function g_file_error_quark (c-name "g_file_error_quark") @@ -2309,7 +2910,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/ghash.h +;; From ghash.h (define-function g_hash_table_new (c-name "g_hash_table_new") @@ -2367,6 +2968,12 @@ ) ) +(define-method remove_all + (of-object "GHashTable") + (c-name "g_hash_table_remove_all") + (return-type "none") +) + (define-method steal (of-object "GHashTable") (c-name "g_hash_table_steal") @@ -2376,6 +2983,12 @@ ) ) +(define-method steal_all + (of-object "GHashTable") + (c-name "g_hash_table_steal_all") + (return-type "none") +) + (define-method lookup (of-object "GHashTable") (c-name "g_hash_table_lookup") @@ -2442,6 +3055,30 @@ (return-type "guint") ) +(define-method get_keys + (of-object "GHashTable") + (c-name "g_hash_table_get_keys") + (return-type "GList*") +) + +(define-method get_values + (of-object "GHashTable") + (c-name "g_hash_table_get_values") + (return-type "GList*") +) + +(define-method ref + (of-object "GHashTable") + (c-name "g_hash_table_ref") + (return-type "GHashTable*") +) + +(define-method unref + (of-object "GHashTable") + (c-name "g_hash_table_unref") + (return-type "none") +) + (define-function g_str_equal (c-name "g_str_equal") (return-type "gboolean") @@ -2495,7 +3132,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/ghook.h +;; From ghook.h (define-method init (of-object "GHookList") @@ -2715,15 +3352,15 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gi18n.h +;; From gi18n.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gi18n-lib.h +;; From gi18n-lib.h -;; From /home/murrayc/cvs/gnome212/glib/glib/giochannel.h +;; From giochannel.h (define-method init (of-object "GIOChannel") @@ -3114,7 +3751,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gkeyfile.h +;; From gkeyfile.h (define-function g_key_file_error_quark (c-name "g_key_file_error_quark") @@ -3165,6 +3802,19 @@ ) ) +(define-method load_from_dirs + (of-object "GKeyFile") + (c-name "g_key_file_load_from_dirs") + (return-type "gboolean") + (parameters + '("const-gchar*" "file") + '("const-gchar**" "search_dirs") + '("gchar**" "full_path") + '("GKeyFileFlags" "flags") + '("GError**" "error") + ) +) + (define-method load_from_data_dirs (of-object "GKeyFile") (c-name "g_key_file_load_from_data_dirs") @@ -3345,6 +3995,28 @@ ) ) +(define-method get_double + (of-object "GKeyFile") + (c-name "g_key_file_get_double") + (return-type "gdouble") + (parameters + '("const-gchar*" "group_name") + '("const-gchar*" "key") + '("GError**" "error") + ) +) + +(define-method set_double + (of-object "GKeyFile") + (c-name "g_key_file_set_double") + (return-type "none") + (parameters + '("const-gchar*" "group_name") + '("const-gchar*" "key") + '("gdouble" "value") + ) +) + (define-method get_string_list (of-object "GKeyFile") (c-name "g_key_file_get_string_list") @@ -3431,6 +4103,30 @@ ) ) +(define-method set_double_list + (of-object "GKeyFile") + (c-name "g_key_file_set_double_list") + (return-type "none") + (parameters + '("const-gchar*" "group_name") + '("const-gchar*" "key") + '("gdouble[]" "list") + '("gsize" "length") + ) +) + +(define-method get_double_list + (of-object "GKeyFile") + (c-name "g_key_file_get_double_list") + (return-type "gdouble*") + (parameters + '("const-gchar*" "group_name") + '("const-gchar*" "key") + '("gsize*" "length") + '("GError**" "error") + ) +) + (define-method set_integer_list (of-object "GKeyFile") (c-name "g_key_file_set_integer_list") @@ -3500,32 +4196,19 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/glib.h +;; From glib.h -;; From /home/murrayc/cvs/gnome212/glib/glib/glibintl.h +;; From glibintl.h -;; From /home/murrayc/cvs/gnome212/glib/glib/glib-object.h +;; From glib-object.h -;; From /home/murrayc/cvs/gnome212/glib/glib/glist.h - -(define-function g_list_push_allocator - (c-name "g_list_push_allocator") - (return-type "none") - (parameters - '("GAllocator*" "allocator") - ) -) - -(define-function g_list_pop_allocator - (c-name "g_list_pop_allocator") - (return-type "none") -) +;; From glist.h (define-function g_list_alloc (c-name "g_list_alloc") @@ -3582,6 +4265,17 @@ ) ) +(define-method insert_sorted_with_data + (of-object "GList") + (c-name "g_list_insert_sorted_with_data") + (return-type "GList*") + (parameters + '("gpointer" "data") + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) + (define-method insert_before (of-object "GList") (c-name "g_list_insert_before") @@ -3760,13 +4454,26 @@ ) ) +(define-function g_list_push_allocator + (c-name "g_list_push_allocator") + (return-type "none") + (parameters + '("gpointer" "allocator") + ) +) - -;; From /home/murrayc/cvs/gnome212/glib/glib/gmacros.h +(define-function g_list_pop_allocator + (c-name "g_list_pop_allocator") + (return-type "none") +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gmain.h +;; From gmacros.h + + + +;; From gmain.h (define-function g_main_context_new (c-name "g_main_context_new") @@ -3852,6 +4559,12 @@ (return-type "none") ) +(define-method is_owner + (of-object "GMainContext") + (c-name "g_main_context_is_owner") + (return-type "gboolean") +) + (define-method wait (of-object "GMainContext") (c-name "g_main_context_wait") @@ -3936,7 +4649,12 @@ (define-function g_main_depth (c-name "g_main_depth") - (return-type "int") + (return-type "gint") +) + +(define-function g_main_current_source + (c-name "g_main_current_source") + (return-type "GSource*") ) (define-function g_main_loop_new @@ -4075,6 +4793,21 @@ ) ) +(define-method set_funcs + (of-object "GSource") + (c-name "g_source_set_funcs") + (return-type "none") + (parameters + '("GSourceFuncs*" "funcs") + ) +) + +(define-method is_destroyed + (of-object "GSource") + (c-name "g_source_is_destroyed") + (return-type "gboolean") +) + (define-method set_callback_indirect (of-object "GSource") (c-name "g_source_set_callback_indirect") @@ -4136,6 +4869,14 @@ ) ) +(define-function g_timeout_source_new_seconds + (c-name "g_timeout_source_new_seconds") + (return-type "GSource*") + (parameters + '("guint" "interval") + ) +) + (define-function g_get_current_time (c-name "g_get_current_time") (return-type "none") @@ -4191,6 +4932,16 @@ ) ) +(define-function g_timeout_add_seconds + (c-name "g_timeout_add_seconds") + (return-type "guint") + (parameters + '("guint" "interval") + '("GSourceFunc" "function") + '("gpointer" "data") + ) +) + (define-function g_child_watch_add_full (c-name "g_child_watch_add_full") (return-type "guint") @@ -4243,7 +4994,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gmappedfile.h +;; From gmappedfile.h (define-function g_mapped_file_new (c-name "g_mapped_file_new") @@ -4276,7 +5027,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gmarkup.h +;; From gmarkup.h (define-function g_markup_error_quark (c-name "g_markup_error_quark") @@ -4366,7 +5117,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gmem.h +;; From gmem.h (define-function g_malloc (c-name "g_malloc") @@ -4529,7 +5280,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gmessages.h +;; From gmessages.h (define-function g_printf_string_upper_bound (c-name "g_printf_string_upper_bound") @@ -4668,20 +5419,11 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gnode.h +;; From gmirroringtable.h -(define-function g_node_push_allocator - (c-name "g_node_push_allocator") - (return-type "none") - (parameters - '("GAllocator*" "allocator") - ) -) -(define-function g_node_pop_allocator - (c-name "g_node_pop_allocator") - (return-type "none") -) + +;; From gnode.h (define-function g_node_new (c-name "g_node_new") @@ -4897,9 +5639,22 @@ (return-type "GNode*") ) +(define-function g_node_push_allocator + (c-name "g_node_push_allocator") + (return-type "none") + (parameters + '("gpointer" "dummy") + ) +) + +(define-function g_node_pop_allocator + (c-name "g_node_pop_allocator") + (return-type "none") +) -;; From /home/murrayc/cvs/gnome212/glib/glib/goption.h + +;; From goption.h (define-function g_option_error_quark (c-name "g_option_error_quark") @@ -4915,6 +5670,36 @@ ) ) +(define-method set_summary + (of-object "GOptionContext") + (c-name "g_option_context_set_summary") + (return-type "none") + (parameters + '("const-gchar*" "summary") + ) +) + +(define-method get_summary + (of-object "GOptionContext") + (c-name "g_option_context_get_summary") + (return-type "const-gchar*") +) + +(define-method set_description + (of-object "GOptionContext") + (c-name "g_option_context_set_description") + (return-type "none") + (parameters + '("const-gchar*" "description") + ) +) + +(define-method get_description + (of-object "GOptionContext") + (c-name "g_option_context_get_description") + (return-type "const-gchar*") +) + (define-method free (of-object "GOptionContext") (c-name "g_option_context_free") @@ -4972,6 +5757,26 @@ ) ) +(define-method set_translate_func + (of-object "GOptionContext") + (c-name "g_option_context_set_translate_func") + (return-type "none") + (parameters + '("GTranslateFunc" "func") + '("gpointer" "data") + '("GDestroyNotify" "destroy_notify") + ) +) + +(define-method set_translation_domain + (of-object "GOptionContext") + (c-name "g_option_context_set_translation_domain") + (return-type "none") + (parameters + '("const-gchar*" "domain") + ) +) + (define-method add_group (of-object "GOptionContext") (c-name "g_option_context_add_group") @@ -4996,6 +5801,16 @@ (return-type "GOptionGroup*") ) +(define-method get_help + (of-object "GOptionContext") + (c-name "g_option_context_get_help") + (return-type "gchar*") + (parameters + '("gboolean" "main_help") + '("GOptionGroup*" "group") + ) +) + (define-function g_option_group_new (c-name "g_option_group_new") (is-constructor-of "GOptionGroup") @@ -5065,7 +5880,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gpattern.h +;; From gpattern.h (define-function g_pattern_spec_new (c-name "g_pattern_spec_new") @@ -5122,7 +5937,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gprimes.h +;; From gprimes.h (define-function g_spaced_primes_closest (c-name "g_spaced_primes_closest") @@ -5134,7 +5949,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gprintf.h +;; From gprintf.h (define-function g_printf (c-name "g_printf") @@ -5165,17 +5980,6 @@ (varargs #t) ) -(define-function g_snprintf - (c-name "g_snprintf") - (return-type "gint") - (parameters - '("gchar*" "string") - '("gulong" "n") - '("gchar-const*" "format") - ) - (varargs #t) -) - (define-function g_vprintf (c-name "g_vprintf") (return-type "gint") @@ -5205,17 +6009,6 @@ ) ) -(define-function g_vsnprintf - (c-name "g_vsnprintf") - (return-type "gint") - (parameters - '("gchar*" "string") - '("gulong" "n") - '("gchar-const*" "format") - '("va_list" "args") - ) -) - (define-function g_vasprintf (c-name "g_vasprintf") (return-type "gint") @@ -5228,11 +6021,11 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gprintfint.h +;; From gprintfint.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gqsort.h +;; From gqsort.h (define-function g_qsort_with_data (c-name "g_qsort_with_data") @@ -5248,7 +6041,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gquark.h +;; From gquark.h (define-function g_quark_try_string (c-name "g_quark_try_string") @@ -5280,9 +6073,25 @@ (return-type "const-gchar*") ) +(define-function g_intern_string + (c-name "g_intern_string") + (return-type "const-gchar*") + (parameters + '("const-gchar*" "string") + ) +) + +(define-function g_intern_static_string + (c-name "g_intern_static_string") + (return-type "const-gchar*") + (parameters + '("const-gchar*" "string") + ) +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gqueue.h + +;; From gqueue.h (define-function g_queue_new (c-name "g_queue_new") @@ -5296,6 +6105,18 @@ (return-type "none") ) +(define-method init + (of-object "GQueue") + (c-name "g_queue_init") + (return-type "none") +) + +(define-method clear + (of-object "GQueue") + (c-name "g_queue_clear") + (return-type "none") +) + (define-method is_empty (of-object "GQueue") (c-name "g_queue_is_empty") @@ -5586,7 +6407,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/grand.h +;; From grand.h (define-function g_rand_new_with_seed (c-name "g_rand_new_with_seed") @@ -5712,7 +6533,326 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/grel.h +;; From gregex.h + +(define-function g_regex_error_quark + (c-name "g_regex_error_quark") + (return-type "GQuark") +) + +(define-function g_regex_new + (c-name "g_regex_new") + (is-constructor-of "GRegex") + (return-type "GRegex*") + (parameters + '("const-gchar*" "pattern") + '("GRegexCompileFlags" "compile_options") + '("GRegexMatchFlags" "match_options") + '("GError**" "error") + ) +) + +(define-method ref + (of-object "GRegex") + (c-name "g_regex_ref") + (return-type "GRegex*") +) + +(define-method unref + (of-object "GRegex") + (c-name "g_regex_unref") + (return-type "none") +) + +(define-method get_pattern + (of-object "GRegex") + (c-name "g_regex_get_pattern") + (return-type "const-gchar*") +) + +(define-method get_max_backref + (of-object "GRegex") + (c-name "g_regex_get_max_backref") + (return-type "gint") +) + +(define-method get_capture_count + (of-object "GRegex") + (c-name "g_regex_get_capture_count") + (return-type "gint") +) + +(define-method get_string_number + (of-object "GRegex") + (c-name "g_regex_get_string_number") + (return-type "gint") + (parameters + '("const-gchar*" "name") + ) +) + +(define-function g_regex_escape_string + (c-name "g_regex_escape_string") + (return-type "gchar*") + (parameters + '("const-gchar*" "string") + '("gint" "length") + ) +) + +(define-function g_regex_match_simple + (c-name "g_regex_match_simple") + (return-type "gboolean") + (parameters + '("const-gchar*" "pattern") + '("const-gchar*" "string") + '("GRegexCompileFlags" "compile_options") + '("GRegexMatchFlags" "match_options") + ) +) + +(define-method match + (of-object "GRegex") + (c-name "g_regex_match") + (return-type "gboolean") + (parameters + '("const-gchar*" "string") + '("GRegexMatchFlags" "match_options") + '("GMatchInfo**" "match_info") + ) +) + +(define-method match_full + (of-object "GRegex") + (c-name "g_regex_match_full") + (return-type "gboolean") + (parameters + '("const-gchar*" "string") + '("gssize" "string_len") + '("gint" "start_position") + '("GRegexMatchFlags" "match_options") + '("GMatchInfo**" "match_info") + '("GError**" "error") + ) +) + +(define-method match_all + (of-object "GRegex") + (c-name "g_regex_match_all") + (return-type "gboolean") + (parameters + '("const-gchar*" "string") + '("GRegexMatchFlags" "match_options") + '("GMatchInfo**" "match_info") + ) +) + +(define-method match_all_full + (of-object "GRegex") + (c-name "g_regex_match_all_full") + (return-type "gboolean") + (parameters + '("const-gchar*" "string") + '("gssize" "string_len") + '("gint" "start_position") + '("GRegexMatchFlags" "match_options") + '("GMatchInfo**" "match_info") + '("GError**" "error") + ) +) + +(define-function g_regex_split_simple + (c-name "g_regex_split_simple") + (return-type "gchar**") + (parameters + '("const-gchar*" "pattern") + '("const-gchar*" "string") + '("GRegexCompileFlags" "compile_options") + '("GRegexMatchFlags" "match_options") + ) +) + +(define-method split + (of-object "GRegex") + (c-name "g_regex_split") + (return-type "gchar**") + (parameters + '("const-gchar*" "string") + '("GRegexMatchFlags" "match_options") + ) +) + +(define-method split_full + (of-object "GRegex") + (c-name "g_regex_split_full") + (return-type "gchar**") + (parameters + '("const-gchar*" "string") + '("gssize" "string_len") + '("gint" "start_position") + '("GRegexMatchFlags" "match_options") + '("gint" "max_tokens") + '("GError**" "error") + ) +) + +(define-method replace + (of-object "GRegex") + (c-name "g_regex_replace") + (return-type "gchar*") + (parameters + '("const-gchar*" "string") + '("gssize" "string_len") + '("gint" "start_position") + '("const-gchar*" "replacement") + '("GRegexMatchFlags" "match_options") + '("GError**" "error") + ) +) + +(define-method replace_literal + (of-object "GRegex") + (c-name "g_regex_replace_literal") + (return-type "gchar*") + (parameters + '("const-gchar*" "string") + '("gssize" "string_len") + '("gint" "start_position") + '("const-gchar*" "replacement") + '("GRegexMatchFlags" "match_options") + '("GError**" "error") + ) +) + +(define-method replace_eval + (of-object "GRegex") + (c-name "g_regex_replace_eval") + (return-type "gchar*") + (parameters + '("const-gchar*" "string") + '("gssize" "string_len") + '("gint" "start_position") + '("GRegexMatchFlags" "match_options") + '("GRegexEvalCallback" "eval") + '("gpointer" "user_data") + '("GError**" "error") + ) +) + +(define-function g_regex_check_replacement + (c-name "g_regex_check_replacement") + (return-type "gboolean") + (parameters + '("const-gchar*" "replacement") + '("gboolean*" "has_references") + '("GError**" "error") + ) +) + +(define-method get_regex + (of-object "GMatchInfo") + (c-name "g_match_info_get_regex") + (return-type "GRegex*") +) + +(define-method get_string + (of-object "GMatchInfo") + (c-name "g_match_info_get_string") + (return-type "const-gchar*") +) + +(define-method free + (of-object "GMatchInfo") + (c-name "g_match_info_free") + (return-type "none") +) + +(define-method next + (of-object "GMatchInfo") + (c-name "g_match_info_next") + (return-type "gboolean") + (parameters + '("GError**" "error") + ) +) + +(define-method matches + (of-object "GMatchInfo") + (c-name "g_match_info_matches") + (return-type "gboolean") +) + +(define-method get_match_count + (of-object "GMatchInfo") + (c-name "g_match_info_get_match_count") + (return-type "gint") +) + +(define-method is_partial_match + (of-object "GMatchInfo") + (c-name "g_match_info_is_partial_match") + (return-type "gboolean") +) + +(define-method expand_references + (of-object "GMatchInfo") + (c-name "g_match_info_expand_references") + (return-type "gchar*") + (parameters + '("const-gchar*" "string_to_expand") + '("GError**" "error") + ) +) + +(define-method fetch + (of-object "GMatchInfo") + (c-name "g_match_info_fetch") + (return-type "gchar*") + (parameters + '("gint" "match_num") + ) +) + +(define-method fetch_pos + (of-object "GMatchInfo") + (c-name "g_match_info_fetch_pos") + (return-type "gboolean") + (parameters + '("gint" "match_num") + '("gint*" "start_pos") + '("gint*" "end_pos") + ) +) + +(define-method fetch_named + (of-object "GMatchInfo") + (c-name "g_match_info_fetch_named") + (return-type "gchar*") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method fetch_named_pos + (of-object "GMatchInfo") + (c-name "g_match_info_fetch_named_pos") + (return-type "gboolean") + (parameters + '("const-gchar*" "name") + '("gint*" "start_pos") + '("gint*" "end_pos") + ) +) + +(define-method fetch_all + (of-object "GMatchInfo") + (c-name "g_match_info_fetch_all") + (return-type "gchar**") +) + + + +;; From grel.h (define-function g_relation_new (c-name "g_relation_new") @@ -5812,7 +6952,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gscanner.h +;; From gscanner.h (define-function g_scanner_new (c-name "g_scanner_new") @@ -5992,7 +7132,314 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gshell.h +;; From gscripttable.h + + + +;; From gsequence.h + +(define-function g_sequence_new + (c-name "g_sequence_new") + (is-constructor-of "GSequence") + (return-type "GSequence*") + (parameters + '("GDestroyNotify" "data_destroy") + ) +) + +(define-method free + (of-object "GSequence") + (c-name "g_sequence_free") + (return-type "none") +) + +(define-method get_length + (of-object "GSequence") + (c-name "g_sequence_get_length") + (return-type "gint") +) + +(define-method foreach + (of-object "GSequence") + (c-name "g_sequence_foreach") + (return-type "none") + (parameters + '("GFunc" "func") + '("gpointer" "user_data") + ) +) + +(define-function g_sequence_foreach_range + (c-name "g_sequence_foreach_range") + (return-type "none") + (parameters + '("GSequenceIter*" "begin") + '("GSequenceIter*" "end") + '("GFunc" "func") + '("gpointer" "user_data") + ) +) + +(define-method sort + (of-object "GSequence") + (c-name "g_sequence_sort") + (return-type "none") + (parameters + '("GCompareDataFunc" "cmp_func") + '("gpointer" "cmp_data") + ) +) + +(define-method sort_iter + (of-object "GSequence") + (c-name "g_sequence_sort_iter") + (return-type "none") + (parameters + '("GSequenceIterCompareFunc" "cmp_func") + '("gpointer" "cmp_data") + ) +) + +(define-method get_begin_iter + (of-object "GSequence") + (c-name "g_sequence_get_begin_iter") + (return-type "GSequenceIter*") +) + +(define-method get_end_iter + (of-object "GSequence") + (c-name "g_sequence_get_end_iter") + (return-type "GSequenceIter*") +) + +(define-method get_iter_at_pos + (of-object "GSequence") + (c-name "g_sequence_get_iter_at_pos") + (return-type "GSequenceIter*") + (parameters + '("gint" "pos") + ) +) + +(define-method append + (of-object "GSequence") + (c-name "g_sequence_append") + (return-type "GSequenceIter*") + (parameters + '("gpointer" "data") + ) +) + +(define-method prepend + (of-object "GSequence") + (c-name "g_sequence_prepend") + (return-type "GSequenceIter*") + (parameters + '("gpointer" "data") + ) +) + +(define-function g_sequence_insert_before + (c-name "g_sequence_insert_before") + (return-type "GSequenceIter*") + (parameters + '("GSequenceIter*" "iter") + '("gpointer" "data") + ) +) + +(define-function g_sequence_move + (c-name "g_sequence_move") + (return-type "none") + (parameters + '("GSequenceIter*" "src") + '("GSequenceIter*" "dest") + ) +) + +(define-function g_sequence_swap + (c-name "g_sequence_swap") + (return-type "none") + (parameters + '("GSequenceIter*" "a") + '("GSequenceIter*" "b") + ) +) + +(define-method insert_sorted + (of-object "GSequence") + (c-name "g_sequence_insert_sorted") + (return-type "GSequenceIter*") + (parameters + '("gpointer" "data") + '("GCompareDataFunc" "cmp_func") + '("gpointer" "cmp_data") + ) +) + +(define-method insert_sorted_iter + (of-object "GSequence") + (c-name "g_sequence_insert_sorted_iter") + (return-type "GSequenceIter*") + (parameters + '("gpointer" "data") + '("GSequenceIterCompareFunc" "iter_cmp") + '("gpointer" "cmp_data") + ) +) + +(define-function g_sequence_sort_changed + (c-name "g_sequence_sort_changed") + (return-type "none") + (parameters + '("GSequenceIter*" "iter") + '("GCompareDataFunc" "cmp_func") + '("gpointer" "cmp_data") + ) +) + +(define-function g_sequence_sort_changed_iter + (c-name "g_sequence_sort_changed_iter") + (return-type "none") + (parameters + '("GSequenceIter*" "iter") + '("GSequenceIterCompareFunc" "iter_cmp") + '("gpointer" "cmp_data") + ) +) + +(define-function g_sequence_remove + (c-name "g_sequence_remove") + (return-type "none") + (parameters + '("GSequenceIter*" "iter") + ) +) + +(define-function g_sequence_remove_range + (c-name "g_sequence_remove_range") + (return-type "none") + (parameters + '("GSequenceIter*" "begin") + '("GSequenceIter*" "end") + ) +) + +(define-function g_sequence_move_range + (c-name "g_sequence_move_range") + (return-type "none") + (parameters + '("GSequenceIter*" "dest") + '("GSequenceIter*" "begin") + '("GSequenceIter*" "end") + ) +) + +(define-method search + (of-object "GSequence") + (c-name "g_sequence_search") + (return-type "GSequenceIter*") + (parameters + '("gpointer" "data") + '("GCompareDataFunc" "cmp_func") + '("gpointer" "cmp_data") + ) +) + +(define-method search_iter + (of-object "GSequence") + (c-name "g_sequence_search_iter") + (return-type "GSequenceIter*") + (parameters + '("gpointer" "data") + '("GSequenceIterCompareFunc" "iter_cmp") + '("gpointer" "cmp_data") + ) +) + +(define-function g_sequence_get + (c-name "g_sequence_get") + (return-type "gpointer") + (parameters + '("GSequenceIter*" "iter") + ) +) + +(define-function g_sequence_set + (c-name "g_sequence_set") + (return-type "none") + (parameters + '("GSequenceIter*" "iter") + '("gpointer" "data") + ) +) + +(define-method is_begin + (of-object "GSequenceIter") + (c-name "g_sequence_iter_is_begin") + (return-type "gboolean") +) + +(define-method is_end + (of-object "GSequenceIter") + (c-name "g_sequence_iter_is_end") + (return-type "gboolean") +) + +(define-method next + (of-object "GSequenceIter") + (c-name "g_sequence_iter_next") + (return-type "GSequenceIter*") +) + +(define-method prev + (of-object "GSequenceIter") + (c-name "g_sequence_iter_prev") + (return-type "GSequenceIter*") +) + +(define-method get_position + (of-object "GSequenceIter") + (c-name "g_sequence_iter_get_position") + (return-type "gint") +) + +(define-method move + (of-object "GSequenceIter") + (c-name "g_sequence_iter_move") + (return-type "GSequenceIter*") + (parameters + '("gint" "delta") + ) +) + +(define-method get_sequence + (of-object "GSequenceIter") + (c-name "g_sequence_iter_get_sequence") + (return-type "GSequence*") +) + +(define-method compare + (of-object "GSequenceIter") + (c-name "g_sequence_iter_compare") + (return-type "gint") + (parameters + '("GSequenceIter*" "b") + ) +) + +(define-function g_sequence_range_get_midpoint + (c-name "g_sequence_range_get_midpoint") + (return-type "GSequenceIter*") + (parameters + '("GSequenceIter*" "begin") + '("GSequenceIter*" "end") + ) +) + + + +;; From gshell.h (define-function g_shell_error_quark (c-name "g_shell_error_quark") @@ -6029,21 +7476,74 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gslist.h +;; From gslice.h -(define-function g_slist_push_allocator - (c-name "g_slist_push_allocator") - (return-type "none") +(define-function g_slice_alloc + (c-name "g_slice_alloc") + (return-type "gpointer") (parameters - '("GAllocator*" "allocator") + '("gsize" "block_size") ) ) -(define-function g_slist_pop_allocator - (c-name "g_slist_pop_allocator") - (return-type "none") +(define-function g_slice_alloc0 + (c-name "g_slice_alloc0") + (return-type "gpointer") + (parameters + '("gsize" "block_size") + ) ) +(define-function g_slice_free1 + (c-name "g_slice_free1") + (return-type "none") + (parameters + '("gsize" "block_size") + '("gpointer" "mem_block") + ) +) + +(define-function g_slice_free_chain_with_offset + (c-name "g_slice_free_chain_with_offset") + (return-type "none") + (parameters + '("gsize" "block_size") + '("gpointer" "mem_chain") + '("gsize" "next_offset") + ) +) + +(define-function g_slice_set_config + (c-name "g_slice_set_config") + (return-type "none") + (parameters + '("GSliceConfig" "ckey") + '("gint64" "value") + ) +) + +(define-function g_slice_get_config + (c-name "g_slice_get_config") + (return-type "gint64") + (parameters + '("GSliceConfig" "ckey") + ) +) + +(define-function g_slice_get_config_state + (c-name "g_slice_get_config_state") + (return-type "gint64*") + (parameters + '("GSliceConfig" "ckey") + '("gint64" "address") + '("guint*" "n_values") + ) +) + + + +;; From gslist.h + (define-function g_slist_alloc (c-name "g_slist_alloc") (return-type "GSList*") @@ -6099,6 +7599,17 @@ ) ) +(define-method insert_sorted_with_data + (of-object "GSList") + (c-name "g_slist_insert_sorted_with_data") + (return-type "GSList*") + (parameters + '("gpointer" "data") + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) + (define-method insert_before (of-object "GSList") (c-name "g_slist_insert_before") @@ -6262,9 +7773,22 @@ ) ) +(define-function g_slist_push_allocator + (c-name "g_slist_push_allocator") + (return-type "none") + (parameters + '("gpointer" "dummy") + ) +) + +(define-function g_slist_pop_allocator + (c-name "g_slist_pop_allocator") + (return-type "none") +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gspawn.h + +;; From gspawn.h (define-function g_spawn_error_quark (c-name "g_spawn_error_quark") @@ -6352,7 +7876,40 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gstdio.h +;; From gstdio.h + +(define-function g_access + (c-name "g_access") + (return-type "int") + (parameters + '("const-gchar*" "filename") + '("int" "mode") + ) +) + +(define-function g_chdir + (c-name "g_chdir") + (return-type "int") + (parameters + '("const-gchar*" "path") + ) +) + +(define-function g_unlink + (c-name "g_unlink") + (return-type "int") + (parameters + '("const-gchar*" "filename") + ) +) + +(define-function g_rmdir + (c-name "g_rmdir") + (return-type "int") + (parameters + '("const-gchar*" "filename") + ) +) (define-function g_access (c-name "g_access") @@ -6480,7 +8037,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gstrfuncs.h +;; From gstrfuncs.h (define-function g_ascii_tolower (c-name "g_ascii_tolower") @@ -6653,6 +8210,16 @@ ) ) +(define-function g_ascii_strtoll + (c-name "g_ascii_strtoll") + (return-type "gint64") + (parameters + '("const-gchar*" "nptr") + '("gchar**" "endptr") + '("guint" "base") + ) +) + (define-function g_ascii_dtostr (c-name "g_ascii_dtostr") (return-type "gchar*") @@ -6923,7 +8490,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gstring.h +;; From gstring.h (define-function g_string_chunk_new (c-name "g_string_chunk_new") @@ -6940,6 +8507,12 @@ (return-type "none") ) +(define-method clear + (of-object "GStringChunk") + (c-name "g_string_chunk_clear") + (return-type "none") +) + (define-method insert (of-object "GStringChunk") (c-name "g_string_chunk_insert") @@ -7202,7 +8775,15 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gthread.h +;; From gthread.h + +(define-function guint64 + (c-name "guint64") + (return-type "GLIB_VAR") + (parameters + '("*" "g_thread_gettime") + ) +) (define-function g_thread_init (c-name "g_thread_init") @@ -7403,6 +8984,15 @@ (return-type "none") ) +(define-function g_thread_foreach + (c-name "g_thread_foreach") + (return-type "none") + (parameters + '("GFunc" "thread_func") + '("gpointer" "user_data") + ) +) + (define-method impl (of-object "GOnce") (c-name "g_once_impl") @@ -7415,16 +9005,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gthreadinit.h - -(define-function g_thread_init_glib - (c-name "g_thread_init_glib") - (return-type "none") -) - - - -;; From /home/murrayc/cvs/gnome212/glib/glib/gthreadpool.h +;; From gthreadpool.h (define-function g_thread_pool_new (c-name "g_thread_pool_new") @@ -7483,7 +9064,7 @@ (return-type "none") (parameters '("gboolean" "immediate") - '("gboolean" "wait") + '("gboolean" "wait_") ) ) @@ -7510,9 +9091,41 @@ (return-type "none") ) +(define-method set_sort_function + (of-object "GThreadPool") + (c-name "g_thread_pool_set_sort_function") + (return-type "none") + (parameters + '("GCompareDataFunc" "func") + '("gpointer" "user_data") + ) +) + +(define-function g_thread_pool_set_max_idle_time + (c-name "g_thread_pool_set_max_idle_time") + (return-type "none") + (parameters + '("guint" "interval") + ) +) + +(define-function g_thread_pool_get_max_idle_time + (c-name "g_thread_pool_get_max_idle_time") + (return-type "guint") +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gtimer.h + +;; From gthreadprivate.h + +(define-function g_thread_init_glib + (c-name "g_thread_init_glib") + (return-type "none") +) + + + +;; From gtimer.h (define-function g_timer_new (c-name "g_timer_new") @@ -7576,9 +9189,24 @@ ) ) +(define-function g_time_val_from_iso8601 + (c-name "g_time_val_from_iso8601") + (return-type "gboolean") + (parameters + '("const-gchar*" "iso_date") + '("GTimeVal*" "time_") + ) +) + +(define-method to_iso8601 + (of-object "GTimeVal") + (c-name "g_time_val_to_iso8601") + (return-type "gchar*") +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gtree.h + +;; From gtree.h (define-function g_tree_new (c-name "g_tree_new") @@ -7718,19 +9346,19 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gtypes.h +;; From gtypes.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gunibreak.h +;; From gunibreak.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gunichartables.h +;; From gunichartables.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gunicode.h +;; From gunicode.h (define-function g_get_charset (c-name "g_get_charset") @@ -7824,6 +9452,24 @@ (return-type "gboolean") ) +(define-method iswide_cjk + (of-object "gunichar") + (c-name "g_unichar_iswide_cjk") + (return-type "gboolean") +) + +(define-method iszerowidth + (of-object "gunichar") + (c-name "g_unichar_iszerowidth") + (return-type "gboolean") +) + +(define-method ismark + (of-object "gunichar") + (c-name "g_unichar_ismark") + (return-type "gboolean") +) + (define-method toupper (of-object "gunichar") (c-name "g_unichar_toupper") @@ -8173,21 +9819,27 @@ ) ) - - -;; From /home/murrayc/cvs/gnome212/glib/glib/gunicodeprivate.h +(define-method get_script + (of-object "gunichar") + (c-name "g_unichar_get_script") + (return-type "GUnicodeScript") +) -;; From /home/murrayc/cvs/gnome212/glib/glib/gunicomp.h +;; From gunicodeprivate.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gunidecomp.h +;; From gunicomp.h -;; From /home/murrayc/cvs/gnome212/glib/glib/gutils.h +;; From gunidecomp.h + + + +;; From gutils.h (define-function g_get_user_name (c-name "g_get_user_name") @@ -8255,6 +9907,14 @@ (return-type "const-gchar*") ) +(define-function g_get_user_special_dir + (c-name "g_get_user_special_dir") + (return-type "const-gchar*") + (parameters + '("GUserDirectory" "directory") + ) +) + (define-function g_parse_debug_string (c-name "g_parse_debug_string") (return-type "guint") @@ -8399,7 +10059,7 @@ -;; From /home/murrayc/cvs/gnome212/glib/glib/gwin32.h +;; From gwin32.h (define-function g_win32_ftruncate (c-name "g_win32_ftruncate") @@ -8427,8 +10087,8 @@ (c-name "g_win32_get_package_installation_directory") (return-type "gchar*") (parameters - '("gchar*" "package") - '("gchar*" "dll_name") + '("const-gchar*" "package") + '("const-gchar*" "dll_name") ) ) @@ -8436,9 +10096,9 @@ (c-name "g_win32_get_package_installation_subdirectory") (return-type "gchar*") (parameters - '("gchar*" "package") - '("gchar*" "dll_name") - '("gchar*" "subdir") + '("const-gchar*" "package") + '("const-gchar*" "dll_name") + '("const-gchar*" "subdir") ) ) @@ -8456,2880 +10116,3 @@ ) - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gboxed.h - -(define-function g_boxed_copy - (c-name "g_boxed_copy") - (return-type "gpointer") - (parameters - '("GType" "boxed_type") - '("gconstpointer" "src_boxed") - ) -) - -(define-function g_boxed_free - (c-name "g_boxed_free") - (return-type "none") - (parameters - '("GType" "boxed_type") - '("gpointer" "boxed") - ) -) - -(define-method set_boxed - (of-object "GValue") - (c-name "g_value_set_boxed") - (return-type "none") - (parameters - '("gconstpointer" "v_boxed") - ) -) - -(define-method set_static_boxed - (of-object "GValue") - (c-name "g_value_set_static_boxed") - (return-type "none") - (parameters - '("gconstpointer" "v_boxed") - ) -) - -(define-method get_boxed - (of-object "GValue") - (c-name "g_value_get_boxed") - (return-type "gpointer") -) - -(define-method dup_boxed - (of-object "GValue") - (c-name "g_value_dup_boxed") - (return-type "gpointer") -) - -(define-function g_boxed_type_register_static - (c-name "g_boxed_type_register_static") - (return-type "GType") - (parameters - '("const-gchar*" "name") - '("GBoxedCopyFunc" "boxed_copy") - '("GBoxedFreeFunc" "boxed_free") - ) -) - -(define-method take_boxed - (of-object "GValue") - (c-name "g_value_take_boxed") - (return-type "none") - (parameters - '("gconstpointer" "v_boxed") - ) -) - -(define-method set_boxed_take_ownership - (of-object "GValue") - (c-name "g_value_set_boxed_take_ownership") - (return-type "none") - (parameters - '("gconstpointer" "v_boxed") - ) -) - -(define-function g_closure_get_type - (c-name "g_closure_get_type") - (return-type "GType") -) - -(define-function g_value_get_type - (c-name "g_value_get_type") - (return-type "GType") -) - -(define-function g_value_array_get_type - (c-name "g_value_array_get_type") - (return-type "GType") -) - -(define-function g_date_get_type - (c-name "g_date_get_type") - (return-type "GType") -) - -(define-function g_strv_get_type - (c-name "g_strv_get_type") - (return-type "GType") -) - -(define-function g_gstring_get_type - (c-name "g_gstring_get_type") - (return-type "GType") -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gclosure.h - -(define-function g_cclosure_new - (c-name "g_cclosure_new") - (is-constructor-of "GCclosure") - (return-type "GClosure*") - (parameters - '("GCallback" "callback_func") - '("gpointer" "user_data") - '("GClosureNotify" "destroy_data") - ) -) - -(define-function g_cclosure_new_swap - (c-name "g_cclosure_new_swap") - (return-type "GClosure*") - (parameters - '("GCallback" "callback_func") - '("gpointer" "user_data") - '("GClosureNotify" "destroy_data") - ) -) - -(define-function g_signal_type_cclosure_new - (c-name "g_signal_type_cclosure_new") - (is-constructor-of "GSignalTypeCclosure") - (return-type "GClosure*") - (parameters - '("GType" "itype") - '("guint" "struct_offset") - ) -) - -(define-method ref - (of-object "GClosure") - (c-name "g_closure_ref") - (return-type "GClosure*") -) - -(define-method sink - (of-object "GClosure") - (c-name "g_closure_sink") - (return-type "none") -) - -(define-method unref - (of-object "GClosure") - (c-name "g_closure_unref") - (return-type "none") -) - -(define-function g_closure_new_simple - (c-name "g_closure_new_simple") - (return-type "GClosure*") - (parameters - '("guint" "sizeof_closure") - '("gpointer" "data") - ) -) - -(define-method add_finalize_notifier - (of-object "GClosure") - (c-name "g_closure_add_finalize_notifier") - (return-type "none") - (parameters - '("gpointer" "notify_data") - '("GClosureNotify" "notify_func") - ) -) - -(define-method remove_finalize_notifier - (of-object "GClosure") - (c-name "g_closure_remove_finalize_notifier") - (return-type "none") - (parameters - '("gpointer" "notify_data") - '("GClosureNotify" "notify_func") - ) -) - -(define-method add_invalidate_notifier - (of-object "GClosure") - (c-name "g_closure_add_invalidate_notifier") - (return-type "none") - (parameters - '("gpointer" "notify_data") - '("GClosureNotify" "notify_func") - ) -) - -(define-method remove_invalidate_notifier - (of-object "GClosure") - (c-name "g_closure_remove_invalidate_notifier") - (return-type "none") - (parameters - '("gpointer" "notify_data") - '("GClosureNotify" "notify_func") - ) -) - -(define-method add_marshal_guards - (of-object "GClosure") - (c-name "g_closure_add_marshal_guards") - (return-type "none") - (parameters - '("gpointer" "pre_marshal_data") - '("GClosureNotify" "pre_marshal_notify") - '("gpointer" "post_marshal_data") - '("GClosureNotify" "post_marshal_notify") - ) -) - -(define-method set_marshal - (of-object "GClosure") - (c-name "g_closure_set_marshal") - (return-type "none") - (parameters - '("GClosureMarshal" "marshal") - ) -) - -(define-method set_meta_marshal - (of-object "GClosure") - (c-name "g_closure_set_meta_marshal") - (return-type "none") - (parameters - '("gpointer" "marshal_data") - '("GClosureMarshal" "meta_marshal") - ) -) - -(define-method invalidate - (of-object "GClosure") - (c-name "g_closure_invalidate") - (return-type "none") -) - -(define-method invoke - (of-object "GClosure") - (c-name "g_closure_invoke") - (return-type "none") - (parameters - '("GValue*" "return_value") - '("guint" "n_param_values") - '("const-GValue*" "param_values") - '("gpointer" "invocation_hint") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/genums.h - -(define-function g_enum_get_value - (c-name "g_enum_get_value") - (return-type "GEnumValue*") - (parameters - '("GEnumClass*" "enum_class") - '("gint" "value") - ) -) - -(define-function g_enum_get_value_by_name - (c-name "g_enum_get_value_by_name") - (return-type "GEnumValue*") - (parameters - '("GEnumClass*" "enum_class") - '("const-gchar*" "name") - ) -) - -(define-function g_enum_get_value_by_nick - (c-name "g_enum_get_value_by_nick") - (return-type "GEnumValue*") - (parameters - '("GEnumClass*" "enum_class") - '("const-gchar*" "nick") - ) -) - -(define-function g_flags_get_first_value - (c-name "g_flags_get_first_value") - (return-type "GFlagsValue*") - (parameters - '("GFlagsClass*" "flags_class") - '("guint" "value") - ) -) - -(define-function g_flags_get_value_by_name - (c-name "g_flags_get_value_by_name") - (return-type "GFlagsValue*") - (parameters - '("GFlagsClass*" "flags_class") - '("const-gchar*" "name") - ) -) - -(define-function g_flags_get_value_by_nick - (c-name "g_flags_get_value_by_nick") - (return-type "GFlagsValue*") - (parameters - '("GFlagsClass*" "flags_class") - '("const-gchar*" "nick") - ) -) - -(define-method set_enum - (of-object "GValue") - (c-name "g_value_set_enum") - (return-type "none") - (parameters - '("gint" "v_enum") - ) -) - -(define-method get_enum - (of-object "GValue") - (c-name "g_value_get_enum") - (return-type "gint") -) - -(define-method set_flags - (of-object "GValue") - (c-name "g_value_set_flags") - (return-type "none") - (parameters - '("guint" "v_flags") - ) -) - -(define-method get_flags - (of-object "GValue") - (c-name "g_value_get_flags") - (return-type "guint") -) - -(define-function g_enum_register_static - (c-name "g_enum_register_static") - (return-type "GType") - (parameters - '("const-gchar*" "name") - '("const-GEnumValue*" "const_static_values") - ) -) - -(define-function g_flags_register_static - (c-name "g_flags_register_static") - (return-type "GType") - (parameters - '("const-gchar*" "name") - '("const-GFlagsValue*" "const_static_values") - ) -) - -(define-function g_enum_complete_type_info - (c-name "g_enum_complete_type_info") - (return-type "none") - (parameters - '("GType" "g_enum_type") - '("GTypeInfo*" "info") - '("const-GEnumValue*" "const_values") - ) -) - -(define-function g_flags_complete_type_info - (c-name "g_flags_complete_type_info") - (return-type "none") - (parameters - '("GType" "g_flags_type") - '("GTypeInfo*" "info") - '("const-GFlagsValue*" "const_values") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gmarshal.h - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gobjectalias.h - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gobject.h - -(define-method install_property - (of-object "GObjectClass") - (c-name "g_object_class_install_property") - (return-type "none") - (parameters - '("guint" "property_id") - '("GParamSpec*" "pspec") - ) -) - -(define-method find_property - (of-object "GObjectClass") - (c-name "g_object_class_find_property") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "property_name") - ) -) - -(define-method list_properties - (of-object "GObjectClass") - (c-name "g_object_class_list_properties") - (return-type "GParamSpec**") - (parameters - '("guint*" "n_properties") - ) -) - -(define-method override_property - (of-object "GObjectClass") - (c-name "g_object_class_override_property") - (return-type "none") - (parameters - '("guint" "property_id") - '("const-gchar*" "name") - ) -) - -(define-function g_object_interface_install_property - (c-name "g_object_interface_install_property") - (return-type "none") - (parameters - '("gpointer" "g_iface") - '("GParamSpec*" "pspec") - ) -) - -(define-function g_object_interface_find_property - (c-name "g_object_interface_find_property") - (return-type "GParamSpec*") - (parameters - '("gpointer" "g_iface") - '("const-gchar*" "property_name") - ) -) - -(define-function g_object_interface_list_properties - (c-name "g_object_interface_list_properties") - (return-type "GParamSpec**") - (parameters - '("gpointer" "g_iface") - '("guint*" "n_properties_p") - ) -) - -(define-function g_object_new - (c-name "g_object_new") - (return-type "gpointer") - (parameters - '("GType" "object_type") - '("const-gchar*" "first_property_name") - ) - (varargs #t) -) - -(define-function g_object_newv - (c-name "g_object_newv") - (return-type "gpointer") - (parameters - '("GType" "object_type") - '("guint" "n_parameters") - '("GParameter*" "parameters") - ) -) - -(define-function g_object_new_valist - (c-name "g_object_new_valist") - (return-type "GObject*") - (parameters - '("GType" "object_type") - '("const-gchar*" "first_property_name") - '("va_list" "var_args") - ) -) - -(define-function g_object_set - (c-name "g_object_set") - (return-type "none") - (parameters - '("gpointer" "object") - '("const-gchar*" "first_property_name") - ) - (varargs #t) -) - -(define-function g_object_get - (c-name "g_object_get") - (return-type "none") - (parameters - '("gpointer" "object") - '("const-gchar*" "first_property_name") - ) - (varargs #t) -) - -(define-function g_object_connect - (c-name "g_object_connect") - (return-type "gpointer") - (parameters - '("gpointer" "object") - '("const-gchar*" "signal_spec") - ) - (varargs #t) -) - -(define-function g_object_disconnect - (c-name "g_object_disconnect") - (return-type "none") - (parameters - '("gpointer" "object") - '("const-gchar*" "signal_spec") - ) - (varargs #t) -) - -(define-method set_valist - (of-object "GObject") - (c-name "g_object_set_valist") - (return-type "none") - (parameters - '("const-gchar*" "first_property_name") - '("va_list" "var_args") - ) -) - -(define-method get_valist - (of-object "GObject") - (c-name "g_object_get_valist") - (return-type "none") - (parameters - '("const-gchar*" "first_property_name") - '("va_list" "var_args") - ) -) - -(define-method set_property - (of-object "GObject") - (c-name "g_object_set_property") - (return-type "none") - (parameters - '("const-gchar*" "property_name") - '("const-GValue*" "value") - ) -) - -(define-method get_property - (of-object "GObject") - (c-name "g_object_get_property") - (return-type "none") - (parameters - '("const-gchar*" "property_name") - '("GValue*" "value") - ) -) - -(define-method freeze_notify - (of-object "GObject") - (c-name "g_object_freeze_notify") - (return-type "none") -) - -(define-method notify - (of-object "GObject") - (c-name "g_object_notify") - (return-type "none") - (parameters - '("const-gchar*" "property_name") - ) -) - -(define-method thaw_notify - (of-object "GObject") - (c-name "g_object_thaw_notify") - (return-type "none") -) - -(define-function g_object_ref - (c-name "g_object_ref") - (return-type "gpointer") - (parameters - '("gpointer" "object") - ) -) - -(define-function g_object_unref - (c-name "g_object_unref") - (return-type "none") - (parameters - '("gpointer" "object") - ) -) - -(define-method weak_ref - (of-object "GObject") - (c-name "g_object_weak_ref") - (return-type "none") - (parameters - '("GWeakNotify" "notify") - '("gpointer" "data") - ) -) - -(define-method weak_unref - (of-object "GObject") - (c-name "g_object_weak_unref") - (return-type "none") - (parameters - '("GWeakNotify" "notify") - '("gpointer" "data") - ) -) - -(define-method add_weak_pointer - (of-object "GObject") - (c-name "g_object_add_weak_pointer") - (return-type "none") - (parameters - '("gpointer*" "weak_pointer_location") - ) -) - -(define-method remove_weak_pointer - (of-object "GObject") - (c-name "g_object_remove_weak_pointer") - (return-type "none") - (parameters - '("gpointer*" "weak_pointer_location") - ) -) - -(define-method add_toggle_ref - (of-object "GObject") - (c-name "g_object_add_toggle_ref") - (return-type "none") - (parameters - '("GToggleNotify" "notify") - '("gpointer" "data") - ) -) - -(define-method remove_toggle_ref - (of-object "GObject") - (c-name "g_object_remove_toggle_ref") - (return-type "none") - (parameters - '("GToggleNotify" "notify") - '("gpointer" "data") - ) -) - -(define-method get_qdata - (of-object "GObject") - (c-name "g_object_get_qdata") - (return-type "gpointer") - (parameters - '("GQuark" "quark") - ) -) - -(define-method set_qdata - (of-object "GObject") - (c-name "g_object_set_qdata") - (return-type "none") - (parameters - '("GQuark" "quark") - '("gpointer" "data") - ) -) - -(define-method set_qdata_full - (of-object "GObject") - (c-name "g_object_set_qdata_full") - (return-type "none") - (parameters - '("GQuark" "quark") - '("gpointer" "data") - '("GDestroyNotify" "destroy") - ) -) - -(define-method steal_qdata - (of-object "GObject") - (c-name "g_object_steal_qdata") - (return-type "gpointer") - (parameters - '("GQuark" "quark") - ) -) - -(define-method get_data - (of-object "GObject") - (c-name "g_object_get_data") - (return-type "gpointer") - (parameters - '("const-gchar*" "key") - ) -) - -(define-method set_data - (of-object "GObject") - (c-name "g_object_set_data") - (return-type "none") - (parameters - '("const-gchar*" "key") - '("gpointer" "data") - ) -) - -(define-method set_data_full - (of-object "GObject") - (c-name "g_object_set_data_full") - (return-type "none") - (parameters - '("const-gchar*" "key") - '("gpointer" "data") - '("GDestroyNotify" "destroy") - ) -) - -(define-method steal_data - (of-object "GObject") - (c-name "g_object_steal_data") - (return-type "gpointer") - (parameters - '("const-gchar*" "key") - ) -) - -(define-method watch_closure - (of-object "GObject") - (c-name "g_object_watch_closure") - (return-type "none") - (parameters - '("GClosure*" "closure") - ) -) - -(define-function g_cclosure_new_object - (c-name "g_cclosure_new_object") - (return-type "GClosure*") - (parameters - '("GCallback" "callback_func") - '("GObject*" "object") - ) -) - -(define-function g_cclosure_new_object_swap - (c-name "g_cclosure_new_object_swap") - (return-type "GClosure*") - (parameters - '("GCallback" "callback_func") - '("GObject*" "object") - ) -) - -(define-function g_closure_new_object - (c-name "g_closure_new_object") - (return-type "GClosure*") - (parameters - '("guint" "sizeof_closure") - '("GObject*" "object") - ) -) - -(define-method set_object - (of-object "GValue") - (c-name "g_value_set_object") - (return-type "none") - (parameters - '("gpointer" "v_object") - ) -) - -(define-method get_object - (of-object "GValue") - (c-name "g_value_get_object") - (return-type "gpointer") -) - -(define-method dup_object - (of-object "GValue") - (c-name "g_value_dup_object") - (return-type "GObject*") -) - -(define-function g_signal_connect_object - (c-name "g_signal_connect_object") - (return-type "gulong") - (parameters - '("gpointer" "instance") - '("const-gchar*" "detailed_signal") - '("GCallback" "c_handler") - '("gpointer" "gobject") - '("GConnectFlags" "connect_flags") - ) -) - -(define-method run_dispose - (of-object "GObject") - (c-name "g_object_run_dispose") - (return-type "none") -) - -(define-method take_object - (of-object "GValue") - (c-name "g_value_take_object") - (return-type "none") - (parameters - '("gpointer" "v_object") - ) -) - -(define-method set_object_take_ownership - (of-object "GValue") - (c-name "g_value_set_object_take_ownership") - (return-type "none") - (parameters - '("gpointer" "v_object") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gparam.h - -(define-method ref - (of-object "GParamSpec") - (c-name "g_param_spec_ref") - (return-type "GParamSpec*") -) - -(define-method unref - (of-object "GParamSpec") - (c-name "g_param_spec_unref") - (return-type "none") -) - -(define-method sink - (of-object "GParamSpec") - (c-name "g_param_spec_sink") - (return-type "none") -) - -(define-method get_qdata - (of-object "GParamSpec") - (c-name "g_param_spec_get_qdata") - (return-type "gpointer") - (parameters - '("GQuark" "quark") - ) -) - -(define-method set_qdata - (of-object "GParamSpec") - (c-name "g_param_spec_set_qdata") - (return-type "none") - (parameters - '("GQuark" "quark") - '("gpointer" "data") - ) -) - -(define-method set_qdata_full - (of-object "GParamSpec") - (c-name "g_param_spec_set_qdata_full") - (return-type "none") - (parameters - '("GQuark" "quark") - '("gpointer" "data") - '("GDestroyNotify" "destroy") - ) -) - -(define-method steal_qdata - (of-object "GParamSpec") - (c-name "g_param_spec_steal_qdata") - (return-type "gpointer") - (parameters - '("GQuark" "quark") - ) -) - -(define-method get_redirect_target - (of-object "GParamSpec") - (c-name "g_param_spec_get_redirect_target") - (return-type "GParamSpec*") -) - -(define-function g_param_value_set_default - (c-name "g_param_value_set_default") - (return-type "none") - (parameters - '("GParamSpec*" "pspec") - '("GValue*" "value") - ) -) - -(define-function g_param_value_defaults - (c-name "g_param_value_defaults") - (return-type "gboolean") - (parameters - '("GParamSpec*" "pspec") - '("GValue*" "value") - ) -) - -(define-function g_param_value_validate - (c-name "g_param_value_validate") - (return-type "gboolean") - (parameters - '("GParamSpec*" "pspec") - '("GValue*" "value") - ) -) - -(define-function g_param_value_convert - (c-name "g_param_value_convert") - (return-type "gboolean") - (parameters - '("GParamSpec*" "pspec") - '("const-GValue*" "src_value") - '("GValue*" "dest_value") - '("gboolean" "strict_validation") - ) -) - -(define-function g_param_values_cmp - (c-name "g_param_values_cmp") - (return-type "gint") - (parameters - '("GParamSpec*" "pspec") - '("const-GValue*" "value1") - '("const-GValue*" "value2") - ) -) - -(define-method get_name - (of-object "GParamSpec") - (c-name "g_param_spec_get_name") - (return-type "const-gchar*") -) - -(define-method get_nick - (of-object "GParamSpec") - (c-name "g_param_spec_get_nick") - (return-type "const-gchar*") -) - -(define-method get_blurb - (of-object "GParamSpec") - (c-name "g_param_spec_get_blurb") - (return-type "const-gchar*") -) - -(define-method set_param - (of-object "GValue") - (c-name "g_value_set_param") - (return-type "none") - (parameters - '("GParamSpec*" "param") - ) -) - -(define-method get_param - (of-object "GValue") - (c-name "g_value_get_param") - (return-type "GParamSpec*") -) - -(define-method dup_param - (of-object "GValue") - (c-name "g_value_dup_param") - (return-type "GParamSpec*") -) - -(define-method take_param - (of-object "GValue") - (c-name "g_value_take_param") - (return-type "none") - (parameters - '("GParamSpec*" "param") - ) -) - -(define-method set_param_take_ownership - (of-object "GValue") - (c-name "g_value_set_param_take_ownership") - (return-type "none") - (parameters - '("GParamSpec*" "param") - ) -) - -(define-function g_param_type_register_static - (c-name "g_param_type_register_static") - (return-type "GType") - (parameters - '("const-gchar*" "name") - '("const-GParamSpecTypeInfo*" "pspec_info") - ) -) - -(define-function g_param_spec_internal - (c-name "g_param_spec_internal") - (return-type "gpointer") - (parameters - '("GType" "param_type") - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_pool_new - (c-name "g_param_spec_pool_new") - (is-constructor-of "GParamSpecPool") - (return-type "GParamSpecPool*") - (parameters - '("gboolean" "type_prefixing") - ) -) - -(define-method insert - (of-object "GParamSpecPool") - (c-name "g_param_spec_pool_insert") - (return-type "none") - (parameters - '("GParamSpec*" "pspec") - '("GType" "owner_type") - ) -) - -(define-method remove - (of-object "GParamSpecPool") - (c-name "g_param_spec_pool_remove") - (return-type "none") - (parameters - '("GParamSpec*" "pspec") - ) -) - -(define-method lookup - (of-object "GParamSpecPool") - (c-name "g_param_spec_pool_lookup") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "param_name") - '("GType" "owner_type") - '("gboolean" "walk_ancestors") - ) -) - -(define-method list_owned - (of-object "GParamSpecPool") - (c-name "g_param_spec_pool_list_owned") - (return-type "GList*") - (parameters - '("GType" "owner_type") - ) -) - -(define-method list - (of-object "GParamSpecPool") - (c-name "g_param_spec_pool_list") - (return-type "GParamSpec**") - (parameters - '("GType" "owner_type") - '("guint*" "n_pspecs_p") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gparamspecs.h - -(define-function g_param_spec_char - (c-name "g_param_spec_char") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gint8" "minimum") - '("gint8" "maximum") - '("gint8" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_uchar - (c-name "g_param_spec_uchar") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("guint8" "minimum") - '("guint8" "maximum") - '("guint8" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_boolean - (c-name "g_param_spec_boolean") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gboolean" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_int - (c-name "g_param_spec_int") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gint" "minimum") - '("gint" "maximum") - '("gint" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_uint - (c-name "g_param_spec_uint") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("guint" "minimum") - '("guint" "maximum") - '("guint" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_long - (c-name "g_param_spec_long") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("glong" "minimum") - '("glong" "maximum") - '("glong" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_ulong - (c-name "g_param_spec_ulong") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gulong" "minimum") - '("gulong" "maximum") - '("gulong" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_int64 - (c-name "g_param_spec_int64") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gint64" "minimum") - '("gint64" "maximum") - '("gint64" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_uint64 - (c-name "g_param_spec_uint64") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("guint64" "minimum") - '("guint64" "maximum") - '("guint64" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_unichar - (c-name "g_param_spec_unichar") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gunichar" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_enum - (c-name "g_param_spec_enum") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GType" "enum_type") - '("gint" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_flags - (c-name "g_param_spec_flags") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GType" "flags_type") - '("guint" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_float - (c-name "g_param_spec_float") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gfloat" "minimum") - '("gfloat" "maximum") - '("gfloat" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_double - (c-name "g_param_spec_double") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("gdouble" "minimum") - '("gdouble" "maximum") - '("gdouble" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_string - (c-name "g_param_spec_string") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("const-gchar*" "default_value") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_param - (c-name "g_param_spec_param") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GType" "param_type") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_boxed - (c-name "g_param_spec_boxed") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GType" "boxed_type") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_pointer - (c-name "g_param_spec_pointer") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_value_array - (c-name "g_param_spec_value_array") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GParamSpec*" "element_spec") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_object - (c-name "g_param_spec_object") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("const-gchar*" "nick") - '("const-gchar*" "blurb") - '("GType" "object_type") - '("GParamFlags" "flags") - ) -) - -(define-function g_param_spec_override - (c-name "g_param_spec_override") - (return-type "GParamSpec*") - (parameters - '("const-gchar*" "name") - '("GParamSpec*" "overridden") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gsignal.h - -(define-function g_signal_newv - (c-name "g_signal_newv") - (return-type "guint") - (parameters - '("const-gchar*" "signal_name") - '("GType" "itype") - '("GSignalFlags" "signal_flags") - '("GClosure*" "class_closure") - '("GSignalAccumulator" "accumulator") - '("gpointer" "accu_data") - '("GSignalCMarshaller" "c_marshaller") - '("GType" "return_type") - '("guint" "n_params") - '("GType*" "param_types") - ) -) - -(define-function g_signal_new_valist - (c-name "g_signal_new_valist") - (return-type "guint") - (parameters - '("const-gchar*" "signal_name") - '("GType" "itype") - '("GSignalFlags" "signal_flags") - '("GClosure*" "class_closure") - '("GSignalAccumulator" "accumulator") - '("gpointer" "accu_data") - '("GSignalCMarshaller" "c_marshaller") - '("GType" "return_type") - '("guint" "n_params") - '("va_list" "args") - ) -) - -(define-function g_signal_new - (c-name "g_signal_new") - (return-type "guint") - (parameters - '("const-gchar*" "signal_name") - '("GType" "itype") - '("GSignalFlags" "signal_flags") - '("guint" "class_offset") - '("GSignalAccumulator" "accumulator") - '("gpointer" "accu_data") - '("GSignalCMarshaller" "c_marshaller") - '("GType" "return_type") - '("guint" "n_params") - ) - (varargs #t) -) - -(define-function g_signal_emitv - (c-name "g_signal_emitv") - (return-type "none") - (parameters - '("const-GValue*" "instance_and_params") - '("guint" "signal_id") - '("GQuark" "detail") - '("GValue*" "return_value") - ) -) - -(define-function g_signal_emit_valist - (c-name "g_signal_emit_valist") - (return-type "none") - (parameters - '("gpointer" "instance") - '("guint" "signal_id") - '("GQuark" "detail") - '("va_list" "var_args") - ) -) - -(define-function g_signal_emit - (c-name "g_signal_emit") - (return-type "none") - (parameters - '("gpointer" "instance") - '("guint" "signal_id") - '("GQuark" "detail") - ) - (varargs #t) -) - -(define-function g_signal_emit_by_name - (c-name "g_signal_emit_by_name") - (return-type "none") - (parameters - '("gpointer" "instance") - '("const-gchar*" "detailed_signal") - ) - (varargs #t) -) - -(define-function g_signal_lookup - (c-name "g_signal_lookup") - (return-type "guint") - (parameters - '("const-gchar*" "name") - '("GType" "itype") - ) -) - -(define-function g_signal_name - (c-name "g_signal_name") - (return-type "const-gchar*") - (parameters - '("guint" "signal_id") - ) -) - -(define-function g_signal_query - (c-name "g_signal_query") - (return-type "none") - (parameters - '("guint" "signal_id") - '("GSignalQuery*" "query") - ) -) - -(define-function g_signal_list_ids - (c-name "g_signal_list_ids") - (return-type "guint*") - (parameters - '("GType" "itype") - '("guint*" "n_ids") - ) -) - -(define-function g_signal_parse_name - (c-name "g_signal_parse_name") - (return-type "gboolean") - (parameters - '("const-gchar*" "detailed_signal") - '("GType" "itype") - '("guint*" "signal_id_p") - '("GQuark*" "detail_p") - '("gboolean" "force_detail_quark") - ) -) - -(define-function g_signal_get_invocation_hint - (c-name "g_signal_get_invocation_hint") - (return-type "GSignalInvocationHint*") - (parameters - '("gpointer" "instance") - ) -) - -(define-function g_signal_stop_emission - (c-name "g_signal_stop_emission") - (return-type "none") - (parameters - '("gpointer" "instance") - '("guint" "signal_id") - '("GQuark" "detail") - ) -) - -(define-function g_signal_stop_emission_by_name - (c-name "g_signal_stop_emission_by_name") - (return-type "none") - (parameters - '("gpointer" "instance") - '("const-gchar*" "detailed_signal") - ) -) - -(define-function g_signal_add_emission_hook - (c-name "g_signal_add_emission_hook") - (return-type "gulong") - (parameters - '("guint" "signal_id") - '("GQuark" "detail") - '("GSignalEmissionHook" "hook_func") - '("gpointer" "hook_data") - '("GDestroyNotify" "data_destroy") - ) -) - -(define-function g_signal_remove_emission_hook - (c-name "g_signal_remove_emission_hook") - (return-type "none") - (parameters - '("guint" "signal_id") - '("gulong" "hook_id") - ) -) - -(define-function g_signal_has_handler_pending - (c-name "g_signal_has_handler_pending") - (return-type "gboolean") - (parameters - '("gpointer" "instance") - '("guint" "signal_id") - '("GQuark" "detail") - '("gboolean" "may_be_blocked") - ) -) - -(define-function g_signal_connect_closure_by_id - (c-name "g_signal_connect_closure_by_id") - (return-type "gulong") - (parameters - '("gpointer" "instance") - '("guint" "signal_id") - '("GQuark" "detail") - '("GClosure*" "closure") - '("gboolean" "after") - ) -) - -(define-function g_signal_connect_closure - (c-name "g_signal_connect_closure") - (return-type "gulong") - (parameters - '("gpointer" "instance") - '("const-gchar*" "detailed_signal") - '("GClosure*" "closure") - '("gboolean" "after") - ) -) - -(define-function g_signal_connect_data - (c-name "g_signal_connect_data") - (return-type "gulong") - (parameters - '("gpointer" "instance") - '("const-gchar*" "detailed_signal") - '("GCallback" "c_handler") - '("gpointer" "data") - '("GClosureNotify" "destroy_data") - '("GConnectFlags" "connect_flags") - ) -) - -(define-function g_signal_handler_block - (c-name "g_signal_handler_block") - (return-type "none") - (parameters - '("gpointer" "instance") - '("gulong" "handler_id") - ) -) - -(define-function g_signal_handler_unblock - (c-name "g_signal_handler_unblock") - (return-type "none") - (parameters - '("gpointer" "instance") - '("gulong" "handler_id") - ) -) - -(define-function g_signal_handler_disconnect - (c-name "g_signal_handler_disconnect") - (return-type "none") - (parameters - '("gpointer" "instance") - '("gulong" "handler_id") - ) -) - -(define-function g_signal_handler_is_connected - (c-name "g_signal_handler_is_connected") - (return-type "gboolean") - (parameters - '("gpointer" "instance") - '("gulong" "handler_id") - ) -) - -(define-function g_signal_handler_find - (c-name "g_signal_handler_find") - (return-type "gulong") - (parameters - '("gpointer" "instance") - '("GSignalMatchType" "mask") - '("guint" "signal_id") - '("GQuark" "detail") - '("GClosure*" "closure") - '("gpointer" "func") - '("gpointer" "data") - ) -) - -(define-function g_signal_handlers_block_matched - (c-name "g_signal_handlers_block_matched") - (return-type "guint") - (parameters - '("gpointer" "instance") - '("GSignalMatchType" "mask") - '("guint" "signal_id") - '("GQuark" "detail") - '("GClosure*" "closure") - '("gpointer" "func") - '("gpointer" "data") - ) -) - -(define-function g_signal_handlers_unblock_matched - (c-name "g_signal_handlers_unblock_matched") - (return-type "guint") - (parameters - '("gpointer" "instance") - '("GSignalMatchType" "mask") - '("guint" "signal_id") - '("GQuark" "detail") - '("GClosure*" "closure") - '("gpointer" "func") - '("gpointer" "data") - ) -) - -(define-function g_signal_handlers_disconnect_matched - (c-name "g_signal_handlers_disconnect_matched") - (return-type "guint") - (parameters - '("gpointer" "instance") - '("GSignalMatchType" "mask") - '("guint" "signal_id") - '("GQuark" "detail") - '("GClosure*" "closure") - '("gpointer" "func") - '("gpointer" "data") - ) -) - -(define-function g_signal_override_class_closure - (c-name "g_signal_override_class_closure") - (return-type "none") - (parameters - '("guint" "signal_id") - '("GType" "instance_type") - '("GClosure*" "class_closure") - ) -) - -(define-function g_signal_chain_from_overridden - (c-name "g_signal_chain_from_overridden") - (return-type "none") - (parameters - '("const-GValue*" "instance_and_params") - '("GValue*" "return_value") - ) -) - -(define-function g_signal_accumulator_true_handled - (c-name "g_signal_accumulator_true_handled") - (return-type "gboolean") - (parameters - '("GSignalInvocationHint*" "ihint") - '("GValue*" "return_accu") - '("const-GValue*" "handler_return") - '("gpointer" "dummy") - ) -) - -(define-function g_signal_handlers_destroy - (c-name "g_signal_handlers_destroy") - (return-type "none") - (parameters - '("gpointer" "instance") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gsourceclosure.h - -(define-method set_closure - (of-object "GSource") - (c-name "g_source_set_closure") - (return-type "none") - (parameters - '("GClosure*" "closure") - ) -) - -(define-function g_io_channel_get_type - (c-name "g_io_channel_get_type") - (return-type "GType") -) - -(define-function g_io_condition_get_type - (c-name "g_io_condition_get_type") - (return-type "GType") -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gtype.h - -(define-function g_type_init - (c-name "g_type_init") - (return-type "none") -) - -(define-function g_type_init_with_debug_flags - (c-name "g_type_init_with_debug_flags") - (return-type "none") - (parameters - '("GTypeDebugFlags" "debug_flags") - ) -) - -(define-method name - (of-object "GType") - (c-name "g_type_name") - (return-type "const-gchar*") -) - -(define-method qname - (of-object "GType") - (c-name "g_type_qname") - (return-type "GQuark") -) - -(define-function g_type_from_name - (c-name "g_type_from_name") - (return-type "GType") - (parameters - '("const-gchar*" "name") - ) -) - -(define-method parent - (of-object "GType") - (c-name "g_type_parent") - (return-type "GType") -) - -(define-method depth - (of-object "GType") - (c-name "g_type_depth") - (return-type "guint") -) - -(define-method next_base - (of-object "GType") - (c-name "g_type_next_base") - (return-type "GType") - (parameters - '("GType" "root_type") - ) -) - -(define-method is_a - (of-object "GType") - (c-name "g_type_is_a") - (return-type "gboolean") - (parameters - '("GType" "is_a_type") - ) -) - -(define-method class_ref - (of-object "GType") - (c-name "g_type_class_ref") - (return-type "gpointer") -) - -(define-method class_peek - (of-object "GType") - (c-name "g_type_class_peek") - (return-type "gpointer") -) - -(define-method class_peek_static - (of-object "GType") - (c-name "g_type_class_peek_static") - (return-type "gpointer") -) - -(define-function g_type_class_unref - (c-name "g_type_class_unref") - (return-type "none") - (parameters - '("gpointer" "g_class") - ) -) - -(define-function g_type_class_peek_parent - (c-name "g_type_class_peek_parent") - (return-type "gpointer") - (parameters - '("gpointer" "g_class") - ) -) - -(define-function g_type_interface_peek - (c-name "g_type_interface_peek") - (return-type "gpointer") - (parameters - '("gpointer" "instance_class") - '("GType" "iface_type") - ) -) - -(define-function g_type_interface_peek_parent - (c-name "g_type_interface_peek_parent") - (return-type "gpointer") - (parameters - '("gpointer" "g_iface") - ) -) - -(define-method default_interface_ref - (of-object "GType") - (c-name "g_type_default_interface_ref") - (return-type "gpointer") -) - -(define-method default_interface_peek - (of-object "GType") - (c-name "g_type_default_interface_peek") - (return-type "gpointer") -) - -(define-function g_type_default_interface_unref - (c-name "g_type_default_interface_unref") - (return-type "none") - (parameters - '("gpointer" "g_iface") - ) -) - -(define-method children - (of-object "GType") - (c-name "g_type_children") - (return-type "GType*") - (parameters - '("guint*" "n_children") - ) -) - -(define-method interfaces - (of-object "GType") - (c-name "g_type_interfaces") - (return-type "GType*") - (parameters - '("guint*" "n_interfaces") - ) -) - -(define-method set_qdata - (of-object "GType") - (c-name "g_type_set_qdata") - (return-type "none") - (parameters - '("GQuark" "quark") - '("gpointer" "data") - ) -) - -(define-method get_qdata - (of-object "GType") - (c-name "g_type_get_qdata") - (return-type "gpointer") - (parameters - '("GQuark" "quark") - ) -) - -(define-method query - (of-object "GType") - (c-name "g_type_query") - (return-type "none") - (parameters - '("GTypeQuery*" "query") - ) -) - -(define-method register_static - (of-object "GType") - (c-name "g_type_register_static") - (return-type "GType") - (parameters - '("const-gchar*" "type_name") - '("const-GTypeInfo*" "info") - '("GTypeFlags" "flags") - ) -) - -(define-method register_dynamic - (of-object "GType") - (c-name "g_type_register_dynamic") - (return-type "GType") - (parameters - '("const-gchar*" "type_name") - '("GTypePlugin*" "plugin") - '("GTypeFlags" "flags") - ) -) - -(define-method register_fundamental - (of-object "GType") - (c-name "g_type_register_fundamental") - (return-type "GType") - (parameters - '("const-gchar*" "type_name") - '("const-GTypeInfo*" "info") - '("const-GTypeFundamentalInfo*" "finfo") - '("GTypeFlags" "flags") - ) -) - -(define-method add_interface_static - (of-object "GType") - (c-name "g_type_add_interface_static") - (return-type "none") - (parameters - '("GType" "interface_type") - '("const-GInterfaceInfo*" "info") - ) -) - -(define-method add_interface_dynamic - (of-object "GType") - (c-name "g_type_add_interface_dynamic") - (return-type "none") - (parameters - '("GType" "interface_type") - '("GTypePlugin*" "plugin") - ) -) - -(define-method interface_add_prerequisite - (of-object "GType") - (c-name "g_type_interface_add_prerequisite") - (return-type "none") - (parameters - '("GType" "prerequisite_type") - ) -) - -(define-method interface_prerequisites - (of-object "GType") - (c-name "g_type_interface_prerequisites") - (return-type "GType*") - (parameters - '("guint*" "n_prerequisites") - ) -) - -(define-function g_type_class_add_private - (c-name "g_type_class_add_private") - (return-type "none") - (parameters - '("gpointer" "g_class") - '("gsize" "private_size") - ) -) - -(define-method get_private - (of-object "GTypeInstance") - (c-name "g_type_instance_get_private") - (return-type "gpointer") - (parameters - '("GType" "private_type") - ) -) - -(define-method get_plugin - (of-object "GType") - (c-name "g_type_get_plugin") - (return-type "GTypePlugin*") -) - -(define-method interface_get_plugin - (of-object "GType") - (c-name "g_type_interface_get_plugin") - (return-type "GTypePlugin*") - (parameters - '("GType" "interface_type") - ) -) - -(define-function g_type_fundamental_next - (c-name "g_type_fundamental_next") - (return-type "GType") -) - -(define-method fundamental - (of-object "GType") - (c-name "g_type_fundamental") - (return-type "GType") -) - -(define-method create_instance - (of-object "GType") - (c-name "g_type_create_instance") - (return-type "GTypeInstance*") -) - -(define-function g_type_free_instance - (c-name "g_type_free_instance") - (return-type "none") - (parameters - '("GTypeInstance*" "instance") - ) -) - -(define-function g_type_add_class_cache_func - (c-name "g_type_add_class_cache_func") - (return-type "none") - (parameters - '("gpointer" "cache_data") - '("GTypeClassCacheFunc" "cache_func") - ) -) - -(define-function g_type_remove_class_cache_func - (c-name "g_type_remove_class_cache_func") - (return-type "none") - (parameters - '("gpointer" "cache_data") - '("GTypeClassCacheFunc" "cache_func") - ) -) - -(define-function g_type_class_unref_uncached - (c-name "g_type_class_unref_uncached") - (return-type "none") - (parameters - '("gpointer" "g_class") - ) -) - -(define-function g_type_add_interface_check - (c-name "g_type_add_interface_check") - (return-type "none") - (parameters - '("gpointer" "check_data") - '("GTypeInterfaceCheckFunc" "check_func") - ) -) - -(define-function g_type_remove_interface_check - (c-name "g_type_remove_interface_check") - (return-type "none") - (parameters - '("gpointer" "check_data") - '("GTypeInterfaceCheckFunc" "check_func") - ) -) - -(define-method value_table_peek - (of-object "GType") - (c-name "g_type_value_table_peek") - (return-type "GTypeValueTable*") -) - -(define-function g_type_check_instance - (c-name "g_type_check_instance") - (return-type "gboolean") - (parameters - '("GTypeInstance*" "instance") - ) -) - -(define-function g_type_check_instance_cast - (c-name "g_type_check_instance_cast") - (return-type "GTypeInstance*") - (parameters - '("GTypeInstance*" "instance") - '("GType" "iface_type") - ) -) - -(define-function g_type_check_instance_is_a - (c-name "g_type_check_instance_is_a") - (return-type "gboolean") - (parameters - '("GTypeInstance*" "instance") - '("GType" "iface_type") - ) -) - -(define-function g_type_check_class_cast - (c-name "g_type_check_class_cast") - (return-type "GTypeClass*") - (parameters - '("GTypeClass*" "g_class") - '("GType" "is_a_type") - ) -) - -(define-function g_type_check_class_is_a - (c-name "g_type_check_class_is_a") - (return-type "gboolean") - (parameters - '("GTypeClass*" "g_class") - '("GType" "is_a_type") - ) -) - -(define-method check_is_value_type - (of-object "GType") - (c-name "g_type_check_is_value_type") - (return-type "gboolean") -) - -(define-function g_type_check_value - (c-name "g_type_check_value") - (return-type "gboolean") - (parameters - '("GValue*" "value") - ) -) - -(define-function g_type_check_value_holds - (c-name "g_type_check_value_holds") - (return-type "gboolean") - (parameters - '("GValue*" "value") - '("GType" "type") - ) -) - -(define-method test_flags - (of-object "GType") - (c-name "g_type_test_flags") - (return-type "gboolean") - (parameters - '("guint" "flags") - ) -) - -(define-function g_type_name_from_instance - (c-name "g_type_name_from_instance") - (return-type "const-gchar*") - (parameters - '("GTypeInstance*" "instance") - ) -) - -(define-function g_type_name_from_class - (c-name "g_type_name_from_class") - (return-type "const-gchar*") - (parameters - '("GTypeClass*" "g_class") - ) -) - -(define-function g_value_c_init - (c-name "g_value_c_init") - (return-type "none") -) - -(define-function g_value_types_init - (c-name "g_value_types_init") - (return-type "none") -) - -(define-function g_enum_types_init - (c-name "g_enum_types_init") - (return-type "none") -) - -(define-function g_param_type_init - (c-name "g_param_type_init") - (return-type "none") -) - -(define-function g_boxed_type_init - (c-name "g_boxed_type_init") - (return-type "none") -) - -(define-function g_object_type_init - (c-name "g_object_type_init") - (return-type "none") -) - -(define-function g_param_spec_types_init - (c-name "g_param_spec_types_init") - (return-type "none") -) - -(define-function g_value_transforms_init - (c-name "g_value_transforms_init") - (return-type "none") -) - -(define-function g_signal_init - (c-name "g_signal_init") - (return-type "none") -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gtypemodule.h - -(define-function g_type_module_get_type - (c-name "g_type_module_get_type") - (return-type "GType") -) - -(define-method use - (of-object "GTypeModule") - (c-name "g_type_module_use") - (return-type "gboolean") -) - -(define-method unuse - (of-object "GTypeModule") - (c-name "g_type_module_unuse") - (return-type "none") -) - -(define-method set_name - (of-object "GTypeModule") - (c-name "g_type_module_set_name") - (return-type "none") - (parameters - '("const-gchar*" "name") - ) -) - -(define-method register_type - (of-object "GTypeModule") - (c-name "g_type_module_register_type") - (return-type "GType") - (parameters - '("GType" "parent_type") - '("const-gchar*" "type_name") - '("const-GTypeInfo*" "type_info") - '("GTypeFlags" "flags") - ) -) - -(define-method add_interface - (of-object "GTypeModule") - (c-name "g_type_module_add_interface") - (return-type "none") - (parameters - '("GType" "instance_type") - '("GType" "interface_type") - '("const-GInterfaceInfo*" "interface_info") - ) -) - -(define-method register_enum - (of-object "GTypeModule") - (c-name "g_type_module_register_enum") - (return-type "GType") - (parameters - '("const-gchar*" "name") - '("const-GEnumValue*" "const_static_values") - ) -) - -(define-method register_flags - (of-object "GTypeModule") - (c-name "g_type_module_register_flags") - (return-type "GType") - (parameters - '("const-gchar*" "name") - '("const-GFlagsValue*" "const_static_values") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gtypeplugin.h - -(define-function g_type_plugin_get_type - (c-name "g_type_plugin_get_type") - (return-type "GType") -) - -(define-method use - (of-object "GTypePlugin") - (c-name "g_type_plugin_use") - (return-type "none") -) - -(define-method unuse - (of-object "GTypePlugin") - (c-name "g_type_plugin_unuse") - (return-type "none") -) - -(define-method complete_type_info - (of-object "GTypePlugin") - (c-name "g_type_plugin_complete_type_info") - (return-type "none") - (parameters - '("GType" "g_type") - '("GTypeInfo*" "info") - '("GTypeValueTable*" "value_table") - ) -) - -(define-method complete_interface_info - (of-object "GTypePlugin") - (c-name "g_type_plugin_complete_interface_info") - (return-type "none") - (parameters - '("GType" "instance_type") - '("GType" "interface_type") - '("GInterfaceInfo*" "info") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gvaluearray.h - -(define-method get_nth - (of-object "GValueArray") - (c-name "g_value_array_get_nth") - (return-type "GValue*") - (parameters - '("guint" "index_") - ) -) - -(define-function g_value_array_new - (c-name "g_value_array_new") - (is-constructor-of "GValueArray") - (return-type "GValueArray*") - (parameters - '("guint" "n_prealloced") - ) -) - -(define-method free - (of-object "GValueArray") - (c-name "g_value_array_free") - (return-type "none") -) - -(define-method copy - (of-object "GValueArray") - (c-name "g_value_array_copy") - (return-type "GValueArray*") -) - -(define-method prepend - (of-object "GValueArray") - (c-name "g_value_array_prepend") - (return-type "GValueArray*") - (parameters - '("const-GValue*" "value") - ) -) - -(define-method append - (of-object "GValueArray") - (c-name "g_value_array_append") - (return-type "GValueArray*") - (parameters - '("const-GValue*" "value") - ) -) - -(define-method insert - (of-object "GValueArray") - (c-name "g_value_array_insert") - (return-type "GValueArray*") - (parameters - '("guint" "index_") - '("const-GValue*" "value") - ) -) - -(define-method remove - (of-object "GValueArray") - (c-name "g_value_array_remove") - (return-type "GValueArray*") - (parameters - '("guint" "index_") - ) -) - -(define-method sort - (of-object "GValueArray") - (c-name "g_value_array_sort") - (return-type "GValueArray*") - (parameters - '("GCompareFunc" "compare_func") - ) -) - -(define-method sort_with_data - (of-object "GValueArray") - (c-name "g_value_array_sort_with_data") - (return-type "GValueArray*") - (parameters - '("GCompareDataFunc" "compare_func") - '("gpointer" "user_data") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gvaluecollector.h - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gvalue.h - -(define-method init - (of-object "GValue") - (c-name "g_value_init") - (return-type "GValue*") - (parameters - '("GType" "g_type") - ) -) - -(define-method copy - (of-object "GValue") - (c-name "g_value_copy") - (return-type "none") - (parameters - '("GValue*" "dest_value") - ) -) - -(define-method reset - (of-object "GValue") - (c-name "g_value_reset") - (return-type "GValue*") -) - -(define-method unset - (of-object "GValue") - (c-name "g_value_unset") - (return-type "none") -) - -(define-method set_instance - (of-object "GValue") - (c-name "g_value_set_instance") - (return-type "none") - (parameters - '("gpointer" "instance") - ) -) - -(define-method fits_pointer - (of-object "GValue") - (c-name "g_value_fits_pointer") - (return-type "gboolean") -) - -(define-method peek_pointer - (of-object "GValue") - (c-name "g_value_peek_pointer") - (return-type "gpointer") -) - -(define-function g_value_type_compatible - (c-name "g_value_type_compatible") - (return-type "gboolean") - (parameters - '("GType" "src_type") - '("GType" "dest_type") - ) -) - -(define-function g_value_type_transformable - (c-name "g_value_type_transformable") - (return-type "gboolean") - (parameters - '("GType" "src_type") - '("GType" "dest_type") - ) -) - -(define-method transform - (of-object "GValue") - (c-name "g_value_transform") - (return-type "gboolean") - (parameters - '("GValue*" "dest_value") - ) -) - -(define-function g_value_register_transform_func - (c-name "g_value_register_transform_func") - (return-type "none") - (parameters - '("GType" "src_type") - '("GType" "dest_type") - '("GValueTransform" "transform_func") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/gvaluetypes.h - -(define-method set_char - (of-object "GValue") - (c-name "g_value_set_char") - (return-type "none") - (parameters - '("gchar" "v_char") - ) -) - -(define-method get_char - (of-object "GValue") - (c-name "g_value_get_char") - (return-type "gchar") -) - -(define-method set_uchar - (of-object "GValue") - (c-name "g_value_set_uchar") - (return-type "none") - (parameters - '("guchar" "v_uchar") - ) -) - -(define-method get_uchar - (of-object "GValue") - (c-name "g_value_get_uchar") - (return-type "guchar") -) - -(define-method set_boolean - (of-object "GValue") - (c-name "g_value_set_boolean") - (return-type "none") - (parameters - '("gboolean" "v_boolean") - ) -) - -(define-method get_boolean - (of-object "GValue") - (c-name "g_value_get_boolean") - (return-type "gboolean") -) - -(define-method set_int - (of-object "GValue") - (c-name "g_value_set_int") - (return-type "none") - (parameters - '("gint" "v_int") - ) -) - -(define-method get_int - (of-object "GValue") - (c-name "g_value_get_int") - (return-type "gint") -) - -(define-method set_uint - (of-object "GValue") - (c-name "g_value_set_uint") - (return-type "none") - (parameters - '("guint" "v_uint") - ) -) - -(define-method get_uint - (of-object "GValue") - (c-name "g_value_get_uint") - (return-type "guint") -) - -(define-method set_long - (of-object "GValue") - (c-name "g_value_set_long") - (return-type "none") - (parameters - '("glong" "v_long") - ) -) - -(define-method get_long - (of-object "GValue") - (c-name "g_value_get_long") - (return-type "glong") -) - -(define-method set_ulong - (of-object "GValue") - (c-name "g_value_set_ulong") - (return-type "none") - (parameters - '("gulong" "v_ulong") - ) -) - -(define-method get_ulong - (of-object "GValue") - (c-name "g_value_get_ulong") - (return-type "gulong") -) - -(define-method set_int64 - (of-object "GValue") - (c-name "g_value_set_int64") - (return-type "none") - (parameters - '("gint64" "v_int64") - ) -) - -(define-method get_int64 - (of-object "GValue") - (c-name "g_value_get_int64") - (return-type "gint64") -) - -(define-method set_uint64 - (of-object "GValue") - (c-name "g_value_set_uint64") - (return-type "none") - (parameters - '("guint64" "v_uint64") - ) -) - -(define-method get_uint64 - (of-object "GValue") - (c-name "g_value_get_uint64") - (return-type "guint64") -) - -(define-method set_float - (of-object "GValue") - (c-name "g_value_set_float") - (return-type "none") - (parameters - '("gfloat" "v_float") - ) -) - -(define-method get_float - (of-object "GValue") - (c-name "g_value_get_float") - (return-type "gfloat") -) - -(define-method set_double - (of-object "GValue") - (c-name "g_value_set_double") - (return-type "none") - (parameters - '("gdouble" "v_double") - ) -) - -(define-method get_double - (of-object "GValue") - (c-name "g_value_get_double") - (return-type "gdouble") -) - -(define-method set_string - (of-object "GValue") - (c-name "g_value_set_string") - (return-type "none") - (parameters - '("const-gchar*" "v_string") - ) -) - -(define-method set_static_string - (of-object "GValue") - (c-name "g_value_set_static_string") - (return-type "none") - (parameters - '("const-gchar*" "v_string") - ) -) - -(define-method get_string - (of-object "GValue") - (c-name "g_value_get_string") - (return-type "const-gchar*") -) - -(define-method dup_string - (of-object "GValue") - (c-name "g_value_dup_string") - (return-type "gchar*") -) - -(define-method set_pointer - (of-object "GValue") - (c-name "g_value_set_pointer") - (return-type "none") - (parameters - '("gpointer" "v_pointer") - ) -) - -(define-method get_pointer - (of-object "GValue") - (c-name "g_value_get_pointer") - (return-type "gpointer") -) - -(define-function g_pointer_type_register_static - (c-name "g_pointer_type_register_static") - (return-type "GType") - (parameters - '("const-gchar*" "name") - ) -) - -(define-function g_strdup_value_contents - (c-name "g_strdup_value_contents") - (return-type "gchar*") - (parameters - '("const-GValue*" "value") - ) -) - -(define-method take_string - (of-object "GValue") - (c-name "g_value_take_string") - (return-type "none") - (parameters - '("gchar*" "v_string") - ) -) - -(define-method set_string_take_ownership - (of-object "GValue") - (c-name "g_value_set_string_take_ownership") - (return-type "none") - (parameters - '("gchar*" "v_string") - ) -) - - - -;; From /home/murrayc/cvs/gnome212/glib/gobject/stamp-gmarshal.h - - - -;; From /home/murrayc/cvs/gnome212/glib/gmodule/gmoduleconf.h - - - -;; From /home/murrayc/cvs/gnome212/glib/gmodule/gmodule.h - -(define-function g_module_supported - (c-name "g_module_supported") - (return-type "gboolean") -) - -(define-function g_module_open - (c-name "g_module_open") - (return-type "GModule*") - (parameters - '("const-gchar*" "file_name") - '("GModuleFlags" "flags") - ) -) - -(define-method close - (of-object "GModule") - (c-name "g_module_close") - (return-type "gboolean") -) - -(define-method make_resident - (of-object "GModule") - (c-name "g_module_make_resident") - (return-type "none") -) - -(define-function g_module_error - (c-name "g_module_error") - (return-type "const-gchar*") -) - -(define-method symbol - (of-object "GModule") - (c-name "g_module_symbol") - (return-type "gboolean") - (parameters - '("const-gchar*" "symbol_name") - '("gpointer*" "symbol") - ) -) - -(define-method name - (of-object "GModule") - (c-name "g_module_name") - (return-type "const-gchar*") -) - -(define-function g_module_build_path - (c-name "g_module_build_path") - (return-type "gchar*") - (parameters - '("const-gchar*" "directory") - '("const-gchar*" "module_name") - ) -) - - diff --git a/libs/glibmm2/glib/src/iochannel.hg b/libs/glibmm2/glib/src/iochannel.hg index 38bdf3f776..049c2a390b 100644 --- a/libs/glibmm2/glib/src/iochannel.hg +++ b/libs/glibmm2/glib/src/iochannel.hg @@ -163,12 +163,12 @@ public: #endif /* defined(G_OS_WIN32) || defined(DOXYGEN_SHOULD_SKIP_THIS) */ /** Read a single UCS-4 character. - * @retval unichar The Unicode character. + * @retval thechar The Unicode character. * @return The status of the operation. * @throw Glib::IOChannelError * @throw Glib::ConvertError */ - _WRAP_METHOD(IOStatus read(gunichar& unichar), g_io_channel_read_unichar, errthrow) + _WRAP_METHOD(IOStatus read(gunichar& thechar), g_io_channel_read_unichar, errthrow) /** Read a character sequence into memory. * @param buf A buffer to read data into. diff --git a/libs/glibmm2/glib/src/keyfile.ccg b/libs/glibmm2/glib/src/keyfile.ccg index a47c53bef6..5ff2afcd03 100644 --- a/libs/glibmm2/glib/src/keyfile.ccg +++ b/libs/glibmm2/glib/src/keyfile.ccg @@ -92,14 +92,51 @@ Glib::ustring KeyFile::get_locale_string(const Glib::ustring& group_name, const return retvalue; } +#ifdef GLIBMM_EXCEPTIONS_ENABLED int KeyFile::get_integer(const Glib::ustring& key) const +#else +int KeyFile::get_integer(const Glib::ustring& key, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED { - GError *error = 0; - int retvalue = g_key_file_get_integer(const_cast(gobj()), 0, key.c_str(), &(error)); - if(error) ::Glib::Error::throw_exception(error); + GError* gerror = 0; + int retvalue = g_key_file_get_integer(const_cast(gobj()), NULL, key.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + return retvalue; } + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +double KeyFile::get_double(const Glib::ustring& key) const +#else +double KeyFile::get_double(const Glib::ustring& key, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + double retvalue = g_key_file_get_double(const_cast(gobj()), NULL, key.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +void KeyFile::set_double(const Glib::ustring& key, double value) +{ + g_key_file_set_double(gobj(), 0, key.c_str(), value); +} + + Glib::ArrayHandle KeyFile::get_string_list(const Glib::ustring& group_name, const Glib::ustring& key) const { gchar** string_list = 0; @@ -144,6 +181,17 @@ Glib::ArrayHandle KeyFile::get_integer_list(const Glib::ustring& group_name return Glib::ArrayHandle(integer_list, length_of_list, Glib::OWNERSHIP_DEEP); } +Glib::ArrayHandle KeyFile::get_double_list(const Glib::ustring& group_name, const Glib::ustring& key) const +{ + gdouble* integer_list = 0; + gsize length_of_list = 0; + GError* error = 0; + integer_list = g_key_file_get_double_list(const_cast(gobj()), group_name.c_str(), key.c_str(), &length_of_list, &error); + if(error) + Glib::Error::throw_exception(error); + return Glib::ArrayHandle(integer_list, length_of_list, Glib::OWNERSHIP_DEEP); +} + void KeyFile::set_string_list(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ArrayHandle& list) { gsize length_of_list = list.size(); @@ -162,6 +210,12 @@ void KeyFile::set_integer_list(const Glib::ustring& group_name, const Glib::ustr g_key_file_set_integer_list(gobj(), group_name.c_str(), key.c_str(), const_cast(list.data()), length_of_list); } +void KeyFile::set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list) +{ + gsize length_of_list = list.size(); + g_key_file_set_double_list(gobj(), group_name.c_str(), key.c_str(), const_cast(list.data()), length_of_list); +} + void KeyFile::set_boolean_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list) { gsize length_of_list = list.size(); diff --git a/libs/glibmm2/glib/src/keyfile.hg b/libs/glibmm2/glib/src/keyfile.hg index 8dd1c5d78a..9fdd4918e5 100644 --- a/libs/glibmm2/glib/src/keyfile.hg +++ b/libs/glibmm2/glib/src/keyfile.hg @@ -32,10 +32,65 @@ namespace Glib _WRAP_ENUM(KeyFileFlags, GKeyFileFlags, NO_GTYPE) - /** Exception class for KeyFile errors. - */ - _WRAP_GERROR(KeyFileError, GKeyFileError, G_KEY_FILE_ERROR, NO_GTYPE) +/** Exception class for KeyFile errors. + */ +_WRAP_GERROR(KeyFileError, GKeyFileError, G_KEY_FILE_ERROR, NO_GTYPE) +/** This class lets you parse, edit or create files containing groups of key-value pairs, which we call key files + * for lack of a better name. Several freedesktop.org specifications use key files now, e.g the Desktop Entry + * Specification and the Icon Theme Specification. + * + * The syntax of key files is described in detail in the Desktop Entry Specification, here is a quick summary: Key + * files consists of groups of key-value pairs, interspersed with comments. + * + * @code + * # this is just an example + * # there can be comments before the first group + * + * [First Group] + * + * Name=Key File Example\tthis value shows\nescaping + * + * # localized strings are stored in multiple key-value pairs + * Welcome=Hello + * Welcome[de]=Hallo + * Welcome[fr]=Bonjour + * Welcome[it]=Ciao + * + * [Another Group] + * + * Numbers=2;20;-200;0 + * + * Booleans=true;false;true;true + * @endcode + * + * Lines beginning with a '#' and blank lines are considered comments. + * + * Groups are started by a header line containing the group name enclosed in '[' and ']', and ended implicitly by + * the start of the next group or the end of the file. Each key-value pair must be contained in a group. + * + * Key-value pairs generally have the form key=value, with the exception of localized strings, which have the form + * key[locale]=value. Space before and after the '=' character are ignored. Newline, tab, carriage return and + * backslash characters in value are escaped as \n, \t, \r, and \\, respectively. To preserve leading spaces in + * values, these can also be escaped as \s. + * + * Key files can store strings (possibly with localized variants), integers, booleans and lists of these. Lists are + * separated by a separator character, typically ';' or ','. To use the list separator character in a value in a + * list, it has to be escaped by prefixing it with a backslash. + * + * This syntax is obviously inspired by the .ini files commonly met on Windows, but there are some important + * differences: + * - .ini files use the ';' character to begin comments, key files use the '#' character. + * - Key files allow only comments before the first group. + * - Key files are always encoded in UTF-8. + * - Key and Group names are case-sensitive, for example a group called [GROUP] is a different group from [group]. + * + * Note that in contrast to the Desktop Entry Specification, groups in key files may contain the same key multiple + * times; the last entry wins. Key files may also contain multiple groups with the same name; they are merged + * together. Another difference is that keys and group names in key files are not restricted to ASCII characters. + * + * @newin2p14 + */ class KeyFile { _CLASS_GENERIC(KeyFile, GKeyFile) @@ -74,6 +129,16 @@ public: bool load_from_data(const Glib::ustring& data, KeyFileFlags flags = Glib::KEY_FILE_NONE); _IGNORE(g_key_file_load_from_data) + //TODO: + /* + gboolean g_key_file_load_from_dirs (GKeyFile *key_file, + const gchar *file, + const gchar **search_dirs, + gchar **full_path, + GKeyFileFlags flags, + GError **error); + */ + /** Looks for a KeyFile named @a file in the paths returned from * g_get_user_data_dir() and g_get_system_data_dirs() and loads them * into the keyfile object, placing the full path to the file in @@ -133,6 +198,29 @@ public: _WRAP_METHOD(int get_integer(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_integer, errthrow) + /** Gets the value in the first group, under @a key, interpreting it as + * a double. + * @param key The name of the key + * @return The value of @a key as an double + * @throws Glib::KeyFileError + * + * @newin2p14 + */ + double get_double(const Glib::ustring& key) const; + + _WRAP_METHOD(double get_double(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_double, errthrow) + + _WRAP_METHOD(void set_double(const Glib::ustring& group_name, const Glib::ustring& key, double value), g_key_file_set_double) + + /** Associates a new double value with @a key under the start group. + * If @a key cannot be found then it is created. + * + * @newin2p12 + * @param key A key. + * @param value An double value. + */ + void set_double(const Glib::ustring& key, double value); + /** Returns the values associated with @a key under @a group_name * @param group_name The name of a group * @param key The name of a key @@ -180,6 +268,15 @@ public: Glib::ArrayHandle get_integer_list(const Glib::ustring& group_name, const Glib::ustring& key) const; _IGNORE(g_key_file_get_integer_list) + /** Returns the values associated with @a key under @a group_name + * @param group_name The name of a group + * @param key The name of a key + * @return A list of doubles + * @throws Glib::KeyFileError + */ + Glib::ArrayHandle get_double_list(const Glib::ustring& group_name, const Glib::ustring& key) const; + _IGNORE(g_key_file_get_double_list) + /** Get comment from top of file * @return The comment */ @@ -222,7 +319,7 @@ public: _IGNORE(g_key_file_set_locale_string_list) /** Sets a list of booleans for the @a key under @a group_name. - * If either the @a key or @a group_name cannot be found they are created + * If either the @a key or @a group_name cannot be found they are created. * @param group_name The name of a group * @param key The name of a key * @param list A list holding object of type bool @@ -231,7 +328,7 @@ public: _IGNORE(g_key_file_set_boolean_list) /** Sets a list of integers for the @a key under @a group_name. - * If either the @a key or @a group_name cannot be found they are created + * If either the @a key or @a group_name cannot be found they are created. * @param group_name The name of a group * @param key The name of a key * @param list A list holding object of type int @@ -239,6 +336,18 @@ public: void set_integer_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list); _IGNORE(g_key_file_set_integer_list) + /** Sets a list of doubles for the @a key under @a group_name. + * If either the @a key or @a group_name cannot be found they are created. + * @param group_name The name of a group + * @param key The name of a key + * @param list A list holding object of type int + * + * @newin2p14 + */ + void set_double_list(const Glib::ustring& group_name, const Glib::ustring& key, Glib::ArrayHandle& list); + _IGNORE(g_key_file_set_double_list) + + /** Places @a comment at the start of the file, before the first group. * @param comment The Comment */ diff --git a/libs/glibmm2/glib/src/optioncontext.ccg b/libs/glibmm2/glib/src/optioncontext.ccg index ac7fe0f38a..494e4f39e3 100644 --- a/libs/glibmm2/glib/src/optioncontext.ccg +++ b/libs/glibmm2/glib/src/optioncontext.ccg @@ -19,11 +19,41 @@ */ #include +#include #include namespace Glib { + namespace Private + { + static const gchar* SignalProxy_translate_gtk_callback (const gchar* str, gpointer data) + { + Glib::ustring translated_str; + Glib::OptionContext::SlotTranslate* the_slot = + static_cast(data); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { +#endif //GLIBMM_EXCEPTIONS_ENABLED + translated_str = (*the_slot)(str); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } +#endif //GLIBMM_EXCEPTIONS_ENABLED + return translated_str.c_str (); + } + + static void SignalProxy_translate_gtk_callback_destroy (gpointer data) + { + delete static_cast(data); + } + + } //namespace Private OptionContext::OptionContext(const Glib::ustring& parameter_string) : gobject_( g_option_context_new(parameter_string.c_str()) ), @@ -68,7 +98,15 @@ OptionGroup OptionContext::get_main_group() const */ - +void OptionContext::set_translate_func (const SlotTranslate& slot) +{ + //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter. + //It will be deleted when SignalProxy_translate_gtk_callback_destroy() is called. + SlotTranslate* slot_copy = new SlotTranslate(slot); + + g_option_context_set_translate_func( + gobj(), &Private::SignalProxy_translate_gtk_callback, slot_copy, + &Private::SignalProxy_translate_gtk_callback_destroy); +} } // namespace Glib - diff --git a/libs/glibmm2/glib/src/optioncontext.hg b/libs/glibmm2/glib/src/optioncontext.hg index 5a217f23fa..1d71ddb4d5 100644 --- a/libs/glibmm2/glib/src/optioncontext.hg +++ b/libs/glibmm2/glib/src/optioncontext.hg @@ -22,6 +22,7 @@ _DEFS(glibmm,glib) #include #include #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS extern "C" { typedef struct _GOptionContext GOptionContext; } @@ -90,6 +91,31 @@ public: GOptionContext* gobj() { return gobject_; } const GOptionContext* gobj() const { return gobject_; } + _WRAP_METHOD(void set_summary(const Glib::ustring& summary), g_option_context_set_summary) + _WRAP_METHOD(Glib::ustring get_summary() const, g_option_context_get_summary) + _WRAP_METHOD(void set_description(const Glib::ustring& description), g_option_context_set_description) + _WRAP_METHOD(Glib::ustring get_description() const, g_option_context_get_description) + + _WRAP_METHOD(void set_translation_domain(const Glib::ustring& domain), g_option_context_set_translation_domain) + + /** + * This function is used to translate user-visible strings, for --help output. + * The function takes an untranslated string and returns a translated string + */ + typedef sigc::slot SlotTranslate; + + /** + * Sets the function which is used to translate user-visible + * strings, for --help output. Different groups can use different functions. + * + * If you are using gettext(), you only need to set the translation domain, + * see set_translation_domain(). + * + * @newin2p14 + */ + void set_translate_func (const SlotTranslate& slot); + _IGNORE(g_option_context_set_translate_func) + protected: GOptionContext* gobject_; diff --git a/libs/glibmm2/glib/src/optiongroup.ccg b/libs/glibmm2/glib/src/optiongroup.ccg index d98f2647c8..c08c79a212 100644 --- a/libs/glibmm2/glib/src/optiongroup.ccg +++ b/libs/glibmm2/glib/src/optiongroup.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: optiongroup.ccg,v 1.17 2006/01/28 12:09:22 murrayc Exp $ */ +/* $Id: optiongroup.ccg,v 1.15.4.3 2006/03/30 12:19:58 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * @@ -22,6 +22,7 @@ #include #include //#include +#include // g_malloc #include namespace Glib @@ -37,7 +38,7 @@ static gboolean g_callback_pre_parse(GOptionContext* context, GOptionGroup* /* g { OptionContext cppContext(context, false /* take_ownership */); //OptionGroup cppGroup(group, true /* take_copy */); //Maybe this should be option_group. - + OptionGroup* option_group = static_cast(data); if(option_group) return option_group->on_pre_parse(cppContext, *option_group); @@ -49,7 +50,7 @@ static gboolean g_callback_post_parse(GOptionContext* context, GOptionGroup* /* { OptionContext cppContext(context, false /* take_ownership */); //OptionGroup cppGroup(group, true /* take_copy */); //Maybe this should be option_group. - + OptionGroup* option_group = static_cast(data); if(option_group) { @@ -63,7 +64,7 @@ static void g_callback_error(GOptionContext* context, GOptionGroup* /* group */, { OptionContext cppContext(context, false /* take_ownership */); //OptionGroup cppGroup(group); //Maybe this should be option_group. - + OptionGroup* option_group = static_cast(data); if(option_group) return option_group->on_error(cppContext, *option_group); @@ -99,7 +100,7 @@ OptionGroup::~OptionGroup() CppOptionEntry& cpp_entry = iter->second; cpp_entry.release_c_arg(); } - + if(has_ownership_) { g_option_group_free(gobj()); @@ -110,15 +111,15 @@ OptionGroup::~OptionGroup() void OptionGroup::add_entry(const OptionEntry& entry) { //It does not copy the entry, so it needs to live as long as the group. - + //g_option_group_add_entries takes an array, with the last item in the array having a null long_name. //Hopefully this will be properly documented eventually - see bug # - + //Create a temporary array, just so we can give the correct thing to g_option_group_add_entries: GOptionEntry array[2]; array[0] = *(entry.gobj()); //Copy contents. GLIBMM_INITIALIZE_STRUCT(array[1], GOptionEntry); - + g_option_group_add_entries(gobj(), array); } @@ -157,10 +158,11 @@ void OptionGroup::add_entry_with_wrapper(const OptionEntry& entry, GOptionArg ar const Glib::ustring name = entry.get_long_name(); type_map_entries::iterator iterFind = map_entries_.find(name); if( iterFind == map_entries_.end() ) //If we have not added this entry already - { + { CppOptionEntry cppEntry; cppEntry.carg_type_ = arg_type; cppEntry.allocate_c_arg(); + cppEntry.set_c_arg_default(cpp_arg); cppEntry.cpparg_ = cpp_arg; @@ -171,36 +173,35 @@ void OptionGroup::add_entry_with_wrapper(const OptionEntry& entry, GOptionArg ar cppEntry.entry_->gobj()->arg = arg_type; cppEntry.entry_->gobj()->arg_data = cppEntry.carg_; - + //Remember the C++/C mapping so that we can use it later: map_entries_[name] = cppEntry; add_entry(*(cppEntry.entry_)); } } - + bool OptionGroup::on_pre_parse(OptionContext& /* context */, OptionGroup& /* group */) { - return true; } bool OptionGroup::on_post_parse(OptionContext& /* context */, OptionGroup& /* group */) { //Call this at the start of overrides. - + //TODO: Maybe put this in the C callback: - + //The C args have now been given values by GOption. //Convert C values to C++ values: - + for(type_map_entries::iterator iter = map_entries_.begin(); iter != map_entries_.end(); ++iter) { CppOptionEntry& cpp_entry = iter->second; cpp_entry.convert_c_to_cpp(); } - + return true; } @@ -212,20 +213,24 @@ void OptionGroup::on_error(OptionContext& /* context */, OptionGroup& /* group * OptionGroup::CppOptionEntry::CppOptionEntry() : carg_type_(G_OPTION_ARG_NONE), carg_(0), cpparg_(0), entry_(0) {} - + void OptionGroup::CppOptionEntry::allocate_c_arg() { //Create an instance of the appropriate C type. //This will be destroyed in the OptionGroup destructor. + // + //We must also call set_c_arg_default() to give these C types the specified defaults based on the C++-typed arguments. switch(carg_type_) { case G_OPTION_ARG_STRING: //The char* will be for UTF8 strins. case G_OPTION_ARG_FILENAME: //The char* will be for strings in the current locale's encoding. { char** typed_arg = new char*; - *typed_arg = 0; //The C code will allocate a char* and put it here, for us to g_free() later. + //The C code will allocate a char* and put it here, for us to g_free() later. + //Alternatively, set_c_arg_default() might allocate a char*, and the C code might or might not free and replace that. + *typed_arg = 0; carg_ = typed_arg; - + break; } case G_OPTION_ARG_INT: @@ -233,7 +238,7 @@ void OptionGroup::CppOptionEntry::allocate_c_arg() int* typed_arg = new int; *typed_arg = 0; carg_ = typed_arg; - + break; } case G_OPTION_ARG_STRING_ARRAY: @@ -242,7 +247,7 @@ void OptionGroup::CppOptionEntry::allocate_c_arg() char*** typed_arg = new char**; *typed_arg = 0; carg_ = typed_arg; - + break; } case G_OPTION_ARG_NONE: /* Actually a boolean. */ @@ -250,7 +255,88 @@ void OptionGroup::CppOptionEntry::allocate_c_arg() gboolean* typed_arg = new gboolean; *typed_arg = 0; carg_ = typed_arg; - + + break; + } + default: + { + break; + } + } +} + +void OptionGroup::CppOptionEntry::set_c_arg_default(void* cpp_arg) +{ + switch(carg_type_) + { + case G_OPTION_ARG_INT: + { + *static_cast(carg_) = *static_cast(cpp_arg); + break; + } + case G_OPTION_ARG_NONE: + { + *static_cast(carg_) = *static_cast(cpp_arg); + break; + } + case G_OPTION_ARG_STRING: + { + Glib::ustring* typed_cpp_arg = static_cast(cpp_arg); + if(typed_cpp_arg && !typed_cpp_arg->empty()) + { + const char** typed_c_arg = static_cast(carg_); + *typed_c_arg = g_strdup(typed_cpp_arg->c_str()); //Freed in release_c_arg(). + } + break; + } + case G_OPTION_ARG_FILENAME: + { + std::string* typed_cpp_arg = static_cast(cpp_arg); + if(typed_cpp_arg && !typed_cpp_arg->empty()) + { + const char** typed_c_arg = static_cast(carg_); + *typed_c_arg = g_strdup(typed_cpp_arg->c_str()); //Freed in release_c_arg(). + } + break; + } + case G_OPTION_ARG_STRING_ARRAY: + { + std::vector* typed_cpp_arg = static_cast*>(cpp_arg); + if(typed_cpp_arg) + { + std::vector& vec = *typed_cpp_arg; + const char** array = static_cast( g_malloc(sizeof(gchar*) * (vec.size() + 1)) ); + + for(std::vector::size_type i = 0; i < vec.size(); ++i) + { + array[i] = g_strdup( vec[i].c_str() ); + } + + array[vec.size()] = 0; + + const char*** typed_c_arg = static_cast(carg_); + *typed_c_arg = array; + } + break; + } + case G_OPTION_ARG_FILENAME_ARRAY: + { + std::vector* typed_cpp_arg = static_cast*>(cpp_arg); + if(typed_cpp_arg) + { + std::vector& vec = *typed_cpp_arg; + const char** array = static_cast( g_malloc(sizeof(gchar*) * (vec.size() + 1)) ); + + for(std::vector::size_type i = 0; i < vec.size(); ++i) + { + array[i] = g_strdup( vec[i].c_str() ); + } + + array[vec.size()] = 0; + + const char*** typed_c_arg = static_cast(carg_); + *typed_c_arg = array; + } break; } default: @@ -271,15 +357,15 @@ void OptionGroup::CppOptionEntry::release_c_arg() case G_OPTION_ARG_STRING: case G_OPTION_ARG_FILENAME: { - char** typed_arg = (char**)carg_; + char** typed_arg = static_cast(carg_); g_free(*typed_arg); //Free the char* string at type_arg, which was allocated by the C code. delete typed_arg; //Delete the char** that we allocated in allocate_c_arg; - + break; } case G_OPTION_ARG_INT: { - int* typed_arg = (int*)carg_; + int* typed_arg = static_cast(carg_); delete typed_arg; break; @@ -292,23 +378,23 @@ void OptionGroup::CppOptionEntry::release_c_arg() } case G_OPTION_ARG_NONE: /* Actually a boolean. */ { - gboolean* typed_arg = (gboolean*)carg_; + gboolean* typed_arg = static_cast(carg_); delete typed_arg; break; } default: { - /* TODO: - G_OPTION_ARG_CALLBACK, -*/ + /* TODO: + G_OPTION_ARG_CALLBACK, + */ break; } } - + carg_ = 0; } - + if(entry_) delete entry_; } @@ -319,44 +405,44 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() { case G_OPTION_ARG_STRING: { - char** typed_arg = (char**)carg_; - Glib::ustring* typed_cpp_arg = (Glib::ustring*)cpparg_; + char** typed_arg = static_cast(carg_); + Glib::ustring* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { char* pch = *typed_arg; (*typed_cpp_arg) = Glib::convert_const_gchar_ptr_to_ustring(pch); - + break; } } case G_OPTION_ARG_FILENAME: { - char** typed_arg = (char**)carg_; - std::string* typed_cpp_arg = (std::string*)cpparg_; + char** typed_arg = static_cast(carg_); + std::string* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { char* pch = *typed_arg; (*typed_cpp_arg) = Glib::convert_const_gchar_ptr_to_stdstring(pch); - + break; } } case G_OPTION_ARG_INT: { - *((int*)cpparg_) = *((int*)carg_); + *((int*)cpparg_) = *(static_cast(carg_)); break; } case G_OPTION_ARG_STRING_ARRAY: { - char*** typed_arg = (char***)carg_; - vecustrings* typed_cpp_arg = (vecustrings*)cpparg_; + char*** typed_arg = static_cast(carg_); + vecustrings* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { typed_cpp_arg->clear(); - + //The C array seems to be null-terminated. //Glib::StringArrayHandle array_handle(*typed_arg, Glib::OWNERSHIP_NONE); - + //The SUN Forte compiler complains about this: // "optiongroup.cc", line 354: Error: Cannot assign Glib::ArrayHandle> to std::vector without @@ -369,14 +455,14 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() // cxx: Error: ../../glib/glibmm/containerhandle_shared.h, line 149: the operand // of a pointer dynamic_cast must be a pointer to a complete class type // return dynamic_cast(Glib::wrap_auto(cobj, false /* take_copy */)); - + //for(Glib::StringArrayHandle::iterator iter = array_handle.begin(); iter != array_handle.end(); ++iter) //{ // typed_cpp_arg->push_back(*iter); //} - + //So we do this: - + char** char_array_next = *typed_arg; while(char_array_next && *char_array_next) { @@ -384,19 +470,19 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() ++char_array_next; } } - + break; } case G_OPTION_ARG_FILENAME_ARRAY: { - char*** typed_arg = (char***)carg_; - vecustrings* typed_cpp_arg = (vecustrings*)cpparg_; + char*** typed_arg = static_cast(carg_); + vecustrings* typed_cpp_arg = static_cast(cpparg_); if(typed_arg && typed_cpp_arg) { typed_cpp_arg->clear(); - + //See comments above about the SUN Forte and Tru64 compilers. - + char** char_array_next = *typed_arg; while(char_array_next && *char_array_next) { @@ -404,20 +490,20 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() ++char_array_next; } } - + break; } case G_OPTION_ARG_NONE: /* Actually a boolean. */ { - *((bool*)cpparg_) = *((gboolean*)carg_); + *(static_cast(cpparg_)) = *(static_cast(carg_)); break; } default: { /* TODO: - G_OPTION_ARG_CALLBACK, - */ - break; + G_OPTION_ARG_CALLBACK, + */ + break; } } } @@ -427,6 +513,6 @@ GOptionGroup* OptionGroup::gobj_give_ownership() has_ownership_ = false; return gobj(); } - + } // namespace Glib diff --git a/libs/glibmm2/glib/src/optiongroup.hg b/libs/glibmm2/glib/src/optiongroup.hg index 5083d24053..c15b80d950 100644 --- a/libs/glibmm2/glib/src/optiongroup.hg +++ b/libs/glibmm2/glib/src/optiongroup.hg @@ -1,4 +1,4 @@ -/* $Id: optiongroup.hg,v 1.10 2005/01/10 17:42:17 murrayc Exp $ */ +/* $Id: optiongroup.hg,v 1.10.4.1 2006/03/30 12:19:58 murrayc Exp $ */ /* Copyright (C) 2004 The glibmm Development Team * @@ -61,21 +61,21 @@ public: virtual bool on_post_parse(OptionContext& context, OptionGroup& group); virtual void on_error(OptionContext& context, OptionGroup& group); _IGNORE(g_option_group_set_parse_hooks, g_option_group_set_error_hook) - + void add_entry(const OptionEntry& entry); _IGNORE(g_option_group_add_entries) - - + + typedef std::vector vecustrings; typedef std::vector vecstrings; - + void add_entry(const OptionEntry& entry, bool& arg); void add_entry(const OptionEntry& entry, int& arg); void add_entry(const OptionEntry& entry, Glib::ustring& arg); void add_entry_filename(const OptionEntry& entry, std::string& arg); void add_entry(const OptionEntry& entry, vecustrings& arg); void add_entry_filename(const OptionEntry& entry, vecstrings& arg); - + /* TODO: void g_option_group_set_translate_func (GOptionGroup *group, GTranslateFunc func, @@ -83,36 +83,41 @@ void g_option_group_set_translate_func (GOptionGroup *group, GDestroyNotify destroy_notify); */ _WRAP_METHOD(void set_translation_domain(const Glib::ustring& domain), g_option_group_set_translation_domain) - + GOptionGroup* gobj() { return gobject_; } const GOptionGroup* gobj() const { return gobject_; } GOptionGroup* gobj_give_ownership(); - + protected: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + /** This is not public API. It is an implementation detail. + */ class CppOptionEntry { public: CppOptionEntry(); - + void allocate_c_arg(); + void set_c_arg_default(void* cpp_arg); void convert_c_to_cpp(); void release_c_arg(); - + GOptionArg carg_type_; void* carg_; void* cpparg_; OptionEntry* entry_; }; - + void add_entry_with_wrapper(const OptionEntry& entry, GOptionArg arg_type, void* cpp_arg); - + //Map of entry names to CppOptionEntry: typedef std::map type_map_entries; type_map_entries map_entries_; - + GOptionGroup* gobject_; bool has_ownership_; //Whether the gobject_ belongs to this C++ instance. +#endif //DOXYGEN_SHOULD_SKIP_THIS }; } // namespace Glib diff --git a/libs/glibmm2/glib/src/regex.ccg b/libs/glibmm2/glib/src/regex.ccg new file mode 100644 index 0000000000..e087365ed6 --- /dev/null +++ b/libs/glibmm2/glib/src/regex.ccg @@ -0,0 +1,204 @@ +/* Copyright (C) 2007 The glibmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Glib +{ + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::RefPtr Regex::create(const Glib::ustring& pattern, + RegexCompileFlags compile_options, + RegexMatchFlags match_options) +#else +Glib::RefPtr Regex::create(const Glib::ustring& pattern, + RegexCompileFlags compile_options, + RegexMatchFlags match_options, + std::auto_ptr& error) +#endif /* GLIBMM_EXCEPTIONS_ENABLED */ +{ + GError* gerror = 0; + GRegex* regex = g_regex_new(pattern.c_str(), (GRegexCompileFlags)compile_options, + (GRegexMatchFlags)match_options, &gerror); + + if(gerror) +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::Error::throw_exception(gerror); +#else + error = Glib::Error::throw_exception(gerror); +#endif + return Glib::wrap(regex); +} + +// static +Glib::ustring Regex::escape_string(const Glib::ustring& string) +{ + const Glib::ScopedPtr buf (g_regex_escape_string(string.raw().c_str(), + string.raw().size())); + return Glib::ustring(buf.get()); +} + +bool Regex::match(const Glib::ustring& string, RegexMatchFlags match_options) +{ + return g_regex_match(gobj(), string.c_str(), (GRegexMatchFlags)(match_options), 0); +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_full(gobj(), string.c_str(), -1, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_full(gobj(), string.c_str(), string_len, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + +bool Regex::match_all(const Glib::ustring& string, RegexMatchFlags match_options) +{ + return g_regex_match_all(gobj(), string.c_str(), ((GRegexMatchFlags)(match_options)), 0); +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_all_full(gobj(), string.c_str(), -1, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Regex::match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options) +#else +bool Regex::match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = g_regex_match_all_full(gobj(), string.c_str(), string_len, start_position, ((GRegexMatchFlags)(match_options)), 0, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options) +#else +Glib::ustring Regex::replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace(gobj(), string.c_str(), -1, start_position, replacement.c_str(), ((GRegexMatchFlags)(match_options)), &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::ustring Regex::replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options) +#else +Glib::ustring Regex::replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(g_regex_replace_literal(gobj(), string.c_str(), -1, start_position, replacement.c_str(), ((GRegexMatchFlags)(match_options)), &(gerror))); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Glib::StringArrayHandle Regex::split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens) const +#else +Glib::StringArrayHandle Regex::split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + Glib::StringArrayHandle retvalue = Glib::StringArrayHandle(g_regex_split_full(const_cast(gobj()), string.c_str(), -1, start_position, ((GRegexMatchFlags)(match_options)), max_tokens, &(gerror)), Glib::OWNERSHIP_DEEP); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +} // namespace Glib diff --git a/libs/glibmm2/glib/src/regex.hg b/libs/glibmm2/glib/src/regex.hg new file mode 100644 index 0000000000..5b029a8f28 --- /dev/null +++ b/libs/glibmm2/glib/src/regex.hg @@ -0,0 +1,209 @@ +/* Copyright (C) 2007 The glibmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(glibmm,glib) + +#include +#include +#include +#include +#include + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +typedef struct _GRegex GRegex; +#endif + +namespace Glib +{ + +_WRAP_ENUM(RegexCompileFlags, GRegexCompileFlags, NO_GTYPE) +_WRAP_ENUM(RegexMatchFlags, GRegexMatchFlags, NO_GTYPE) + +/** Exception class for Regex + */ +_WRAP_GERROR(RegexError, GRegexError, G_REGEX_ERROR, NO_GTYPE) + + +/** Perl-compatible regular expressions - matches strings against regular expressions. + * + * The Glib::Regex functions implement regular expression pattern matching using + * syntax and semantics similar to Perl regular expression. + * + * Some functions accept a start_position argument, setting it differs from just + * passing over a shortened string and setting REGEX_MATCH_NOTBOL in the case + * of a pattern that begins with any kind of lookbehind assertion. For example, + * consider the pattern "\Biss\B" which finds occurrences of "iss" in the middle + * of words. ("\B" matches only if the current position in the subject is not a + * word boundary.) When applied to the string "Mississipi" from the fourth byte, + * namely "issipi", it does not match, because "\B" is always false at the + * start of the subject, which is deemed to be a word boundary. However, if + * the entire string is passed , but with start_position set to 4, it finds the + * second occurrence of "iss" because it is able to look behind the starting point + * to discover that it is preceded by a letter. + * + * Note that, unless you set the REGEX_RAW flag, all the strings passed to these + * functions must be encoded in UTF-8. The lengths and the positions inside the + * strings are in bytes and not in characters, so, for instance, + * "\xc3\xa0" (i.e. "à") is two bytes long but it is treated as a single + * character. If you set REGEX_RAW the strings can be non-valid UTF-8 strings + * and a byte is treated as a character, so "\xc3\xa0" is two bytes and + * two characters long. + * + * When matching a pattern, "\n" matches only against a "\n" character in the + * string, and "\r" matches only a "\r" character. To match any newline sequence + * use "\R". This particular group matches either the two-character sequence + * CR + LF ("\r\n"), or one of the single characters LF (linefeed, U+000A, "\n"), + * VT (vertical tab, U+000B, "\v"), FF (formfeed, U+000C, "\f"), CR (carriage + * return, U+000D, "\r"), NEL (next line, U+0085), LS (line separator, U+2028), + * or PS (paragraph separator, U+2029). + * + * The behaviour of the dot, circumflex, and dollar metacharacters are affected + * by newline characters, the default is to recognize any newline character (the + * same characters recognized by "\R"). This can be changed with REGEX_NEWLINE_CR, + * REGEX_NEWLINE_LF and REGEX_NEWLINE_CRLF compile options, and with + * REGEX_MATCH_NEWLINE_ANY, REGEX_MATCH_NEWLINE_CR, REGEX_MATCH_NEWLINE_LF + * and REGEX_MATCH_NEWLINE_CRLF match options. These settings are also + * relevant when compiling a pattern if REGEX_EXTENDED is set, and an unescaped + * "#" outside a character class is encountered. This indicates a comment that + * lasts until after the next newline. + * + * Creating and manipulating the same Glib::Regex class from different threads is + * not a problem as Glib::Regex does not modify its internal state between creation and + * destruction, on the other hand Glib::MatchInfo is not threadsafe. + * + * The regular expressions low level functionalities are obtained through the + * excellent PCRE library written by Philip Hazel. + * + * @newin2p14 + */ +class Regex +{ + _CLASS_OPAQUE_REFCOUNTED(Regex, GRegex, NONE, g_regex_ref, g_regex_unref) + _IGNORE(g_regex_ref, g_regex_unref) +public: + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + static Glib::RefPtr create(const Glib::ustring& pattern, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0)); +#else + static Glib::RefPtr create(const Glib::ustring& pattern, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0), std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + _WRAP_METHOD(Glib::ustring get_pattern() const, g_regex_get_pattern) + _WRAP_METHOD(int get_max_backref() const, g_regex_get_max_backref) + _WRAP_METHOD(int get_capture_count() const, g_regex_get_capture_count) + _WRAP_METHOD(int get_string_number(const Glib::ustring& name) const, g_regex_get_string_number) + + static Glib::ustring escape_string(const Glib::ustring& string); + + _WRAP_METHOD(static bool match_simple(const Glib::ustring& pattern, const Glib::ustring& string, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0)), g_regex_match_simple) + + //TODO: _WRAP_METHOD(bool match(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo **match_info = 0), g_regex_match) + bool match(const Glib::ustring& string, RegexMatchFlags match_options = static_cast(0)); + + //TODO: Wrap GMatchInfo as an iterator: + //_WRAP_METHOD(bool match_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_full, errthrow) + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options); +#else + bool match(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options); +#else + bool match(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + //TODO: _WRAP_METHOD(bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo ** match_info = 0), g_regex_match_all) + bool match_all(const Glib::ustring& string, RegexMatchFlags match_options = static_cast(0)); + + //TODO: _WRAP_METHOD(bool match_all_full(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = (RegexMatchFlags)0, GMatchInfo** match_info = 0), g_regex_match_all_full, errthrow) + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options); +#else + bool match_all(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options); +#else + bool match_all(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + +#m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)') + + _WRAP_METHOD(static Glib::StringArrayHandle split_simple(const Glib::ustring& pattern, const Glib::ustring& string, RegexCompileFlags compile_options = static_cast(0), RegexMatchFlags match_options = static_cast(0)), g_regex_split_simple) + _WRAP_METHOD(Glib::StringArrayHandle split(const Glib::ustring& string, RegexMatchFlags match_options = static_cast(0)), g_regex_split) + + _WRAP_METHOD(Glib::StringArrayHandle split(const gchar* string, gssize string_len, int start_position, RegexMatchFlags match_options = static_cast(0), int max_tokens = 0) const, g_regex_split_full, errthrow) + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::StringArrayHandle split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens) const; +#else + Glib::StringArrayHandle split(const Glib::ustring& string, int start_position, RegexMatchFlags match_options, int max_tokens, std::auto_ptr& error) const; +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + _WRAP_METHOD(Glib::ustring replace(const gchar* string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options = static_cast(0)), g_regex_replace, errthrow) +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options); +#else + Glib::ustring replace(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + _WRAP_METHOD(Glib::ustring replace_literal(const gchar *string, gssize string_len, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options = static_cast(0)), g_regex_replace_literal, errthrow) +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Glib::ustring replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options); +#else + Glib::ustring replace_literal(const Glib::ustring& string, int start_position, const Glib::ustring& replacement, RegexMatchFlags match_options, std::auto_ptr& error); +#endif /* !GLIBMM_EXCEPTIONS_ENABLED */ + + _WRAP_METHOD(Glib::ustring replace_eval(const Glib::ustring& string, gssize string_len, int start_position, RegexMatchFlags match_options, GRegexEvalCallback eval, gpointer user_data), g_regex_replace_eval, errthrow) + _WRAP_METHOD(static bool check_replacement(const Glib::ustring& replacement, gboolean* has_references), g_regex_check_replacement, errthrow) + +/* Match info */ +/* +GRegex *g_match_info_get_regex (const GMatchInfo *match_info); +const gchar *g_match_info_get_string (const GMatchInfo *match_info); + +void g_match_info_free (GMatchInfo *match_info); + _WRAP_METHOD(bool g_match_info_next (GMatchInfo *match_info, + GError **error); + _WRAP_METHOD(bool g_match_info_matches (const GMatchInfo *match_info); + _WRAP_METHOD(int g_match_info_get_match_count (const GMatchInfo *match_info); + _WRAP_METHOD(bool g_match_info_is_partial_match (const GMatchInfo *match_info); +Glib::ustring g_match_info_expand_references(const GMatchInfo *match_info, + Glib::ustring& string_to_expand, + GError **error); +Glib::ustring g_match_info_fetch (const GMatchInfo *match_info, + int match_num); + _WRAP_METHOD(bool g_match_info_fetch_pos (const GMatchInfo *match_info, + int match_num, + int *start_pos, + int *end_pos); +Glib::ustring g_match_info_fetch_named (const GMatchInfo *match_info, + Glib::ustring& name); + _WRAP_METHOD(bool g_match_info_fetch_named_pos (const GMatchInfo *match_info, + Glib::ustring& name, + int *start_pos, + int *end_pos); +gchar **g_match_info_fetch_all (const GMatchInfo *match_info); +*/ +}; + +} // namespace Glib diff --git a/libs/glibmm2/glib/src/shell.ccg b/libs/glibmm2/glib/src/shell.ccg index d56563e077..eae98ef7d8 100644 --- a/libs/glibmm2/glib/src/shell.ccg +++ b/libs/glibmm2/glib/src/shell.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: shell.ccg,v 1.1.1.1 2003/01/07 16:58:38 murrayc Exp $ */ +/* $Id: shell.ccg,v 1.1 2003/01/07 16:58:38 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/src/unicode.ccg b/libs/glibmm2/glib/src/unicode.ccg index 89aa41261e..7d994ef05b 100644 --- a/libs/glibmm2/glib/src/unicode.ccg +++ b/libs/glibmm2/glib/src/unicode.ccg @@ -1,5 +1,5 @@ // -*- c++ -*- -/* $Id: unicode.ccg,v 1.1.1.1 2003/01/07 16:58:42 murrayc Exp $ */ +/* $Id: unicode.ccg,v 1.1 2003/01/07 16:58:42 murrayc Exp $ */ /* Copyright (C) 2002 The gtkmm Development Team * diff --git a/libs/glibmm2/glib/src/value_basictypes.cc.m4 b/libs/glibmm2/glib/src/value_basictypes.cc.m4 index cdda8cee4b..f87461aaf1 100644 --- a/libs/glibmm2/glib/src/value_basictypes.cc.m4 +++ b/libs/glibmm2/glib/src/value_basictypes.cc.m4 @@ -1,6 +1,6 @@ divert(-1) -dnl $Id: value_basictypes.cc.m4,v 1.2 2006/11/22 11:13:29 murrayc Exp $ +dnl $Id: value_basictypes.cc.m4 348 2006-11-22 11:14:43Z murrayc $ dnl Glib::Value specializations for fundamental types dnl diff --git a/libs/glibmm2/glib/src/value_basictypes.h.m4 b/libs/glibmm2/glib/src/value_basictypes.h.m4 index ebfc9cdcd7..08c4a90998 100644 --- a/libs/glibmm2/glib/src/value_basictypes.h.m4 +++ b/libs/glibmm2/glib/src/value_basictypes.h.m4 @@ -1,6 +1,6 @@ divert(-1) -dnl $Id: value_basictypes.h.m4,v 1.1.1.1 2003/01/07 16:58:42 murrayc Exp $ +dnl $Id: value_basictypes.h.m4 2 2003-01-07 16:59:16Z murrayc $ dnl Glib::Value specializations for fundamental types dnl diff --git a/libs/glibmm2/glib/stamp-h2 b/libs/glibmm2/glib/stamp-h2 deleted file mode 100644 index 96bf600f0d..0000000000 --- a/libs/glibmm2/glib/stamp-h2 +++ /dev/null @@ -1 +0,0 @@ -timestamp for glib/glibmmconfig.h diff --git a/libs/glibmm2/libtool b/libs/glibmm2/libtool deleted file mode 100644 index e803a508d0..0000000000 --- a/libs/glibmm2/libtool +++ /dev/null @@ -1,7520 +0,0 @@ -#! /bin/bash - -# libtoolT - Provide generalized library-building support services. -# Generated automatically by (GNU glibmm 2.13.3) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED="/bin/sed" - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="/bin/sed -e 1s/^X//" - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -# The names of the tagged configurations supported by this script. -available_tags=" CXX" - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host houllier: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=no - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=yes - -# The host system. -host_alias= -host=i686-pc-linux-gnu -host_os=linux-gnu - -# The build system. -build_alias= -build=i686-pc-linux-gnu -build_os=linux-gnu - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="gcc" - -# LTCC compiler flags. -LTCFLAGS="-g -O2" - -# A language-specific compiler. -CC="gcc" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="grep -E" - -# The linker used to build libraries. -LD="/usr/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/bin/nm -B" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=32768 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=unknown - -# Whether dlopen of programs is supported. -dlopen_self=unknown - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=unknown - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ - cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ - \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ - \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" -postinstall_cmds="" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag="" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var=LD_RUN_PATH - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../ /lib/i486-linux-gnu/4.1.2/ /lib/ /usr/lib/i486-linux-gnu/4.1.2/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib " - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL CONFIG - -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 - -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=1.5.22 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -duplicate_deps=no -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" - -##################################### -# Shell function definitions: -# This seems to be the best place for them - -# func_mktempdir [string] -# Make a temporary directory that won't clash with other running -# libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $mkdir "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || { - $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 - exit $EXIT_FAILURE - } - fi - - $echo "X$my_tmpdir" | $Xsed -} - - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -func_win32_libid () -{ - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $echo $win32_libid_type -} - - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi -} - - -# func_extract_an_archive dir oldlib -func_extract_an_archive () -{ - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - - $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" - $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 - exit $EXIT_FAILURE - fi -} - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then - exit $exit_status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" - cd "$darwin_curdir" - $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - ${rm}r unfat-$$ - cd "$darwin_orig_dir" - else - cd "$darwin_orig_dir" - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - fi # $run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - func_extract_archives_result="$my_oldobjs" -} -# End of Shell function definitions -##################################### - -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" - -disable_libs=no - -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift - - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - tag) - tagname="$arg" - preserve_args="${preserve_args}=$arg" - - # Check whether tagname contains only valid characters - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - - --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $? - ;; - - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done - exit $? - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) - run=: - ;; - - --features) - $echo "host: $host" - if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" - else - $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - $echo "enable static libraries" - else - $echo "disable static libraries" - fi - exit $? - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --preserve-dup-deps) duplicate_deps="yes" ;; - - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; - - --tag) - prevopt="--tag" - prev=tag - preserve_args="$preserve_args --tag" - ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi - -case $disable_libs in -no) - ;; -shared) - build_libtool_libs=no - build_old_libs=yes - ;; -static) - build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` - ;; -esac - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; - - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; - - * ) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, and some SunOS ksh mistreat backslash-escaping - # in scan sets (worked around with variable expansion), - # and furthermore cannot handle '|' '&' '(' ')' in scan sets - # at all, so we specify them separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" - done # for arg - - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - *.java) xform=java ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` - case $qlibobj in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qlibobj="\"$qlibobj\"" ;; - esac - test "X$libobj" != "X$qlibobj" \ - && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi - lobj=${xdir}$objdir/$objname - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $echo "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - $echo "$srcfile" > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` - case $qsrcfile in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qsrcfile="\"$qsrcfile\"" ;; - esac - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - else - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - fi - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - darwin_framework|darwin_framework_skip) - test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework|-arch|-isysroot) - case " $CC " in - *" ${arg} ${1} "* | *" ${arg} ${1} "*) - prev=darwin_framework_skip ;; - *) compiler_flags="$compiler_flags $arg" - prev=darwin_framework ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - notinst_path="$notinst_path $dir" - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - -model) - compile_command="$compile_command $arg" - compiler_flags="$compiler_flags $arg" - finalize_command="$finalize_command $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - compiler_flags="$compiler_flags $arg" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m* pass through architecture-specific compiler args for GCC - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - compiler_flags="$compiler_flags $arg" - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; - - -static) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then - exit $exit_status - fi - fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) - duplicate_compiler_generated_deps=$duplicate_deps - ;; - esac - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - compiler_flags="$compiler_flags $deplib" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 - exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi - ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $absdir" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes ; then - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library - - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | - $EGREP ": [^:]* bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi - - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi - - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor - 1` - age="$number_minor" - revision="$number_minor" - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $revision in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $age in - 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; - - irix | nonstopux) - major=`expr $current - $age + 1` - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi - - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name=`expr $a_deplib : '-l\(.*\)'` - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" - - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - output_la=`$echo "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$output_la-${k}.$objext - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - eval test_cmds=\"$reload_cmds $objlist $last_robj\" - if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$output_la-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadable object files - # after they are used. - i=0 - while test "$i" -lt "$k" - do - i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" - done - - $echo "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi - - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${obj}x" - generated="$generated $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi - - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; - esac - ;; - *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" - - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - else - $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' - $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - case $host in - *cygwin* | *mingw* ) - $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -" - - case $host in - *cygwin* | *mingw* ) - $echo >> "$output_objdir/$dlsyms" "\ -/* DATA imports from DLLs on WIN32 can't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs */ -struct { -" - ;; - * ) - $echo >> "$output_objdir/$dlsyms" "\ -const struct { -" - ;; - esac - - - $echo >> "$output_objdir/$dlsyms" "\ - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac - esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - case $host in - *cygwin* | *mingw* ) - if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - fi - ;; - * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - esac - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - exit_status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - - exit $exit_status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - output_name=`basename $output` - output_path=`dirname $output` - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -/* -DDEBUG is fairly common in CFLAGS. */ -#undef DEBUG -#if defined DEBUGWRAPPER -# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) -#else -# define DEBUG(format, ...) -#endif - -const char *program_name = NULL; - -void * xmalloc (size_t num); -char * xstrdup (const char *string); -const char * base_name (const char *name); -char * find_executable(const char *wrapper); -int check_executable(const char *path); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); - -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); - DEBUG("(main) argv[0] : %s\n",argv[0]); - DEBUG("(main) program_name : %s\n",program_name); - newargz = XMALLOC(char *, argc+2); -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = find_executable(argv[0]); - if (newargz[1] == NULL) - lt_fatal("Couldn't find %s", argv[0]); - DEBUG("(main) found exe at : %s\n",newargz[1]); - /* we know the script has the same name, without the .exe */ - /* so make sure newargz[1] doesn't end in .exe */ - strendzap(newargz[1],".exe"); - for (i = 1; i < argc; i++) - newargz[i+1] = xstrdup(argv[i]); - newargz[argc+1] = NULL; - - for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - return 127; -} - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; -} - -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} - -const char * -base_name (const char *name) -{ - const char *base; - -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha ((unsigned char)name[0]) && name[1] == ':') - name += 2; -#endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return base; -} - -int -check_executable(const char * path) -{ - struct stat st; - - DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); - if ((!path) || (!*path)) - return 0; - - if ((stat (path, &st) >= 0) && - ( - /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ -#if defined (S_IXOTH) - ((st.st_mode & S_IXOTH) == S_IXOTH) || -#endif -#if defined (S_IXGRP) - ((st.st_mode & S_IXGRP) == S_IXGRP) || -#endif - ((st.st_mode & S_IXUSR) == S_IXUSR)) - ) - return 1; - else - return 0; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise */ -char * -find_executable (const char* wrapper) -{ - int has_slash = 0; - const char* p; - const char* p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char* concat_name; - - DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char* path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char* q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR(*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); - tmp_len = strlen(tmp); - concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable(concat_name)) - return concat_name; - XFREE(concat_name); - return NULL; -} - -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; - - assert(str != NULL); - assert(pat != NULL); - - len = strlen(str); - patlen = strlen(pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} - -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" - - $echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi - - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - cmds=$old_archive_from_new_cmds - else - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "copying selected object files to avoid basename conflicts..." - - if test -z "$gentop"; then - gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" - - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - exit_status=$? - if test "$exit_status" -ne 0 && test ! -d "$gentop"; then - exit $exit_status - fi - fi - - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - counter=`expr $counter + 1` - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - $run ln "$obj" "$gentop/$newobj" || - $run cp "$obj" "$gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" - ;; - *) oldobjs="$oldobjs $obj" ;; - esac - done - fi - - eval cmds=\"$old_archive_cmds\" - - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && - test "$len" -le "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac - ;; - -g | -m | -o) prev=$arg ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE - fi - fi - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on - # the symlink we replace! Solaris /bin/ln does not understand -f, - # so we also need to try rm && ln -s. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - relink_command= - # Note that it is not necessary on cygwin/mingw to append a dot to - # foo even if both foo and FILE.exe exist: automatic-append-.exe - # behavior happens only for exec(3), not for open(2)! Also, sourcing - # `FILE.' does not work on cygwin managed mounts. - # - # If there is no directory component, then add one. - case $wrapper in - */* | *\\*) . ${wrapper} ;; - *) . ./${wrapper} ;; - esac - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir=`func_mktempdir` - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; - esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS - - $echo "X----------------------------------------------------------------------" | $Xsed - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" - done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - - case "$mode" in - clean) - case " $library_names " in - # " " in the beginning catches empty $dlname - *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - - # Read the .lo file - . $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 - fi - done - - exit $exit_status - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit $EXIT_FAILURE -fi - -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $? - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -disable_libs=shared -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -disable_libs=static -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# ### BEGIN LIBTOOL TAG CONFIG: CXX - -# Libtool was configured on host houllier: - -# Shell to use when invoking shell scripts. -SHELL="/bin/bash" - -# Whether or not to build shared libraries. -build_libtool_libs=yes - -# Whether or not to build static libraries. -build_old_libs=no - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=no - -# Whether or not to optimize for fast installation. -fast_install=yes - -# The host system. -host_alias= -host=i686-pc-linux-gnu -host_os=linux-gnu - -# The build system. -build_alias= -build=i686-pc-linux-gnu -build_os=linux-gnu - -# An echo program that does not interpret backslashes. -echo="echo" - -# The archiver. -AR="ar" -AR_FLAGS="cru" - -# A C compiler. -LTCC="gcc" - -# LTCC compiler flags. -LTCFLAGS="-g -O2" - -# A language-specific compiler. -CC="g++" - -# Is the compiler the GNU C compiler? -with_gcc=yes - -# An ERE matcher. -EGREP="grep -E" - -# The linker used to build libraries. -LD="/usr/bin/ld" - -# Whether we need hard or soft links. -LN_S="ln -s" - -# A BSD-compatible nm program. -NM="/usr/bin/nm -B" - -# A symbol stripping program -STRIP="strip" - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=file - -# Used on cygwin: DLL creation program. -DLLTOOL="dlltool" - -# Used on cygwin: object dumper. -OBJDUMP="objdump" - -# Used on cygwin: assembler. -AS="as" - -# The name of the directory that contains temporary libtool files. -objdir=.libs - -# How to create reloadable object files. -reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" - -# How to pass a linker flag through the compiler. -wl="-Wl," - -# Object file suffix (normally "o"). -objext="o" - -# Old archive suffix (normally "a"). -libext="a" - -# Shared library suffix (normally ".so"). -shrext_cmds='.so' - -# Executable file suffix (normally ""). -exeext="" - -# Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" -pic_mode=default - -# What is the maximum length of a command? -max_cmd_len=32768 - -# Does compiler simultaneously support -c and -o options? -compiler_c_o="yes" - -# Must we lock files when doing compilation? -need_locks="no" - -# Do we need the lib prefix for modules? -need_lib_prefix=no - -# Do we need a version for libraries? -need_version=no - -# Whether dlopen is supported. -dlopen_support=unknown - -# Whether dlopen of programs is supported. -dlopen_self=unknown - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=unknown - -# Compiler flag to prevent dynamic linking. -link_static_flag="-static" - -# Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec="" - -# Library versioning type. -version_type=linux - -# Format of library name prefix. -libname_spec="lib\$name" - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" - -# The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" - -# Commands used to build and install an old-style archive. -RANLIB="ranlib" -old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" -old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" -old_postuninstall_cmds="" - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds="" - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds="" - -# Commands used to build and install a shared archive. -archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib" -postinstall_cmds="" -postuninstall_cmds="" - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds="" -module_expsym_cmds="" - -# Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects="/usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../lib/crti.o /usr/lib/gcc/i486-linux-gnu/4.1.2/crtbeginS.o" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects="/usr/lib/gcc/i486-linux-gnu/4.1.2/crtendS.o /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../lib/crtn.o" - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps="" - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s" - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/i486-linux-gnu/4.1.2 -L/usr/lib/gcc/i486-linux-gnu/4.1.2 -L/usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../lib -L/lib/../lib -L/usr/lib/../lib" - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method="pass_all" - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd="\$MAGIC_CMD" - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" - -# Flag that forces no undefined symbols. -no_undefined_flag="" - -# Commands used to finish a libtool library installation in a directory. -finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval="" - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'" - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'" - -# This is the shared library runtime path variable. -runpath_var=LD_RUN_PATH - -# This is the shared library path variable. -shlibpath_var=LD_LIBRARY_PATH - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no - -# How to hardcode a shared library path into an executable. -hardcode_action=immediate - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes - -# Flag to hardcode $libdir into a binary during linking. -# This must work even if $libdir does not exist. -hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir" - -# If ld is used when linking, flag to hardcode $libdir into -# a binary during linking. This must work even if $libdir does -# not exist. -hardcode_libdir_flag_spec_ld="" - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator="" - -# Set to yes if using DIR/libNAME during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=no - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=no - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=unsupported - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=no - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=unknown - -# Compile-time system search path for libraries -sys_lib_search_path_spec=" /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../../i486-linux-gnu/lib/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../i486-linux-gnu/4.1.2/ /usr/lib/gcc/i486-linux-gnu/4.1.2/../../../ /lib/i486-linux-gnu/4.1.2/ /lib/ /usr/lib/i486-linux-gnu/4.1.2/ /usr/lib/" - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib " - -# Fix the shell variable $srcfile for the compiler. -fix_srcfile_path="" - -# Set to yes if exported symbols are required. -always_export_symbols=no - -# The commands to list exported symbols. -export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols" - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds="" - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms="" - -# Symbols that must always be exported. -include_expsyms="" - -# ### END LIBTOOL TAG CONFIG: CXX - diff --git a/libs/glibmm2/scripts/Makefile b/libs/glibmm2/scripts/Makefile deleted file mode 100644 index e6b3a83092..0000000000 --- a/libs/glibmm2/scripts/Makefile +++ /dev/null @@ -1,387 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# scripts/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = . -top_srcdir = .. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = scripts -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - config.guess config.sub depcomp install-sh ltmain.sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(m4dir)" -m4DATA_INSTALL = $(INSTALL_DATA) -DATA = $(m4_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = - -# Install m4 macros needed by other *mm packages: -m4dir = $(datadir)/aclocal -m4_DATA = glibmm_check_perl.m4 -EXTRA_DIST = README config.sub missing config.guess install-sh \ - ltmain.sh cxx.m4 cxx_std.m4 docgen.m4 macros.m4 reduced.m4 \ - $(m4_DATA) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scripts/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-m4DATA: $(m4_DATA) - @$(NORMAL_INSTALL) - test -z "$(m4dir)" || $(mkdir_p) "$(DESTDIR)$(m4dir)" - @list='$(m4_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(m4DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4dir)/$$f'"; \ - $(m4DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4dir)/$$f"; \ - done - -uninstall-m4DATA: - @$(NORMAL_UNINSTALL) - @list='$(m4_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(m4dir)/$$f'"; \ - rm -f "$(DESTDIR)$(m4dir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(m4dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-m4DATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-m4DATA - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-m4DATA install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-m4DATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/scripts/Makefile.am b/libs/glibmm2/scripts/Makefile.am deleted file mode 100644 index 0edd72f1a0..0000000000 --- a/libs/glibmm2/scripts/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -# Install m4 macros needed by other *mm packages: -m4dir = $(datadir)/aclocal -m4_DATA = glibmm_check_perl.m4 - -EXTRA_DIST = README config.sub missing config.guess install-sh \ - ltmain.sh cxx.m4 cxx_std.m4 docgen.m4 macros.m4 reduced.m4 \ - $(m4_DATA) - diff --git a/libs/glibmm2/scripts/Makefile.in b/libs/glibmm2/scripts/Makefile.in deleted file mode 100644 index 9574c987b0..0000000000 --- a/libs/glibmm2/scripts/Makefile.in +++ /dev/null @@ -1,387 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = scripts -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - config.guess config.sub depcomp install-sh ltmain.sh missing -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(m4dir)" -m4DATA_INSTALL = $(INSTALL_DATA) -DATA = $(m4_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ -GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ -GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -M4 = @M4@ -MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -MAKEINFO = @MAKEINFO@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL_PATH = @PERL_PATH@ -PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ - -# Install m4 macros needed by other *mm packages: -m4dir = $(datadir)/aclocal -m4_DATA = glibmm_check_perl.m4 -EXTRA_DIST = README config.sub missing config.guess install-sh \ - ltmain.sh cxx.m4 cxx_std.m4 docgen.m4 macros.m4 reduced.m4 \ - $(m4_DATA) - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu scripts/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-m4DATA: $(m4_DATA) - @$(NORMAL_INSTALL) - test -z "$(m4dir)" || $(mkdir_p) "$(DESTDIR)$(m4dir)" - @list='$(m4_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(m4DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4dir)/$$f'"; \ - $(m4DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4dir)/$$f"; \ - done - -uninstall-m4DATA: - @$(NORMAL_UNINSTALL) - @list='$(m4_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(m4dir)/$$f'"; \ - rm -f "$(DESTDIR)$(m4dir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(m4dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-m4DATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-m4DATA - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-m4DATA install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-m4DATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/scripts/README b/libs/glibmm2/scripts/README deleted file mode 100644 index 8b13789179..0000000000 --- a/libs/glibmm2/scripts/README +++ /dev/null @@ -1 +0,0 @@ - diff --git a/libs/glibmm2/scripts/cxx.m4 b/libs/glibmm2/scripts/cxx.m4 deleted file mode 100644 index 8dce019940..0000000000 --- a/libs/glibmm2/scripts/cxx.m4 +++ /dev/null @@ -1,364 +0,0 @@ - -dnl -dnl AC_CXX_NAMESPACES(ACTION_FOUND,ACTION_NOT_FOUND) -dnl -AC_DEFUN([AC_CXX_NAMESPACES],[ -AC_MSG_CHECKING(if C++ compiler supports namespaces) -AC_TRY_COMPILE( -[ -namespace Foo { struct A {}; } -using namespace Foo; -],[ -A a; -(void)a; -],[ - ac_cxx_namespaces=yes - AC_MSG_RESULT([$ac_cxx_namespaces]) - $1 -],[ - ac_cxx_namespaces=no - AC_MSG_RESULT([$ac_cxx_namespaces]) - $2 -]) -]) - -dnl -dnl AC_CXX_NAMESPACES(ACTION_FOUND,ACTION_NOT_FOUND) -dnl -AC_DEFUN([AC_CXX_BOOL],[ -AC_MSG_CHECKING(if C++ compiler supports bool) -AC_TRY_COMPILE( -[ -],[ - bool b=true; - bool b1=false; - (void)b; - (void)b1; -],[ - ac_cxx_bool=yes - AC_MSG_RESULT([$ac_cxx_bool]) - $1 -],[ - ac_cxx_bool=no - AC_MSG_RESULT([$ac_cxx_bool]) - $2 -]) -]) - -dnl -dnl AC_CXX_MUTABLE(ACTION_FOUND,ACTION_NOT_FOUND) -dnl -AC_DEFUN([AC_CXX_MUTABLE],[ -AC_MSG_CHECKING(if C++ compiler supports mutable) -AC_TRY_COMPILE( -[ -class k { - mutable char *c; -public: - void foo() const { c=0; } -}; -],[ -],[ - ac_cxx_mutable=yes - AC_MSG_RESULT([$ac_cxx_mutable]) - $1 -],[ - ac_cxx_mutable=no - AC_MSG_RESULT([$ac_cxx_mutable]) - $2 -]) -]) - - -dnl -dnl AC_CXX_CONST_CAST(ACTION_FOUND,ACTION_NOT_FOUND) -dnl -AC_DEFUN([AC_CXX_CONST_CAST],[ -AC_MSG_CHECKING([if C++ compiler supports const_cast<>]) -AC_TRY_COMPILE( -[ - class foo; -],[ - const foo *c=0; - foo *c1=const_cast(c); - (void)c1; -],[ - ac_cxx_const_cast=yes - AC_MSG_RESULT([$ac_cxx_const_cast]) -],[ - ac_cxx_const_cast=no - AC_MSG_RESULT([$ac_cxx_const_cast]) -]) -]) - - -dnl -dnl GLIBMM_CXX_MEMBER_FUNCTIONS_MEMBER_TEMPLATES(ACTION_FOUND,ACTION_NOT_FOUND) -dnl -dnl Test whether the compiler allows member functions to refer to spezialized member function templates. -dnl Some compilers have problems with this. gcc 2.95.3 aborts with an internal compiler error. -dnl -AC_DEFUN([GLIBMM_CXX_MEMBER_FUNCTIONS_MEMBER_TEMPLATES],[ -AC_MSG_CHECKING([if C++ compiler allows member functions to refer to member templates]) -AC_TRY_COMPILE( -[ - struct foo { - template inline - void doit(); - void thebug(); - }; - - template inline - void foo::doit() { - } - - struct bar { - void neitherabug(); - }; - - void notabug() { - void (foo::*func)(); - func = &foo::doit; - (void)func; - } - - void bar::neitherabug() { - void (foo::*func)(); - func = &foo::doit; - (void)func; - } - - void foo::thebug() { - void (foo::*func)(); - func = &foo::doit; //Compiler bugs usually show here. - (void)func; - } -],[],[ - glibmm_cxx_member_functions_member_templates=yes - AC_DEFINE([GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES],[1],[does the C++ compiler allow member functions to refer to member templates]) - AC_MSG_RESULT([$glibmm_cxx_member_functions_member_templates]) -],[ - glibmm_cxx_member_functions_member_templates=no - AC_DEFINE([GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES],[0]) - AC_MSG_RESULT([$glibmm_cxx_member_functions_member_templates]) -]) -]) - -## GLIBMM_CXX_CAN_DISAMBIGUATE_CONST_TEMPLATE_SPECIALIZATIONS() -## -## Check whether the compiler finds it ambiguous to have both -## const and non-const template specializations, -## The SUN Forte compiler has this problem, though we are -## not 100% sure that it's a C++ standards violation. -## -AC_DEFUN([GLIBMM_CXX_CAN_DISAMBIGUATE_CONST_TEMPLATE_SPECIALIZATIONS], -[ - AC_REQUIRE([GLIBMM_CXX_HAS_NAMESPACE_STD]) - - AC_CACHE_CHECK( - [whether the compiler finds it ambiguous to have both const and non-const template specializations], - [glibmm_cv_cxx_can_disambiguate_const_template_specializations], - [ - AC_TRY_COMPILE( - [ - #include - - template class Foo {}; - - template class Traits { - public: - const char* whoami() { - return "generic template"; - } - }; - - template class Traits > { - public: - const char* whoami() { - return "partial specialization for Foo"; - } - }; - - template class Traits > { - public: - const char* whoami() { - return "partial specialization for Foo"; - } - }; - - ],[ - Traits it; - Traits > fit; - Traits > cfit; - - std::cout << "Traits --> " - << it.whoami() << std::endl; - std::cout << "Traits> --> " - << fit.whoami() << std::endl; - std::cout << "Traits> --> " - << cfit.whoami() << std::endl; - ], - [glibmm_cv_cxx_can_disambiguate_const_template_specializations="yes"], - [glibmm_cv_cxx_can_disambiguate_const_template_specializations="no"] - ) - ]) - - if test "x${glibmm_cv_cxx_can_disambiguate_const_template_specializations}" = "xyes"; then - { - AC_DEFINE([GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS],[1], [Defined if the compiler does not find it ambiguous to have both const and non-const template specializations]) - } - fi -]) - - - -## GLIBMM_CXX_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION() -## -## Check whether the compiler allows us to define a template that uses -## dynamic_cast<> with an object whose type is not defined, -## even if we do not use that template before we have defined the type. -## This should probably not be allowed anyway. -## -AC_DEFUN([GLIBMM_CXX_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION], -[ - AC_CACHE_CHECK( - [whether the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined], - [glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition], - [ - AC_TRY_COMPILE( - [ - class SomeClass; - - SomeClass* some_function(); - - template - class SomeTemplate - { - static bool do_something() - { - //This does not compile, with the MipsPro (IRIX) compiler - //even if we don't use this template at all. - //(We would use it later, after we have defined the type). - return dynamic_cast(some_function()); - } - }; - - ],[ - - ], - [glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition="yes"], - [glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition="no"] - ) - ]) - - if test "x${glibmm_cv_cxx_can_use_dynamic_cast_in_unused_template_without_definition}" = "xyes"; then - { - AC_DEFINE([GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION],[1], [Defined if the compiler allows us to define a template that uses dynamic_cast<> with an object whose type is not yet defined.]) - } - fi -]) - - -## GLIBMM_CXX_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS() -## -## Check whether the compiler allows us to use a non-extern "C" function, -## such as a static member function, to an extern "C" function pointer, -## such as a GTK+ callback. -## This should not be allowed anyway. -## -AC_DEFUN([GLIBMM_CXX_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS], -[ - AC_CACHE_CHECK( - [whether the the compilerallows us to use a non-extern "C" function for an extern "C" function pointer.], - [glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks], - [ - AC_TRY_COMPILE( - [ - extern "C" - { - struct somestruct - { - void (*callback) (int); - }; - - } // extern "C" - - void somefunction(int) - { - } - - ],[ - somestruct something; - something.callback = &somefunction; - ], - [glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks="yes"], - [glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks="no"] - ) - ]) - - if test "x${glibmm_cv_cxx_can_assign_non_extern_c_functions_to_extern_c_callbacks}" = "xyes"; then - { - AC_DEFINE([GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS],[1], [Defined if the compiler allows us to use a non-extern "C" function for an extern "C" function pointer.]) - } - fi -]) - -## GLIBMM_CXX_CAN_USE_NAMESPACES_INSIDE_EXTERNC() -## -## Check whether the compiler puts extern "C" functions in the global namespace, -## even inside a namespace declaration. The AIX xlC compiler does this, and also -## gets confused if we declare the namespace again inside the extern "C" block. -## This seems like a compiler bug, but not a serious one. -## -AC_DEFUN([GLIBMM_CXX_CAN_USE_NAMESPACES_INSIDE_EXTERNC], -[ - AC_CACHE_CHECK( - [whether the compiler uses namespace declarations inside extern "C" blocks.], - [glibmm_cv_cxx_can_use_namespaces_inside_externc], - [ - AC_TRY_COMPILE( - [ - namespace test - { - - extern "C" - { - - void do_something(); - - } //extern C - - - class Something - { - protected: - int i; - - friend void do_something(); - }; - - void do_something() - { - Something something; - something.i = 1; - } - - } //namespace - - - ],[ - - ], - [glibmm_cv_cxx_can_use_namespaces_inside_externc="yes"], - [glibmm_cv_cxx_can_use_namespaces_inside_externc="no"] - ) - ]) - - if test "x${glibmm_cv_cxx_can_use_namespaces_inside_externc}" = "xyes"; then - { - AC_DEFINE([GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC],[1], [Defined if the compiler whether the compiler uses namespace declarations inside extern "C" blocks.]) - } - fi -]) - - diff --git a/libs/glibmm2/scripts/cxx_std.m4 b/libs/glibmm2/scripts/cxx_std.m4 deleted file mode 100644 index cb64fd4afe..0000000000 --- a/libs/glibmm2/scripts/cxx_std.m4 +++ /dev/null @@ -1,195 +0,0 @@ -cv_cxx_has_namespace_std -## GLIBMM_CXX_HAS_NAMESPACE_STD() -## -## Test whether libstdc++ declares namespace std. For safety, -## also check whether several randomly selected STL symbols -## are available in namespace std. -## -## On success, #define GLIBMM_HAVE_NAMESPACE_STD to 1. -## -AC_DEFUN([GLIBMM_CXX_HAS_NAMESPACE_STD], -[ - AC_CACHE_CHECK( - [whether C++ library symbols are declared in namespace std], - [gtkmm_cv_cxx_has_namespace_std], - [ - AC_TRY_COMPILE( - [ - #include - #include - #include - #include - ],[ - using std::min; - using std::find; - using std::copy; - using std::bidirectional_iterator_tag; - using std::string; - using std::istream; - using std::cout; - ], - [gtkmm_cv_cxx_has_namespace_std="yes"], - [gtkmm_cv_cxx_has_namespace_std="no"] - ) - ]) - - if test "x${gtkmm_cv_cxx_has_namespace_std}" = "xyes"; then - { - AC_DEFINE([GLIBMM_HAVE_NAMESPACE_STD],[1], [Defined when the libstdc++ declares the std-namespace]) - } - fi -]) - - -## GLIBMM_CXX_HAS_STD_ITERATOR_TRAITS() -## -## Check for standard-conform std::iterator_traits<>, and -## #define GLIBMM_HAVE_STD_ITERATOR_TRAITS on success. -## -AC_DEFUN([GLIBMM_CXX_HAS_STD_ITERATOR_TRAITS], -[ - AC_REQUIRE([GLIBMM_CXX_HAS_NAMESPACE_STD]) - - AC_CACHE_CHECK( - [whether the C++ library supports std::iterator_traits], - [gtkmm_cv_cxx_has_std_iterator_traits], - [ - AC_TRY_COMPILE( - [ - #include - #ifdef GLIBMM_HAVE_NAMESPACE_STD - using namespace std; - #endif - ],[ - typedef iterator_traits::value_type ValueType; - ], - [gtkmm_cv_cxx_has_std_iterator_traits="yes"], - [gtkmm_cv_cxx_has_std_iterator_traits="no"] - ) - ]) - - if test "x${gtkmm_cv_cxx_has_std_iterator_traits}" = "xyes"; then - { - AC_DEFINE([GLIBMM_HAVE_STD_ITERATOR_TRAITS],[1], [Defined if std::iterator_traits<> is standard-conforming]) - } - fi -]) - - -## GLIBMM_CXX_HAS_SUN_REVERSE_ITERATOR() -## -## Check for Sun libCstd style std::reverse_iterator, -## and #define GLIBMM_HAVE_SUN_REVERSE_ITERATOR if found. -## -AC_DEFUN([GLIBMM_CXX_HAS_SUN_REVERSE_ITERATOR], -[ - AC_REQUIRE([GLIBMM_CXX_HAS_NAMESPACE_STD]) - - AC_CACHE_CHECK( - [for non-standard Sun libCstd reverse_iterator], - [gtkmm_cv_cxx_has_sun_reverse_iterator], - [ - AC_TRY_COMPILE( - [ - #include - #ifdef GLIBMM_HAVE_NAMESPACE_STD - using namespace std; - #endif - ],[ - typedef reverse_iterator ReverseIter; - ], - [gtkmm_cv_cxx_has_sun_reverse_iterator="yes"], - [gtkmm_cv_cxx_has_sun_reverse_iterator="no"] - ) - ]) - - if test "x${gtkmm_cv_cxx_has_sun_reverse_iterator}" = "xyes"; then - { - AC_DEFINE([GLIBMM_HAVE_SUN_REVERSE_ITERATOR],[1], [Defined if std::reverse_iterator is in Sun libCstd style]) - } - fi -]) - - -## GLIBMM_CXX_HAS_TEMPLATE_SEQUENCE_CTORS() -## -## Check whether the STL containers have templated sequence ctors, -## and #define GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS on success. -## -AC_DEFUN([GLIBMM_CXX_HAS_TEMPLATE_SEQUENCE_CTORS], -[ - AC_REQUIRE([GLIBMM_CXX_HAS_NAMESPACE_STD]) - - AC_CACHE_CHECK( - [whether STL containers have templated sequence constructors], - [gtkmm_cv_cxx_has_template_sequence_ctors], - [ - AC_TRY_COMPILE( - [ - #include - #include - #include - #ifdef GLIBMM_HAVE_NAMESPACE_STD - using namespace std; - #endif - ],[ - const int array[8] = { 0, }; - vector test_vector (&array[0], &array[8]); - deque test_deque (test_vector.begin(), test_vector.end()); - list test_list (test_deque.begin(), test_deque.end()); - test_vector.assign(test_list.begin(), test_list.end()); - ], - [gtkmm_cv_cxx_has_template_sequence_ctors="yes"], - [gtkmm_cv_cxx_has_template_sequence_ctors="no"] - ) - ]) - - if test "x${gtkmm_cv_cxx_has_template_sequence_ctors}" = "xyes"; then - { - AC_DEFINE([GLIBMM_HAVE_TEMPLATE_SEQUENCE_CTORS],[1], [Defined if the STL containers have templated sequence ctors]) - } - fi -]) - -## GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS() -## -## Check whether the a static member variable may be initialized inline to std::string::npos. -## The MipsPro (IRIX) compiler does not like this. -## and #define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS on success. -## -AC_DEFUN([GLIBMM_CXX_ALLOWS_STATIC_INLINE_NPOS], -[ - AC_REQUIRE([GLIBMM_CXX_HAS_NAMESPACE_STD]) - - AC_CACHE_CHECK( - [whether the compiler allows a static member variable to be initialized inline to std::string::npos], - [gtkmm_cv_cxx_has_allows_static_inline_npos], - [ - AC_TRY_COMPILE( - [ - #include - #include - - class ustringtest - { - public: - //The MipsPro compiler (IRIX) says "The indicated constant value is not known", - //so we need to initalize the static member data elsewhere. - static const std::string::size_type ustringnpos = std::string::npos; - }; - ],[ - std::cout << "npos=" << ustringtest::ustringnpos << std::endl; - ], - [gtkmm_cv_cxx_has_allows_static_inline_npos="yes"], - [gtkmm_cv_cxx_has_allows_static_inline_npos="no"] - ) - ]) - - if test "x${gtkmm_cv_cxx_has_allows_static_inline_npos}" = "xyes"; then - { - AC_DEFINE([GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS],[1], [Defined if a static member variable may be initialized inline to std::string::npos]) - } - fi -]) - - diff --git a/libs/glibmm2/scripts/docgen.m4 b/libs/glibmm2/scripts/docgen.m4 deleted file mode 100644 index 8a04aaaab7..0000000000 --- a/libs/glibmm2/scripts/docgen.m4 +++ /dev/null @@ -1,75 +0,0 @@ - -## GTKMM_DOXYGEN_INPUT_SUBDIRS(subdirectory list) -## -AC_DEFUN([GTKMM_DOXYGEN_INPUT_SUBDIRS], -[ -GTKMM_DOXYGEN_INPUT= -gtkmm_srcdir=`cd "$srcdir" >/dev/null && pwd` - -gtkmm_list="$@" -for gtkmm_sublib in $gtkmm_list -do - GTKMM_DOXYGEN_INPUT="$GTKMM_DOXYGEN_INPUT ${gtkmm_srcdir}/${gtkmm_sublib}/${gtkmm_sublib}mm/" -done - -AC_SUBST(GTKMM_DOXYGEN_INPUT) -]) - - -## GTKMM_ARG_ENABLE_FULLDOCS() -## -## Check whether to build the full docs into the generated source. If yes, -## set GTKMMPROC_MERGECDOCS='--mergecdocs', which will be passed to gtkmmproc -## (in build_shared/Makefile_gensrc.am_fragment). This will be much slower. -## -AC_DEFUN([GTKMM_ARG_ENABLE_FULLDOCS], -[ -AC_REQUIRE([GLIBMM_CHECK_PERL]) - -AC_MSG_CHECKING([[whether to merge C reference docs into generated headers]]) - -AC_ARG_ENABLE([fulldocs], - [ --enable-fulldocs Generate fully-documented reference docs, takes - longer to build. [[default=enabled for CVS builds]]], - [gtkmm_enable_fulldocs=$enableval], - [gtkmm_enable_fulldocs=$USE_MAINTAINER_MODE]) - -AC_MSG_RESULT([${gtkmm_enable_fulldocs}]) - -GTKMMPROC_MERGECDOCS= - -if test "x$gtkmm_enable_fulldocs" = xyes; then -{ - GTKMMPROC_MERGECDOCS='--mergecdocs' - - if test "x$USE_MAINTAINER_MODE" != xyes; then - { - AC_MSG_WARN([[ -*** --enable-fulldocs only works if --enable-maintainer-mode is also set. -*** gtkmm source tarballs should be packaged with --enable-fulldocs, so -*** usually you don't need this option unless you got gtkmm from CVS. -]]) - } - fi - - AC_CACHE_CHECK( - [whether the XML::Parser module is available], - [gtkmm_cv_have_xml_parser], - [ - gtkmm_cv_have_xml_parser=no - "$PERL_PATH" -e 'use strict; use XML::Parser; exit 0;' >&5 2>&5 && gtkmm_cv_have_xml_parser=yes - ]) - - if test "x$gtkmm_cv_have_xml_parser" = xno; then - { - AC_MSG_ERROR([[ -*** The Perl module XML::Parser is required to build $PACKAGE from CVS. -]]) - } - fi -} -fi - -AC_SUBST(GTKMMPROC_MERGECDOCS) -]) - diff --git a/libs/glibmm2/scripts/glibmm_check_perl.m4 b/libs/glibmm2/scripts/glibmm_check_perl.m4 deleted file mode 100644 index 62519e5c43..0000000000 --- a/libs/glibmm2/scripts/glibmm_check_perl.m4 +++ /dev/null @@ -1,54 +0,0 @@ -dnl -dnl Some macros needed for autoconf -dnl - - -## GLIBMM_CV_PERL_VERSION(version) -## -## Helper macro of GLIBMM_CHECK_PERL(). It generates a cache variable -## name that includes the version number, in order to avoid clashes. -## -AC_DEFUN([GLIBMM_CV_PERL_VERSION],[glibmm_cv_perl_version_[]m4_translit([$1],[.${}],[____])]) - - -## GLIBMM_CHECK_PERL(version) -## -## Check for Perl >= version and set PERL_PATH. If Perl is not found -## and maintainer-mode is enabled, abort with an error message. If not -## in maintainer-mode, set PERL_PATH=perl on failure. -## -AC_DEFUN([GLIBMM_CHECK_PERL], -[ - glibmm_perl_result=no - - AC_PATH_PROGS([PERL_PATH], [perl perl5], [not found]) - - if test "x$PERL_PATH" != "xnot found"; then - { - AC_CACHE_CHECK( - [whether Perl is new enough], - GLIBMM_CV_PERL_VERSION([$1]), - [ - ]GLIBMM_CV_PERL_VERSION([$1])[=no - "$PERL_PATH" -e "require v$1; exit 0;" >/dev/null 2>&1 && ]GLIBMM_CV_PERL_VERSION([$1])[=yes - ]) - test "x${GLIBMM_CV_PERL_VERSION([$1])}" = xyes && glibmm_perl_result=yes - } - else - { - # Make sure we have something sensible, even if it doesn't work. - PERL_PATH=perl - } - fi - - if test "x$glibmm_perl_result" = xno && test "x$USE_MAINTAINER_MODE" = xyes; then - { - AC_MSG_ERROR([[ -*** Perl >= ]$1[ is required for building $PACKAGE in maintainer-mode. -]]) - } - fi - - AC_SUBST([PERL_PATH]) -]) - diff --git a/libs/glibmm2/scripts/reduced.m4 b/libs/glibmm2/scripts/reduced.m4 deleted file mode 100644 index 9411a57824..0000000000 --- a/libs/glibmm2/scripts/reduced.m4 +++ /dev/null @@ -1,106 +0,0 @@ -## GLIBMM_ARG_ENABLE_API_PROPERTIES() -## -## Provide the --enable-api-properties configure argument, enabled -## by default. -## -AC_DEFUN([GLIBMM_ARG_ENABLE_API_PROPERTIES], -[ - AC_ARG_ENABLE([api-properties], - [ --enable-api-properties Build properties API. - [[default=yes]]], - [glibmm_enable_api_properties="$enableval"], - [glibmm_enable_api_properties='yes']) - - if test "x$glibmm_enable_api_properties" = "xyes"; then - { - AC_DEFINE([GLIBMM_PROPERTIES_ENABLED],[1], [Defined when the --enable-api-properties configure argument was given]) - } - fi -]) - -## GLIBMM_ARG_ENABLE_API_VFUNCS() -## -## Provide the --enable-api-vfuncs configure argument, enabled -## by default. -## -AC_DEFUN([GLIBMM_ARG_ENABLE_API_VFUNCS], -[ - AC_ARG_ENABLE([api-vfuncs], - [ --enable-api-vfuncs Build vfuncs API. - [[default=yes]]], - [glibmm_enable_api_vfuncs="$enableval"], - [glibmm_enable_api_vfuncs='yes']) - - if test "x$glibmm_enable_api_vfuncs" = "xyes"; then - { - AC_DEFINE([GLIBMM_VFUNCS_ENABLED],[1], [Defined when the --enable-api-vfuncs configure argument was given]) - } - fi -]) - -## GLIBMM_ARG_ENABLE_API_EXCEPTIONS() -## -## Provide the --enable-api-exceptions configure argument, enabled -## by default. -## -AC_DEFUN([GLIBMM_ARG_ENABLE_API_EXCEPTIONS], -[ - AC_ARG_ENABLE([api-exceptions], - [ --enable-api-exceptions Build exceptions API. - [[default=yes]]], - [glibmm_enable_api_exceptions="$enableval"], - [glibmm_enable_api_exceptions='yes']) - - if test "x$glibmm_enable_api_exceptions" = "xyes"; then - { - AC_DEFINE([GLIBMM_EXCEPTIONS_ENABLED],[1], [Defined when the --enable-api-exceptions configure argument was given]) - } - fi -]) - -## GLIBMM_ARG_ENABLE_API_DEPRECATED() -## -## Provide the --enable-deprecated-api configure argument, enabled -## by default. -## -AC_DEFUN([GLIBMM_ARG_ENABLE_API_DEPRECATED], -[ - AC_ARG_ENABLE(deprecated-api, - [ --enable-deprecated-api Include (build) deprecated API in the libraries. - [[default=yes]]], - [glibmm_enable_api_deprecated="$enableval"], - [glibmm_enable_api_deprecated='yes']) - - if test "x$glibmm_enable_api_deprecated" = "xyes"; then - { - AC_MSG_WARN([Deprecated API will be built, for backwards-compatibility.]) - } - else - { - AC_MSG_WARN([Deprecated API will not be built, breaking backwards-compatibility. Do not use this build for distribution packages.]) - DISABLE_DEPRECATED_API_CFLAGS="-DGLIBMM_DISABLE_DEPRECATED" - AC_SUBST(DISABLE_DEPRECATED_API_CFLAGS) - } - fi -]) - - -## GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS() -## -## Provide the --enable-api-default-signal-handlers configure argument, enabled -## by default. -## -AC_DEFUN([GLIBMM_ARG_ENABLE_API_DEFAULT_SIGNAL_HANDLERS], -[ - AC_ARG_ENABLE([api-default-signal-handlers], - [ --enable-api-default-signal-handlers Build default signal handlers API. - [[default=yes]]], - [glibmm_enable_api_default_signal_handlers="$enableval"], - [glibmm_enable_api_default_signal_handlers='yes']) - - if test "x$glibmm_enable_api_default_signal_handlers" = "xyes"; then - { - AC_DEFINE([GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED],[1], [Defined when the --enable-api-default-signal-handlers configure argument was given]) - } - fi -]) diff --git a/libs/glibmm2/scripts/sun.m4 b/libs/glibmm2/scripts/sun.m4 deleted file mode 100644 index 6b8950f798..0000000000 --- a/libs/glibmm2/scripts/sun.m4 +++ /dev/null @@ -1,15 +0,0 @@ -AC_DEFUN([GLIBMM_PROG_CXX_SUN], - [AC_CACHE_CHECK(whether we are using SUN CC compiler, ac_cv_prog_sun_cxx, - [if AC_TRY_COMMAND(${CXX-g++} -V 2>&1) | egrep "Sun WorkShop" >/dev/null 2>&1; then - ac_cv_prog_sun_cxx=yes - else - ac_cv_prog_sun_cxx=no - fi] - )] - - if test "x${ac_cv_prog_sun_cxx}" = "xyes"; then - { - AC_DEFINE([GLIBMM_COMPILER_SUN_FORTE],[1], [Defined when the SUN Forte C++ compiler is being used.]) - } - fi -) diff --git a/libs/glibmm2/stamp-h1 b/libs/glibmm2/stamp-h1 deleted file mode 100644 index 4547fe1b5e..0000000000 --- a/libs/glibmm2/stamp-h1 +++ /dev/null @@ -1 +0,0 @@ -timestamp for config.h diff --git a/libs/glibmm2/tests/Makefile.in b/libs/glibmm2/tests/Makefile.in index 44bf1f9a25..78b4677d0d 100644 --- a/libs/glibmm2/tests/Makefile.in +++ b/libs/glibmm2/tests/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -38,8 +34,8 @@ host_triplet = @host@ subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -55,17 +51,18 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -103,12 +100,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -122,13 +119,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -138,27 +132,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -170,28 +155,39 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ test_dirs = glibmm_value SUBDIRS = $(test_dirs) EXTRA_DIST = Makefile.am_fragment @@ -234,10 +230,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -269,8 +261,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -371,22 +362,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -400,7 +390,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -408,6 +398,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -447,8 +439,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -462,12 +453,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -486,22 +485,24 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libs/glibmm2/tests/glibmm_value/Makefile.in b/libs/glibmm2/tests/glibmm_value/Makefile.in index b9dfabcce2..0724cd1466 100644 --- a/libs/glibmm2/tests/glibmm_value/Makefile.in +++ b/libs/glibmm2/tests/glibmm_value/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -41,8 +37,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ noinst_PROGRAMS = test$(EXEEXT) subdir = tests/glibmm_value ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \ + $(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \ $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/glibmm_check_perl.m4 \ $(top_srcdir)/scripts/macros.m4 \ @@ -58,25 +54,24 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_OBJECTS = main.$(OBJEXT) glibmm_value.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) test_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/glib +DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(top_builddir)/glib@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(test_SOURCES) DIST_SOURCES = $(test_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -114,12 +109,12 @@ GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ GLIBMM_RELEASE = @GLIBMM_RELEASE@ GLIBMM_VERSION = @GLIBMM_VERSION@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -133,13 +128,10 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -149,27 +141,18 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -181,28 +164,39 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ INCLUDES = \ -I$(top_builddir)/glib -I$(top_srcdir)/glib \ $(GLIBMM_CFLAGS) $(GTHREAD_CFLAGS) @@ -250,7 +244,7 @@ clean-noinstPROGRAMS: done test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) @rm -f test$(EXEEXT) - $(CXXLINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) + $(CXXLINK) $(test_OBJECTS) $(test_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -262,22 +256,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -288,10 +282,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -341,23 +331,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../tests - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -405,7 +393,7 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -419,12 +407,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -445,19 +441,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstPROGRAMS ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am + pdf pdf-am ps ps-am tags uninstall uninstall-am $(GLIBMM_LIBS) # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libs/glibmm2/tools/Makefile b/libs/glibmm2/tools/Makefile deleted file mode 100644 index a62cca1c1f..0000000000 --- a/libs/glibmm2/tools/Makefile +++ /dev/null @@ -1,558 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# tools/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = . -top_srcdir = .. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/generate_wrap_init.pl.in $(srcdir)/gmmproc.in \ - $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment \ - $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment \ - $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment \ - TODO -subdir = tools -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = gmmproc generate_wrap_init.pl -am__installdirs = "$(DESTDIR)$(gmmproc_bindir)" -gmmproc_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(gmmproc_bin_SCRIPTS) -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -files_tools_m4 = base.m4 class_shared.m4 class_boxedtype.m4 class_boxedtype_static.m4 \ - class_generic.m4 class_gobject.m4 class_gtkobject.m4 \ - class_interface.m4 class_opaque_refcounted.m4 class_opaque_copyable.m4 \ - gerror.m4 \ - compare.m4 convert.m4 convert_base.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ - convert_glib.m4 convert_gtk.m4 convert_pango.m4 ctor.m4 doc.m4 enum.m4 list.m4 member.m4 \ - method.m4 property.m4 signal.m4 vfunc.m4 - -files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm -files_tools_genwrap = generate_wrap_init.pl -files_tools_perl = $(files_tools_genwrap) gmmproc.in -SUBDIRS = m4 pm extra_defs_gen -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_perl) README TODO enum.pl -gmmproc_bin_SCRIPTS = gmmproc $(files_tools_genwrap) -gmmproc_bindir = $(libdir)/glibmm-2.4/proc -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -gmmproc: $(top_builddir)/config.status $(srcdir)/gmmproc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -generate_wrap_init.pl: $(top_builddir)/config.status $(srcdir)/generate_wrap_init.pl.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-gmmproc_binSCRIPTS: $(gmmproc_bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(gmmproc_bindir)" || $(mkdir_p) "$(DESTDIR)$(gmmproc_bindir)" - @list='$(gmmproc_bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(gmmproc_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(gmmproc_bindir)/$$f'"; \ - $(gmmproc_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(gmmproc_bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-gmmproc_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(gmmproc_bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(gmmproc_bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(gmmproc_bindir)/$$f"; \ - done - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../tools $(distdir)/../tools/m4 $(distdir)/../tools/pm - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(SCRIPTS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(gmmproc_bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-gmmproc_binSCRIPTS - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-gmmproc_binSCRIPTS uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-gmmproc_binSCRIPTS install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-gmmproc_binSCRIPTS \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/tools/Makefile.am b/libs/glibmm2/tools/Makefile.am deleted file mode 100644 index cbe60fe9b0..0000000000 --- a/libs/glibmm2/tools/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -include $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment - -SUBDIRS = m4 pm extra_defs_gen - -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_perl) README TODO enum.pl - -gmmproc_bin_SCRIPTS = gmmproc $(files_tools_genwrap) -gmmproc_bindir = $(libdir)/glibmm-2.4/proc - - diff --git a/libs/glibmm2/tools/Makefile_list_of_sources.am_fragment b/libs/glibmm2/tools/Makefile_list_of_sources.am_fragment deleted file mode 100644 index dcdc9ab416..0000000000 --- a/libs/glibmm2/tools/Makefile_list_of_sources.am_fragment +++ /dev/null @@ -1,5 +0,0 @@ -include $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment -include $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment - -files_tools_genwrap = generate_wrap_init.pl -files_tools_perl = $(files_tools_genwrap) gmmproc.in diff --git a/libs/glibmm2/tools/enum.pl b/libs/glibmm2/tools/enum.pl deleted file mode 100644 index 8cc6ff9011..0000000000 --- a/libs/glibmm2/tools/enum.pl +++ /dev/null @@ -1,233 +0,0 @@ -#! /usr/bin/perl - -# The lisp definitions for flags does not include order. -# thus we must extract it ourselves. -# Usage: ./enum.pl /gnome/head/cvs/gconf/gconf/*.h > gconf_enums.defs - -use warnings; - -my %token; -$module="none"; - -while ($ARGV[0] =~ /^--(\S+)/) -{ - shift @ARGV; - $module=shift @ARGV if ($1 eq "module"); - if ($1 eq "help") - { - print "enum.pl [--module modname] header_files ....\n"; - exit 0; - } -} - -foreach $file (@ARGV) -{ - &parse($file); -} - -exit; - - - -# parse enums from C -sub parse -{ - my ($file)=@_; - - $from=0; - open(FILE,$file); - - $enum=0; - $deprecated=0; - $comment=0; - - while() - { - if($comment) - { - # end of multiline comment - $comment = 0 if(/\*\//); - next; - } - - $deprecated = 1 if(s/^#ifndef [A-Z_]+_DISABLE_DEPRECATED//); - - ++$deprecated if($deprecated > 0 && /^#\s*if/); - --$deprecated if($deprecated > 0 && /^#\s*endif/); - - next if($deprecated > 0); - - # filter single-line comments - s/\/\*.*\*\///g; - - # begin of multiline comment - if(/\/\*/) - { - $comment = 1; - next; - } - - s/','/\%\%COMMA\%\%/; - s/'}'/\%\%RBRACE\%\%/; - if (/^\s*typedef enum/ ) - { - print ";; From $file\n\n" if (!$from); - $from=1; - $enum=1; - next; - } - - if ($enum && /\}/) - { - $enum=0; - &process($line,$_); - $line=""; - } - $line.=$_ if ($enum); - } -} - - -# convert enums to lisp -sub process -{ - my ($line,$def)=@_; - - $def=~s/\s*\}\s*//g; - $def=~s/\s*;\s*$//; - my $c_name=$def; - - $line=~s/\s+/ /g; - $line=~s/\/\*.*\*\///g; - $line=~s/\s*{\s*//; - - my $entity = "enum"; - $c_name =~ /^([A-Z][a-z]*)/; - $module = $1; - $def =~ s/$module//; - - @c_name=(); - @name=(); - @number=(); - - $val=0; - foreach $i (split(/,/,$line)) - { - $i=~s/^\s+//; - $i=~s/\s+$//; - if ($i =~ /^\S+$/) - { - push(@c_name,$i); - push(@number,sprintf("%d",$val)); - $token{$i}=$val; - } - elsif ($i =~ /^(\S+)\s*=\s*(0x[0-9a-fA-F]+)$/ || - $i =~ /^(\S+)\s*=\s*(-?[0-9]+)$/ || - $i =~ /^(\S+)\s*=\s*(1\s*<<\s*[0-9]+)$/ - ) - { - my ($tmp1, $tmp2) = ($1, $2); - push(@c_name, $tmp1); - eval("\$val = $tmp2;"); - $entity = "flags" if($tmp2 =~ /^1\s*< - -int main (int, char**) -{ - //glib_init(&argc, &argv); - - //std::cout << get_defs( ATK_TYPE_HYPERLINK ) - - std::cout << "No glib types were examined."; - - return 0; -} diff --git a/libs/glibmm2/tools/extra_defs_gen/generate_extra_defs.cc b/libs/glibmm2/tools/extra_defs_gen/generate_extra_defs.cc deleted file mode 100644 index 3df442ab12..0000000000 --- a/libs/glibmm2/tools/extra_defs_gen/generate_extra_defs.cc +++ /dev/null @@ -1,217 +0,0 @@ -/* $Id: generate_extra_defs.cc,v 1.3 2005/02/13 14:30:19 murrayc Exp $ */ - -/* generate_extra_defs.cc - * - * Copyright (C) 2001 The Free Software Foundation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -#include "generate_extra_defs.h" - -std::string get_properties(GType gtype) -{ - std::string strResult; - std::string strObjectName = g_type_name(gtype); - - //Get the list of properties: - GObjectClass* pGClass = G_OBJECT_CLASS(g_type_class_ref(gtype)); - - guint iCount = 0; - GParamSpec** ppParamSpec = g_object_class_list_properties (pGClass, &iCount); - - for(guint i = 0; i < iCount; i++) - { - GParamSpec* pParamSpec = ppParamSpec[i]; - if(pParamSpec) - { - //Name and type: - std::string strName = g_param_spec_get_name(pParamSpec); - std::string strTypeName = G_PARAM_SPEC_TYPE_NAME(pParamSpec); - - const gchar* pchBlurb = g_param_spec_get_blurb(pParamSpec); - std::string strDocs = (pchBlurb ? pchBlurb : std::string()); - - strResult += "(define-property " + strName + "\n"; - strResult += " (of-object \"" + strObjectName + "\")\n"; - strResult += " (prop-type \"" + strTypeName + "\")\n"; - strResult += " (docs \"" + strDocs + "\")\n"; - - //Flags: - GParamFlags flags = pParamSpec->flags; - bool bReadable = (flags & G_PARAM_READABLE) == G_PARAM_READABLE; - bool bWritable = (flags & G_PARAM_WRITABLE) == G_PARAM_WRITABLE; - bool bConstructOnly = (flags & G_PARAM_CONSTRUCT_ONLY) == G_PARAM_CONSTRUCT_ONLY; - - //#t and #f aren't documented, but I guess that it's correct based on the example in the .defs spec. - const std::string strTrue = "#t"; - const std::string strFalse = "#f"; - - strResult += " (readable " + (bReadable ? strTrue : strFalse) + ")\n"; - strResult += " (writable " + (bWritable ? strTrue : strFalse) + ")\n"; - strResult += " (construct-only " + (bConstructOnly ? strTrue : strFalse) + ")\n"; - - strResult += ")\n\n"; //close (define-property - } - } - - g_free(ppParamSpec); - g_type_class_unref(pGClass); //to match the g_type_class_ref() above. - - return strResult; -} - -std::string get_type_name(GType gtype) //Adds a * if necessary. -{ - std::string strTypeName = g_type_name(gtype); - - if( g_type_is_a(gtype, G_TYPE_OBJECT) || g_type_is_a(gtype, G_TYPE_BOXED) ) - strTypeName += "*"; //Add * to show that it's a pointer. - else if( g_type_is_a(gtype, G_TYPE_STRING) ) - strTypeName = "gchar*"; //g_type_name() returns "gchararray". - - return strTypeName; -} - -std::string get_type_name_parameter(GType gtype) -{ - std::string strTypeName = get_type_name(gtype); - - //All signal parameters that are registered as GTK_TYPE_STRING are actually const gchar*. - if(strTypeName == "gchar*") - strTypeName = "const-gchar*"; - - return strTypeName; -} - -std::string get_type_name_signal(GType gtype) -{ - return get_type_name_parameter(gtype); //At the moment, it needs the same stuff. -} - - -std::string get_signals(GType gtype) -{ - std::string strResult; - std::string strObjectName = g_type_name(gtype); - - gpointer gclass_ref = 0; - - if(G_TYPE_IS_OBJECT(gtype)) - gclass_ref = g_type_class_ref(gtype); //Ensures that class_init() is called. - - //Get the list of signals: - guint iCount = 0; - guint* pIDs = g_signal_list_ids (gtype, &iCount); - - //Loop through the list of signals: - if(pIDs) - { - for(guint i = 0; i < iCount; i++) - { - guint signal_id = pIDs[i]; - - //Name: - std::string strName = g_signal_name(signal_id); - strResult += "(define-signal " + strName + "\n"; - strResult += " (of-object \"" + strObjectName + "\")\n"; - - - - //Other information about the signal: - GSignalQuery signalQuery = { 0, 0, 0, GSignalFlags(0), 0, 0, 0, }; - g_signal_query(signal_id, &signalQuery); - - //Return type: - std::string strReturnTypeName = get_type_name_signal( signalQuery.return_type & ~G_SIGNAL_TYPE_STATIC_SCOPE ); //The type is mangled with a flag. Hacky. - //bool bReturnTypeHasStaticScope = (signalQuery.return_type & G_SIGNAL_TYPE_STATIC_SCOPE) == G_SIGNAL_TYPE_STATIC_SCOPE; - strResult += " (return-type \"" + strReturnTypeName + "\")\n"; - - - //When: - { - bool bWhenFirst = (signalQuery.signal_flags & G_SIGNAL_RUN_FIRST) == G_SIGNAL_RUN_FIRST; - bool bWhenLast = (signalQuery.signal_flags & G_SIGNAL_RUN_LAST) == G_SIGNAL_RUN_LAST; - - std::string strWhen = "unknown"; - - if(bWhenFirst && bWhenLast) - strWhen = "both"; - else if(bWhenFirst) - strWhen = "first"; - else if(bWhenLast) - strWhen = "last"; - - strResult += " (when \"" + strWhen + "\")\n"; - } - - - //Loop through the list of parameters: - const GType* pParameters = signalQuery.param_types; - if(pParameters) - { - strResult += " (parameters\n"; - - for(unsigned i = 0; i < signalQuery.n_params; i++) - { - GType typeParamMangled = pParameters[i]; - - //Parameter name: - //TODO: How can we get the real parameter name? - gchar* pchNum = g_strdup_printf("%d", i); - std::string strParamName = "p" + std::string(pchNum); - g_free(pchNum); - pchNum = 0; - - //Just like above, for the return type: - std::string strTypeName = get_type_name_signal( typeParamMangled & ~G_SIGNAL_TYPE_STATIC_SCOPE ); //The type is mangled with a flag. Hacky. - //bool bReturnTypeHasStaticScope = (typeParamMangled & G_SIGNAL_TYPE_STATIC_SCOPE) == G_SIGNAL_TYPE_STATIC_SCOPE; - - strResult += " '(\"" + strTypeName + "\" \"" + strParamName + "\")\n"; - } - - strResult += " )\n"; //close (properties - } - - strResult += ")\n\n"; //close (define=signal - } - } - - g_free(pIDs); - - if(gclass_ref) - g_type_class_unref(gclass_ref); //to match the g_type_class_ref() above. - - return strResult; -} - - - -std::string get_defs(GType gtype) -{ - std::string strObjectName = g_type_name(gtype); - std::string strDefs = ";; From " + strObjectName + "\n\n"; - - strDefs += get_signals(gtype); - - if(G_TYPE_IS_OBJECT(gtype)) - strDefs += get_properties(gtype); - - return strDefs; -} - - - diff --git a/libs/glibmm2/tools/generate_wrap_init.pl b/libs/glibmm2/tools/generate_wrap_init.pl deleted file mode 100644 index 2f295ac7a3..0000000000 --- a/libs/glibmm2/tools/generate_wrap_init.pl +++ /dev/null @@ -1,392 +0,0 @@ -#! /usr/bin/perl -# -# tools/generate_wrap_init.pl. Generated from generate_wrap_init.pl.in by configure. -# - -use strict; - -my @namespace_whole = (); # list of strings. -my $function_prefix = ""; -my $parent_dir = ""; # e.g. gtkmm -my $path = "gtk--"; -my $debug = 0; -my @filenames_headers = (); -my %objects = (); -my %exceptions = (); -my %namespaces = (); # hashmap of lists of strings. -my %basenames = (); -my %win32_nowrap = (); -my %deprecated = (); - -# Loop through command line arguments, setting variables: -while ($ARGV[0] =~ /^-/) -{ - if ($ARGV[0] =~ /--namespace=(\S+)/) - { - push(@namespace_whole, $1); - - if($parent_dir eq "") - { $parent_dir = lc($1) . "mm"; } - } - elsif ($ARGV[0] =~ /--function_prefix=(\S+)/) - { - $function_prefix = "$1"; - } - elsif ($ARGV[0] =~ /--parent_dir=(\S+)/) - { - $parent_dir = "$1"; - } - elsif - ( - $ARGV[0] =~ /--debug/) {$debug = 1; - } - elsif ($ARGV[0] =~ /--path=(\S+)/) - { - $path = "$1"; - } - else - { - print "Error: unknown option $ARGV[0]\n"; - exit; - } - - shift @ARGV; -} - - - -while ($ARGV[0]) -{ - if ($debug) {warn "Processing file : $ARGV[0]\n";} - - my $filename = $ARGV[0]; - open FILE, $filename or die "Couldn't open file $ARGV[0] : $!\n"; - - # my $file = $ARGV[0]; - # $file =~ s/.*\/([^\/]+)$/$1/; - # $file =~ s/\.hg//; - my @tmpnamespace = @namespace_whole; - my $cppname = ""; - my $cname = ""; - my $ccast = ""; - while () - { - if (/CLASS_START\((\w+)\)/) #We need a new way to get the namespace. - { - print "generate_wrap_init: namespace found: $1\n"; - push(@tmpnamespace, $1); - } - elsif (/_CLASS_GOBJECT\s*\(/) #TODO: There is duplication of code here. - { - my $line = $_; - while ($line !~ /\)/ && ($_ = )) - { - $line .= $_; - } - - $line =~ s/^.*_CLASS_GOBJECT\s*\(//; - $line =~ s/\s+//g; - ($cppname, $cname, $ccast) = split(/,/, $line); - - $objects{$cppname} = $cname; - @{$namespaces{$cppname}} = ( @tmpnamespace ); #both are lists of strings - $basenames{$cppname} = lc($ccast); - } - elsif (/_CLASS_GTKOBJECT\s*\(/) - { - my $line = $_; - while ($line !~ /\)/ && ($_ = )) - { - $line .= $_; - } - - $line =~ s/^.*_CLASS_GTKOBJECT\s*\(//; - $line =~ s/\s+//g; - ($cppname, $cname, $ccast) = split(/,/, $line); - - #TODO: Remove this hack eventually. - if( ($cname ne "GtkTree") && ($cname ne "GtkTreeItem") && ($cname ne "GtkText") ) - { - $objects{$cppname} = $cname; - @{$namespaces{$cppname}} = ( @tmpnamespace ); #both are lists of strings - $basenames{$cppname} = lc($ccast); - } - } - elsif (/_WRAP_GERROR\s*\(/) #TODO: There is duplication of code here. - { - my $line = $_; - while ($line !~ /\)/ && ($_ = )) - { - $line .= $_; - } - - $line =~ s/^.*_WRAP_GERROR\s*\(//; - $line =~ s/\s+//g; - $line =~ s/\)//; - ($cppname, $cname, $ccast) = split(/,/, $line); - - $exceptions{$cppname} = $cname; - @{$namespaces{$cppname}} = ( @tmpnamespace ); #both are lists of strings - $basenames{$cppname} = lc($ccast); - } - elsif (/_GTKMMPROC_WIN32_NO_WRAP/) - { - $win32_nowrap{$cppname} = 1; - } - elsif (/_DEPRECATED/) - { - $deprecated{$cppname} = 1; - } - } - - # Store header filename so that we can #include it later: - my $filename_header = $filename; - $filename_header =~ s/.*\/([^\/]+)\.hg/$1.h/; - push(@filenames_headers, $filename_header); - - shift @ARGV; - close(FILE); -} - -# my $namespace_whole_lower = lc($namespace_whole); - -print << "EOF"; - -#include - -// Disable the 'const' function attribute of the get_type() functions. -// GCC would optimize them out because we don't use the return value. -#undef G_GNUC_CONST -#define G_GNUC_CONST /* empty */ - -#include <${parent_dir}/wrap_init.h> -#include -#include - -// #include the widget headers so that we can call the get_type() static methods: - -EOF - -foreach( @filenames_headers ) -{ - print "#include \"" . $_ . "\"\n"; -} - -print "\n"; - -# Here we have to be subtle. The gtkmm objects are easy, they all go -# into the Gtk namespace. But in gnomemm, some go into the Gnome -# namespace (most of them), and some into the Gtk one (because the -# corresponding widget is Gtk-prefixed, e.g. GtkTed, GtkDial, etc... - -# First, the Gtk namespace - -print "extern \"C\"\n"; -print "{\n"; -print "\n//Declarations of the *_get_type() functions:\n\n"; - -my $i = 0; -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - print "GType $basenames{$i}_get_type(void);\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -print "\n//Declarations of the *_error_quark() functions:\n\n"; - -my $i = 0; -foreach $i (sort keys %exceptions) -{ - print "GQuark $basenames{$i}_quark(void);\n"; -} - -print "} // extern \"C\"\n"; -print "\n"; - -print "\n//Declarations of the *_Class::wrap_new() methods, instead of including all the private headers:\n\n"; - -my $i = 0; -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - my $namespace_declarations = ""; - my $namespace_close = ""; - foreach ( @{$namespaces{$i}} ) - { - $namespace_declarations .= "namespace $_ { "; - $namespace_close .= " }"; - } - - print "${namespace_declarations} class ${i}_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; ${namespace_close}\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -# print "\n//Declarations of the *Error::throw_func() methods:\n\n"; -# -# my $i = 0; -# foreach $i (sort keys %exceptions) -# { -# my $namespace_declarations = ""; -# my $namespace_close = ""; -# foreach ( @{$namespaces{$i}} ) -# { -# $namespace_declarations .= "namespace $_ { "; -# $namespace_close .= " }"; -# } -# -# print "${namespace_declarations} class ${i} { public: static void throw_func(GError*); }; ${namespace_close}\n"; -# } - -my $namespace_whole_declarations = ""; -my $namespace_whole_close = ""; -foreach( @namespace_whole ) -{ - $namespace_whole_declarations .= "namespace " . $_ ." { "; - $namespace_whole_close = "} //" . $_ . "\n" . $namespace_whole_close; -} - -print "\n"; -print "$namespace_whole_declarations\n"; -print "\n"; -print "void " .$function_prefix . "wrap_init()\n{\n"; - - -# Generate namespace::wrap_init() body -# - -print " // Register Error domains:\n"; - -foreach $i (sort keys %exceptions) -{ - my $namespace_prefix = ""; - foreach( @{$namespaces{$i}} ) - { - $namespace_prefix .= $_ ."::"; - } - - print " Glib::Error::register_domain($basenames{$i}_quark(), &", "${namespace_prefix}${i}::throw_func);\n"; -} - -print "\n"; -print "// Map gtypes to gtkmm wrapper-creation functions:\n"; - -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - my $namespace_prefix = ""; - foreach( @{$namespaces{$i}} ) - { - $namespace_prefix .= $_ ."::"; - } - - print " Glib::wrap_register($basenames{$i}_get_type(), &", "${namespace_prefix}${i}_Class::wrap_new);\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -print "\n"; -print " // Register the gtkmm gtypes:\n"; - -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - my $namespace_prefix = ""; - foreach( @{$namespaces{$i}} ) - { - $namespace_prefix .= $_ ."::"; - } - - print " ${namespace_prefix}${i}::get_type();\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -print << "EOF"; - -} // wrap_init() - -$namespace_whole_close - -EOF - -exit 0; - diff --git a/libs/glibmm2/tools/generate_wrap_init.pl.in b/libs/glibmm2/tools/generate_wrap_init.pl.in deleted file mode 100644 index 202b58742c..0000000000 --- a/libs/glibmm2/tools/generate_wrap_init.pl.in +++ /dev/null @@ -1,392 +0,0 @@ -#! @PERL_PATH@ -# -# @configure_input@ -# - -use strict; - -my @namespace_whole = (); # list of strings. -my $function_prefix = ""; -my $parent_dir = ""; # e.g. gtkmm -my $path = "gtk--"; -my $debug = 0; -my @filenames_headers = (); -my %objects = (); -my %exceptions = (); -my %namespaces = (); # hashmap of lists of strings. -my %basenames = (); -my %win32_nowrap = (); -my %deprecated = (); - -# Loop through command line arguments, setting variables: -while ($ARGV[0] =~ /^-/) -{ - if ($ARGV[0] =~ /--namespace=(\S+)/) - { - push(@namespace_whole, $1); - - if($parent_dir eq "") - { $parent_dir = lc($1) . "mm"; } - } - elsif ($ARGV[0] =~ /--function_prefix=(\S+)/) - { - $function_prefix = "$1"; - } - elsif ($ARGV[0] =~ /--parent_dir=(\S+)/) - { - $parent_dir = "$1"; - } - elsif - ( - $ARGV[0] =~ /--debug/) {$debug = 1; - } - elsif ($ARGV[0] =~ /--path=(\S+)/) - { - $path = "$1"; - } - else - { - print "Error: unknown option $ARGV[0]\n"; - exit; - } - - shift @ARGV; -} - - - -while ($ARGV[0]) -{ - if ($debug) {warn "Processing file : $ARGV[0]\n";} - - my $filename = $ARGV[0]; - open FILE, $filename or die "Couldn't open file $ARGV[0] : $!\n"; - - # my $file = $ARGV[0]; - # $file =~ s/.*\/([^\/]+)$/$1/; - # $file =~ s/\.hg//; - my @tmpnamespace = @namespace_whole; - my $cppname = ""; - my $cname = ""; - my $ccast = ""; - while () - { - if (/CLASS_START\((\w+)\)/) #We need a new way to get the namespace. - { - print "generate_wrap_init: namespace found: $1\n"; - push(@tmpnamespace, $1); - } - elsif (/_CLASS_GOBJECT\s*\(/) #TODO: There is duplication of code here. - { - my $line = $_; - while ($line !~ /\)/ && ($_ = )) - { - $line .= $_; - } - - $line =~ s/^.*_CLASS_GOBJECT\s*\(//; - $line =~ s/\s+//g; - ($cppname, $cname, $ccast) = split(/,/, $line); - - $objects{$cppname} = $cname; - @{$namespaces{$cppname}} = ( @tmpnamespace ); #both are lists of strings - $basenames{$cppname} = lc($ccast); - } - elsif (/_CLASS_GTKOBJECT\s*\(/) - { - my $line = $_; - while ($line !~ /\)/ && ($_ = )) - { - $line .= $_; - } - - $line =~ s/^.*_CLASS_GTKOBJECT\s*\(//; - $line =~ s/\s+//g; - ($cppname, $cname, $ccast) = split(/,/, $line); - - #TODO: Remove this hack eventually. - if( ($cname ne "GtkTree") && ($cname ne "GtkTreeItem") && ($cname ne "GtkText") ) - { - $objects{$cppname} = $cname; - @{$namespaces{$cppname}} = ( @tmpnamespace ); #both are lists of strings - $basenames{$cppname} = lc($ccast); - } - } - elsif (/_WRAP_GERROR\s*\(/) #TODO: There is duplication of code here. - { - my $line = $_; - while ($line !~ /\)/ && ($_ = )) - { - $line .= $_; - } - - $line =~ s/^.*_WRAP_GERROR\s*\(//; - $line =~ s/\s+//g; - $line =~ s/\)//; - ($cppname, $cname, $ccast) = split(/,/, $line); - - $exceptions{$cppname} = $cname; - @{$namespaces{$cppname}} = ( @tmpnamespace ); #both are lists of strings - $basenames{$cppname} = lc($ccast); - } - elsif (/_GTKMMPROC_WIN32_NO_WRAP/) - { - $win32_nowrap{$cppname} = 1; - } - elsif (/_DEPRECATED/) - { - $deprecated{$cppname} = 1; - } - } - - # Store header filename so that we can #include it later: - my $filename_header = $filename; - $filename_header =~ s/.*\/([^\/]+)\.hg/$1.h/; - push(@filenames_headers, $filename_header); - - shift @ARGV; - close(FILE); -} - -# my $namespace_whole_lower = lc($namespace_whole); - -print << "EOF"; - -#include - -// Disable the 'const' function attribute of the get_type() functions. -// GCC would optimize them out because we don't use the return value. -#undef G_GNUC_CONST -#define G_GNUC_CONST /* empty */ - -#include <${parent_dir}/wrap_init.h> -#include -#include - -// #include the widget headers so that we can call the get_type() static methods: - -EOF - -foreach( @filenames_headers ) -{ - print "#include \"" . $_ . "\"\n"; -} - -print "\n"; - -# Here we have to be subtle. The gtkmm objects are easy, they all go -# into the Gtk namespace. But in gnomemm, some go into the Gnome -# namespace (most of them), and some into the Gtk one (because the -# corresponding widget is Gtk-prefixed, e.g. GtkTed, GtkDial, etc... - -# First, the Gtk namespace - -print "extern \"C\"\n"; -print "{\n"; -print "\n//Declarations of the *_get_type() functions:\n\n"; - -my $i = 0; -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - print "GType $basenames{$i}_get_type(void);\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -print "\n//Declarations of the *_error_quark() functions:\n\n"; - -my $i = 0; -foreach $i (sort keys %exceptions) -{ - print "GQuark $basenames{$i}_quark(void);\n"; -} - -print "} // extern \"C\"\n"; -print "\n"; - -print "\n//Declarations of the *_Class::wrap_new() methods, instead of including all the private headers:\n\n"; - -my $i = 0; -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - my $namespace_declarations = ""; - my $namespace_close = ""; - foreach ( @{$namespaces{$i}} ) - { - $namespace_declarations .= "namespace $_ { "; - $namespace_close .= " }"; - } - - print "${namespace_declarations} class ${i}_Class { public: static Glib::ObjectBase* wrap_new(GObject*); }; ${namespace_close}\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -# print "\n//Declarations of the *Error::throw_func() methods:\n\n"; -# -# my $i = 0; -# foreach $i (sort keys %exceptions) -# { -# my $namespace_declarations = ""; -# my $namespace_close = ""; -# foreach ( @{$namespaces{$i}} ) -# { -# $namespace_declarations .= "namespace $_ { "; -# $namespace_close .= " }"; -# } -# -# print "${namespace_declarations} class ${i} { public: static void throw_func(GError*); }; ${namespace_close}\n"; -# } - -my $namespace_whole_declarations = ""; -my $namespace_whole_close = ""; -foreach( @namespace_whole ) -{ - $namespace_whole_declarations .= "namespace " . $_ ." { "; - $namespace_whole_close = "} //" . $_ . "\n" . $namespace_whole_close; -} - -print "\n"; -print "$namespace_whole_declarations\n"; -print "\n"; -print "void " .$function_prefix . "wrap_init()\n{\n"; - - -# Generate namespace::wrap_init() body -# - -print " // Register Error domains:\n"; - -foreach $i (sort keys %exceptions) -{ - my $namespace_prefix = ""; - foreach( @{$namespaces{$i}} ) - { - $namespace_prefix .= $_ ."::"; - } - - print " Glib::Error::register_domain($basenames{$i}_quark(), &", "${namespace_prefix}${i}::throw_func);\n"; -} - -print "\n"; -print "// Map gtypes to gtkmm wrapper-creation functions:\n"; - -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - my $namespace_prefix = ""; - foreach( @{$namespaces{$i}} ) - { - $namespace_prefix .= $_ ."::"; - } - - print " Glib::wrap_register($basenames{$i}_get_type(), &", "${namespace_prefix}${i}_Class::wrap_new);\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -print "\n"; -print " // Register the gtkmm gtypes:\n"; - -foreach $i (sort keys %objects) -{ - if( $deprecated{$i} eq 1 ) - { - # The uc(parent_dir) is a bit of a hack. One day it will get it wrong. - print "#ifndef " . uc($parent_dir) ."_DISABLE_DEPRECATED\n" - } - - #On Win32, these classes are not compiled: - if( $win32_nowrap{$i} eq 1 ) - { - print "#ifndef G_OS_WIN32\n" - } - - my $namespace_prefix = ""; - foreach( @{$namespaces{$i}} ) - { - $namespace_prefix .= $_ ."::"; - } - - print " ${namespace_prefix}${i}::get_type();\n"; - - if( $win32_nowrap{$i} eq 1 ) - { - print "#endif //G_OS_WIN32\n" - } - - if( $deprecated{$i} eq 1 ) - { - print "#endif // *_DISABLE_DEPRECATED\n" - } -} - -print << "EOF"; - -} // wrap_init() - -$namespace_whole_close - -EOF - -exit 0; - diff --git a/libs/glibmm2/tools/gmmproc b/libs/glibmm2/tools/gmmproc deleted file mode 100644 index abb6fe03b9..0000000000 --- a/libs/glibmm2/tools/gmmproc +++ /dev/null @@ -1,239 +0,0 @@ -#! /usr/bin/perl -# -# tools/gmmproc. Generated from gmmproc.in by configure. -# -###################################################################### -# gmmproc (version 4) -###################################################################### -# -# *** WARNING: Only modify gmmproc.in. gmmproc is built. *** -# -# Copyright 2001, Karl Einar Nelson, Murray Cumming -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# -# -# 'classes': -# WrapParser: steps through .hg and .ccg files, outputting appropriate m4 code with Outputter. -# Outputter: Used by WrapParser to ouput wrapper code. Ouputs *.g1 temp file and uses m4 to generate *.g2 from it. Then outputs .h and .cc files. -# Function: Contains information about C and C++ functions and signals. -# -###################################################################### - -########################## 'main()' ################################## - -$main::procdir; -$main::m4path; - -BEGIN { - # get prefix info from configure - my $prefix = "/usr/local"; - my $exec_prefix = "${prefix}"; - my $libdir = "${exec_prefix}/lib"; - - # This line must match the install directory in m4/Makefile.am - $main::procdir = "$libdir/glibmm-2.4/proc"; - $main::m4path = "m4"; - - # This line must match install dir from pm/Makefile.am - push @INC,"$main::procdir/pm"; -} - -use strict; -use warnings; - -use Output; -use WrapParser; - -# initialize globals -@main::macrodirs = (); -$main::srcdir = "."; -$main::defsdir = "."; -$main::source = ""; -$main::debug = 0; -$main::unwrapped = 1; - -{ # checking the environment for a set variable can trigger a warning - no warnings; - $main::debug = 1 if ($ENV{'GMMPROC_DEBUG'} eq 1); -} - -# prototypes -sub parse_command_line_args(); - - -#main() -parse_command_line_args(); - -my $objOutputter = &Output::new($main::m4path, \@main::macrodirs); -my $objWrapParser = &WrapParser::new($objOutputter); - -$$objWrapParser{srcdir} = $main::srcdir; -$$objWrapParser{defsdir} = $main::defsdir; -$$objWrapParser{source} = $main::source; -$$objOutputter{source} = $main::source; -$$objOutputter{destdir} = $ARGV[1]; - -# Merge the C docs, e.g. gtk_docs.xml - -# Suck the whole file into one big string, breaking it into tokens: -$objWrapParser->read_file($main::srcdir, $main::source); - -# Parse output -$objWrapParser->parse_and_build_output(); - -# Write out *.g1 temporary file: -$objOutputter->output_temp_g1($$objWrapParser{module}); # e.g. "gtk" - -# Execute m4 to get *.g2 file: -{ - my $exitcode = $objOutputter->make_g2_from_g1(); - if ($exitcode != 0) - { - if (!$main::debug) - { - $objOutputter->remove_temp_files(); - } - print STDERR "m4 failed with exit code $exitcode. Aborting...\n"; - exit ($exitcode); - } -} - -# Section out the resulting output -$objOutputter->write_sections_to_files(); - -# Remove temp files. -if (!$main::debug) -{ - $objOutputter->remove_temp_files(); -} - -#Warn about any unwrapped function/signals: -if ($main::unwrapped) -{ - my @unwrapped = GtkDefs::get_unwrapped(); - if (@unwrapped) - { - no warnings; - - my @methods = - grep {$$_{entity_type} eq "method" & $$_{c_name}!~/^_/ } @unwrapped; - my @signals = - grep {$$_{entity_type} eq "signal"} @unwrapped; - my @properties = - grep {$$_{entity_type} eq "property"} @unwrapped; - - if (@methods) - { - print "Unwrapped functions:\n"; - map { print " $$_{c_name}\n"} @methods; - } - if (@properties) - { - print "Unwrapped properties:\n"; - map { print " $$_{class}::$$_{name}\n"} @properties; - } - if (@signals) - { - print "Unwrapped signals:\n"; - map { print " $$_{class}::$$_{name}\n"} @signals; - } - } -} - -# end of program -exit(); - - -#################################################################### - - -sub print_usage() -{ - print -'Usage: gmmproc [options] name srcdir destdir - -h - --help This usage message. - - --doc Produces a header file for documentation. (FIXME) - - --debug Leave intermediate output arround for analysis. - Alternatively, set GMMPROC_DEBUG=1 in the environment. - - --unwrapped Warn about possible unwrapped functions. - - --defs dir Change the directory to seach for defs. - - -I dir Specify the directory with m4 files. - - -Note: This will read srcdir/name.{hg,ccg} file and generates destdir/name.cc -'; - exit (1); -} - -# void parse_command_line_args() -sub parse_command_line_args() -{ - print_usage() if ($#ARGV == -1); - - while ($#ARGV != -1) - { - $_ = shift @ARGV; - - if (/^-/) - { - print_usage() if ( /^--help/); - print_usage() if ( /^-h/); - if (/^-I/) - { - push @main::macrodirs, shift @ARGV; - } - elsif (/^--unwrapped/) - { - $main::unwrapped = 1; - } - elsif (/^--defs/) - { - $main::defsdir = shift @ARGV; - } - elsif (/^--debug/) - { - $main::debug = 1; - } - else - { - print "unknown parameter $_\n"; - } - next; - } - - last; - } - - # we already have one argument - - if ($#ARGV != 1) - { - print STDERR "Invalid number of arguments (", $#ARGV+2, ")\n"; - print_usage(); - } - - $main::srcdir = $ARGV[0]; - $main::source = $_; - - push @main::macrodirs,"$main::procdir/m4"; -} - diff --git a/libs/glibmm2/tools/gmmproc.in b/libs/glibmm2/tools/gmmproc.in deleted file mode 100644 index f809817371..0000000000 --- a/libs/glibmm2/tools/gmmproc.in +++ /dev/null @@ -1,239 +0,0 @@ -#! @PERL_PATH@ -# -# @configure_input@ -# -###################################################################### -# gmmproc (version 4) -###################################################################### -# -# *** WARNING: Only modify gmmproc.in. gmmproc is built. *** -# -# Copyright 2001, Karl Einar Nelson, Murray Cumming -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# -# -# 'classes': -# WrapParser: steps through .hg and .ccg files, outputting appropriate m4 code with Outputter. -# Outputter: Used by WrapParser to ouput wrapper code. Ouputs *.g1 temp file and uses m4 to generate *.g2 from it. Then outputs .h and .cc files. -# Function: Contains information about C and C++ functions and signals. -# -###################################################################### - -########################## 'main()' ################################## - -$main::procdir; -$main::m4path; - -BEGIN { - # get prefix info from configure - my $prefix = "@prefix@"; - my $exec_prefix = "@exec_prefix@"; - my $libdir = "@libdir@"; - - # This line must match the install directory in m4/Makefile.am - $main::procdir = "$libdir/glibmm-2.4/proc"; - $main::m4path = "@M4@"; - - # This line must match install dir from pm/Makefile.am - push @INC,"$main::procdir/pm"; -} - -use strict; -use warnings; - -use Output; -use WrapParser; - -# initialize globals -@main::macrodirs = (); -$main::srcdir = "."; -$main::defsdir = "."; -$main::source = ""; -$main::debug = 0; -$main::unwrapped = 1; - -{ # checking the environment for a set variable can trigger a warning - no warnings; - $main::debug = 1 if ($ENV{'GMMPROC_DEBUG'} eq 1); -} - -# prototypes -sub parse_command_line_args(); - - -#main() -parse_command_line_args(); - -my $objOutputter = &Output::new($main::m4path, \@main::macrodirs); -my $objWrapParser = &WrapParser::new($objOutputter); - -$$objWrapParser{srcdir} = $main::srcdir; -$$objWrapParser{defsdir} = $main::defsdir; -$$objWrapParser{source} = $main::source; -$$objOutputter{source} = $main::source; -$$objOutputter{destdir} = $ARGV[1]; - -# Merge the C docs, e.g. gtk_docs.xml - -# Suck the whole file into one big string, breaking it into tokens: -$objWrapParser->read_file($main::srcdir, $main::source); - -# Parse output -$objWrapParser->parse_and_build_output(); - -# Write out *.g1 temporary file: -$objOutputter->output_temp_g1($$objWrapParser{module}); # e.g. "gtk" - -# Execute m4 to get *.g2 file: -{ - my $exitcode = $objOutputter->make_g2_from_g1(); - if ($exitcode != 0) - { - if (!$main::debug) - { - $objOutputter->remove_temp_files(); - } - print STDERR "m4 failed with exit code $exitcode. Aborting...\n"; - exit ($exitcode); - } -} - -# Section out the resulting output -$objOutputter->write_sections_to_files(); - -# Remove temp files. -if (!$main::debug) -{ - $objOutputter->remove_temp_files(); -} - -#Warn about any unwrapped function/signals: -if ($main::unwrapped) -{ - my @unwrapped = GtkDefs::get_unwrapped(); - if (@unwrapped) - { - no warnings; - - my @methods = - grep {$$_{entity_type} eq "method" & $$_{c_name}!~/^_/ } @unwrapped; - my @signals = - grep {$$_{entity_type} eq "signal"} @unwrapped; - my @properties = - grep {$$_{entity_type} eq "property"} @unwrapped; - - if (@methods) - { - print "Unwrapped functions:\n"; - map { print " $$_{c_name}\n"} @methods; - } - if (@properties) - { - print "Unwrapped properties:\n"; - map { print " $$_{class}::$$_{name}\n"} @properties; - } - if (@signals) - { - print "Unwrapped signals:\n"; - map { print " $$_{class}::$$_{name}\n"} @signals; - } - } -} - -# end of program -exit(); - - -#################################################################### - - -sub print_usage() -{ - print -'Usage: gmmproc [options] name srcdir destdir - -h - --help This usage message. - - --doc Produces a header file for documentation. (FIXME) - - --debug Leave intermediate output arround for analysis. - Alternatively, set GMMPROC_DEBUG=1 in the environment. - - --unwrapped Warn about possible unwrapped functions. - - --defs dir Change the directory to seach for defs. - - -I dir Specify the directory with m4 files. - - -Note: This will read srcdir/name.{hg,ccg} file and generates destdir/name.cc -'; - exit (1); -} - -# void parse_command_line_args() -sub parse_command_line_args() -{ - print_usage() if ($#ARGV == -1); - - while ($#ARGV != -1) - { - $_ = shift @ARGV; - - if (/^-/) - { - print_usage() if ( /^--help/); - print_usage() if ( /^-h/); - if (/^-I/) - { - push @main::macrodirs, shift @ARGV; - } - elsif (/^--unwrapped/) - { - $main::unwrapped = 1; - } - elsif (/^--defs/) - { - $main::defsdir = shift @ARGV; - } - elsif (/^--debug/) - { - $main::debug = 1; - } - else - { - print "unknown parameter $_\n"; - } - next; - } - - last; - } - - # we already have one argument - - if ($#ARGV != 1) - { - print STDERR "Invalid number of arguments (", $#ARGV+2, ")\n"; - print_usage(); - } - - $main::srcdir = $ARGV[0]; - $main::source = $_; - - push @main::macrodirs,"$main::procdir/m4"; -} - diff --git a/libs/glibmm2/tools/m4/Makefile b/libs/glibmm2/tools/m4/Makefile deleted file mode 100644 index 899aff4c64..0000000000 --- a/libs/glibmm2/tools/m4/Makefile +++ /dev/null @@ -1,441 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# tools/m4/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(tools_m4_include_HEADERS) \ - $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment -subdir = tools/m4 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(tools_m4_includedir)" -tools_m4_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(tools_m4_include_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -files_tools_m4 = base.m4 class_shared.m4 class_boxedtype.m4 class_boxedtype_static.m4 \ - class_generic.m4 class_gobject.m4 class_gtkobject.m4 \ - class_interface.m4 class_opaque_refcounted.m4 class_opaque_copyable.m4 \ - gerror.m4 \ - compare.m4 convert.m4 convert_base.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ - convert_glib.m4 convert_gtk.m4 convert_pango.m4 ctor.m4 doc.m4 enum.m4 list.m4 member.m4 \ - method.m4 property.m4 signal.m4 vfunc.m4 - -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_m4) - -# Install the .m4, files: -tools_m4_includedir = $(libdir)/glibmm-2.4/proc/m4 -tools_m4_include_HEADERS = $(files_tools_m4) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/m4/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/m4/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-tools_m4_includeHEADERS: $(tools_m4_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(tools_m4_includedir)" || $(mkdir_p) "$(DESTDIR)$(tools_m4_includedir)" - @list='$(tools_m4_include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(tools_m4_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(tools_m4_includedir)/$$f'"; \ - $(tools_m4_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(tools_m4_includedir)/$$f"; \ - done - -uninstall-tools_m4_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(tools_m4_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(tools_m4_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(tools_m4_includedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../tools/m4 - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(tools_m4_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-tools_m4_includeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-tools_m4_includeHEADERS - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-tools_m4_includeHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-tools_m4_includeHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/tools/m4/Makefile_list_of_sources.am_fragment b/libs/glibmm2/tools/m4/Makefile_list_of_sources.am_fragment deleted file mode 100644 index ab2e9c1a3c..0000000000 --- a/libs/glibmm2/tools/m4/Makefile_list_of_sources.am_fragment +++ /dev/null @@ -1,8 +0,0 @@ -files_tools_m4 = base.m4 class_shared.m4 class_boxedtype.m4 class_boxedtype_static.m4 \ - class_generic.m4 class_gobject.m4 class_gtkobject.m4 \ - class_interface.m4 class_opaque_refcounted.m4 class_opaque_copyable.m4 \ - gerror.m4 \ - compare.m4 convert.m4 convert_base.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ - convert_glib.m4 convert_gtk.m4 convert_pango.m4 ctor.m4 doc.m4 enum.m4 list.m4 member.m4 \ - method.m4 property.m4 signal.m4 vfunc.m4 - diff --git a/libs/glibmm2/tools/m4/base.m4 b/libs/glibmm2/tools/m4/base.m4 deleted file mode 100644 index 564b437b0c..0000000000 --- a/libs/glibmm2/tools/m4/base.m4 +++ /dev/null @@ -1,424 +0,0 @@ -dnl $Id: base.m4,v 1.4 2006/03/08 12:23:04 murrayc Exp $ -divert(-1) - -dnl -dnl The general convention is -dnl _* are macros -dnl __*__ are variables - -dnl -dnl rename several m4 builtins to avoid name clashes -dnl - -define(`_PREFIX_BUILTIN_ALIAS', `define(`m4_$1', defn(`$1'))') -define(`_PREFIX_BUILTIN', `_PREFIX_BUILTIN_ALIAS(`$1')`'undefine(`$1')') - -_PREFIX_BUILTIN(`builtin') -_PREFIX_BUILTIN(`decr') -_PREFIX_BUILTIN(`errprint') -_PREFIX_BUILTIN(`esyscmd') -_PREFIX_BUILTIN(`eval') -_PREFIX_BUILTIN(`format') -_PREFIX_BUILTIN(`incr') -_PREFIX_BUILTIN(`index') -_PREFIX_BUILTIN(`indir') -_PREFIX_BUILTIN(`len') -_PREFIX_BUILTIN(`maketemp') -_PREFIX_BUILTIN(`syscmd') -_PREFIX_BUILTIN(`substr') -_PREFIX_BUILTIN(`sysval') - -dnl -dnl More alternative names for m4 macros, not undefined (yet!). -dnl - -_PREFIX_BUILTIN_ALIAS(`changecom') -_PREFIX_BUILTIN_ALIAS(`changequote') -_PREFIX_BUILTIN_ALIAS(`define') -_PREFIX_BUILTIN_ALIAS(`divert') -_PREFIX_BUILTIN_ALIAS(`divnum') -_PREFIX_BUILTIN_ALIAS(`ifdef') -_PREFIX_BUILTIN_ALIAS(`ifelse') -_PREFIX_BUILTIN_ALIAS(`include') -_PREFIX_BUILTIN_ALIAS(`m4exit') -_PREFIX_BUILTIN_ALIAS(`m4wrap') -_PREFIX_BUILTIN_ALIAS(`patsubst') -_PREFIX_BUILTIN_ALIAS(`popdef') -_PREFIX_BUILTIN_ALIAS(`pushdef') -_PREFIX_BUILTIN_ALIAS(`shift') -_PREFIX_BUILTIN_ALIAS(`undefine') -_PREFIX_BUILTIN_ALIAS(`undivert') -_PREFIX_BUILTIN_ALIAS(`regexp') -_PREFIX_BUILTIN_ALIAS(`translit') - -dnl -dnl Type Conversion Macros -dnl - -m4_include(convert.m4) - -dnl -dnl ----------------------- Utility Macros ------------------------- -dnl - -dnl -dnl Add a comma before the arg if any, do nothing otherwise -dnl _COMMA_PREFIX(a) -> ,a -dnl _COMMA_PREFIX() -> `' -dnl -define(`_COMMA_PREFIX', `m4_ifelse(m4_eval(m4_len(`$*') >= 1), 1, `,$*')')dnl - -dnl -dnl Add a comma after the arg if any, do nothing otherwise -dnl _COMMA_SUFFIX(a) -> a, -dnl _COMMA_SUFFIX() -> `' -dnl -define(`_COMMA_SUFFIX', `m4_ifelse(m4_eval(m4_len(`$*') >= 1), 1, `$*,')')dnl - - -dnl -dnl _UPPER(string) -dnl uppercase a string -define(`_UPPER',`m4_translit(`$*',`abcdefghijklmnopqrstuvwxyz',`ABCDEFGHIJKLMNOPQRSTUVWXYZ')') - -dnl -dnl _LOWER(string) -dnl lower a string -define(`_LOWER',`m4_translit(`$*',`ABCDEFGHIJKLMNOPQRSTUVWXYZ',`abcdefghijklmnopqrstuvwxyz')') - -dnl -dnl _QUOTE(macro) -dnl If a macro generates an output with commas we need to protect it -dnl from being broken down and interpreted -define(`_QUOTE',``$*'') - -dnl -dnl _NUM(arglist) -dnl count number of arguments -define(`_NUM',`m4_ifelse(m4_len(`$*'),0,0,`$#')') - -dnl -dnl For handling of included macro files. -dnl - -dnl _PUSH(section_name) -dnl Uses pushdef() to redefine the __DIV__ macro -dnl so that it diverts ouput to the section_name, -dnl or discards it (-1) if no section_name is given. -dnl TODO: However, as far as I can tell, __DIV__ is not used anywhere. murrayc. -define(`_PUSH',`pushdef(`__DIV__',divnum)m4_divert(m4_ifelse($1,,-1,__SEC_$1))dnl`'') - -dnl _POP(section_name) -dnl Uses popdef() to go back to the previous definition of the __DIV__ macro. -define(`_POP',`m4_divert(__DIV__)popdef(`__DIV__')dnl`'') - -dnl _SECTION(section_name): -dnl m4_divert() sends subsequent output to the specified file: -define(`_SECTION',`m4_divert(__SEC_$1)dnl') - -dnl _IMPORT(section_name): -define(`_IMPORT',`m4_undivert(__SEC_$1)dnl') - -dnl _GET_TYPE_FUNC(GtkWidget) -> gtk_widget_get_type() -dnl The funny `[A-Z]?' part of the regexp is to catch things like GdkGCFooBar. -define(`_GET_TYPE_FUNC',`dnl -m4_translit(m4_substr(m4_patsubst(`$1',`[A-Z]?[A-Z]',`_\&'),1),`[A-Z]',`[a-z]')_get_type()`'dnl -') - -dnl Define a new diversion -dnl In m4, m4_divert() selects the output file to be used for subsequent text output. -dnl 0 is the normal output. We define extra output files with _NEW_SECTION(). -dnl This macro seems to redefine __SEC_COUNT as __SEC_COUNT+1, and also -dnl define __SEC_ as __SEC_COUNT. -dnl So it just sets that section identifier to the next number. - -define(`__SEC_COUNT__',0) - -define(`_NEW_SECTION',`dnl -define(`__SEC_COUNT__',m4_eval(__SEC_COUNT__+1))dnl -define(`__SEC_$1',__SEC_COUNT__)dnl -') - - -changequote([,]) -define([__BT__],[changequote(,)`changequote(`,')]) -define([__FT__],[changequote(,)'changequote(`,')]) -changequote(`,') - -changecom() - -dnl -dnl ----------------------- Main Headers ------------------------- -dnl - -_NEW_SECTION(SECTION_HEADER1) dnl header up to the first namespace -_NEW_SECTION(SECTION_HEADER2) dnl header after the first namespace -_NEW_SECTION(SECTION_HEADER3) dnl header after the first namespace -_NEW_SECTION(SECTION_PHEADER) dnl private header -_NEW_SECTION(SECTION_CC_INCLUDES) dnl section for additional includes -_NEW_SECTION(SECTION_SRC_CUSTOM) dnl user supplied implementation -_NEW_SECTION(SECTION_ANONYMOUS_NAMESPACE) dnl built implementation in anonymous namespace -_NEW_SECTION(SECTION_SRC_GENERATED) dnl built implementation -_NEW_SECTION(SECTION_CLASS1) dnl decl to _CLASS -_NEW_SECTION(SECTION_CLASS2) dnl _CLASS to end of class -_NEW_SECTION(SECTION_CC) dnl section for methods (in current namespace) - -_NEW_SECTION(SECTION_CC_IMPLEMENTS_INTERFACES) dnl Calls SomeBaseInterface::add_interface(get_type()). - -dnl Virtual Functions and Default Signal Handlers (Very similar) -_NEW_SECTION(SECTION_H_VFUNCS) dnl Declaration of vfunc hooks. -_NEW_SECTION(SECTION_H_VFUNCS_CPPWRAPPER) dnl Convenience method, using C++ types, that just calls the vfunc. -_NEW_SECTION(SECTION_H_DEFAULT_SIGNAL_HANDLERS) dnl Declaration of default signal handler' hooks. - -_NEW_SECTION(SECTION_CC_DEFAULT_SIGNAL_HANDLERS) -_NEW_SECTION(SECTION_CC_VFUNCS) -_NEW_SECTION(SECTION_CC_VFUNCS_CPPWRAPPER) dnl Convenience method, using C++ types, that just calls the vfunc. - -_NEW_SECTION(SECTION_PH_DEFAULT_SIGNAL_HANDLERS) dnl private class declaration -_NEW_SECTION(SECTION_PH_VFUNCS) dnl private class declaration - -_NEW_SECTION(SECTION_PCC_DEFAULT_SIGNAL_HANDLERS) dnl private class implementation -_NEW_SECTION(SECTION_PCC_VFUNCS) dnl private class implementation - -_NEW_SECTION(SECTION_PCC_CLASS_INIT_DEFAULT_SIGNAL_HANDLERS) dnl gtk+ class_init function -_NEW_SECTION(SECTION_PCC_CLASS_INIT_VFUNCS) dnl gtk+ class_init function - - -dnl Signal Proxies: -dnl _NEW_SECTION(SECTION_H_SIGNALPROXIES) dnl signal member objects -_NEW_SECTION(SECTION_CC_SIGNALPROXIES) dnl signal member objects - -dnl Property Proxies: -dnl _NEW_SECTION(SECTION_H_PROPERTYPROXIES) -_NEW_SECTION(SECTION_CC_PROPERTYPROXIES) - -_NEW_SECTION(SECTION_CC_INITIALIZE_CLASS_EXTRA) dnl For instance, to initialize special member data from all constructors. Not commonly used. - -dnl _NEW_SECTION(PROXY) -dnl _NEW_SECTION(SECTION_PCC_OBJECT_INIT) dnl gtk+ object_init function - - -_NEW_SECTION(SECTION_CHECK) -_NEW_SECTION(SECTION_USR) - -define(`_CHECK',`dnl -_PUSH(SECTION_CHECK) - $* -_POP() -') - -dnl Start of processing -dnl -dnl _START(filname, module,modulecanonical) .e.g _START(button, gtkmm, gtkmm) -define(`_START',`dnl -define(`__MODULE__',$2)dnl -define(`__MODULE_CANONICAL__',$3)dnl -define(`__HEADER_GUARD__',`_`'_UPPER(m4_translit(`$3`'_`'$1', `-', `_'))')dnl -define(`__FILE__',$1)dnl -define(`__DEPRECATION_GUARD__',`_UPPER($3)'`_DISABLE_DEPRECATED')dnl -_SECTION(SECTION_HEADER1) -') - -dnl Start deprecation of individual methods: -define(`_DEPRECATE_IFDEF_START',`dnl -#ifndef __DEPRECATION_GUARD__' -) - -dnl end deprecation of individual methods: -define(`_DEPRECATE_IFDEF_END',`dnl -#endif // __DEPRECATION_GUARD__' -) - -dnl begin optional deprecation of whole class -define(`_DEPRECATE_IFDEF_CLASS_START',`dnl -ifdef(`__BOOL_DEPRECATED__',`dnl -_DEPRECATE_IFDEF_START',`dnl -') -') - -dnl end optional deprecation of whole class -define(`_DEPRECATE_IFDEF_CLASS_END',`dnl -ifdef(`__BOOL_DEPRECATED__',`dnl -_DEPRECATE_IFDEF_END',`dnl -') -') - -dnl This does all the work of assembling the final output -dnl -dnl _END() -dnl -define(`_END',`dnl -m4_divert(0)dnl -#S 0 dnl Marks the beginning of the header file. - -// -*- c++ -*- -// Generated by gtkmmproc -- DO NOT MODIFY! -#ifndef __HEADER_GUARD__`'_H -#define __HEADER_GUARD__`'_H - -_DEPRECATE_IFDEF_CLASS_START - -m4_ifelse(__MODULE__,glibmm,,`dnl else -#include -')dnl -_IMPORT(SECTION_HEADER1) -_IMPORT(SECTION_HEADER2) -_IMPORT(SECTION_HEADER3) - -_DEPRECATE_IFDEF_CLASS_END - -#endif /* __HEADER_GUARD__`'_H */ - -#S 1 dnl Marks the beginning of the private header file. - -// -*- c++ -*- -// Generated by gtkmmproc -- DO NOT MODIFY! -#ifndef __HEADER_GUARD__`'_P_H -#define __HEADER_GUARD__`'_P_H -_DEPRECATE_IFDEF_CLASS_START -_IMPORT(SECTION_PHEADER) -_DEPRECATE_IFDEF_CLASS_END -#endif /* __HEADER_GUARD__`'_P_H */ - -#S 2 dnl Marks the beginning of the source file. - -// Generated by gtkmmproc -- DO NOT MODIFY! - -_DEPRECATE_IFDEF_CLASS_START - -#include <__MODULE__/__FILE__.h> -#include <__MODULE__/private/__FILE__`'_p.h> - -_IMPORT(SECTION_CC_INCLUDES) -_IMPORT(SECTION_SRC_CUSTOM) - -namespace -{ -_IMPORT(SECTION_ANONYMOUS_NAMESPACE) -} // anonymous namespace - -_IMPORT(SECTION_SRC_GENERATED) -_DEPRECATE_IFDEF_CLASS_END - -m4_divert(-1) -m4_undivert() -') - -define(`_NAMESPACE',`dnl -_PUSH() -m4_ifdef(`__NAMESPACE__',`dnl -pushdef(`__NAMESPACE__',__NAMESPACE__`::'$1) -pushdef(`__NAMESPACE_BEGIN__',__NAMESPACE_BEGIN__` - -namespace '$1` -{') -pushdef(`__NAMESPACE_END__',`} // namespace '$1` - -'__NAMESPACE_END__) -',`dnl else -pushdef(`__NAMESPACE__',$1) -pushdef(`__NAMESPACE_BEGIN__',`namespace '$1` -{') -pushdef(`__NAMESPACE_END__',`} // namespace '$1) -')dnl endif __NAMESPACE__ -_POP() -')dnl enddef _NAMESPACE - -define(`_END_NAMESPACE',`dnl -_PUSH() -popdef(`__NAMESPACE__') -popdef(`__NAMESPACE_BEGIN__') -popdef(`__NAMESPACE_END__') -_POP() -')dnl enddef _END_NAMESPACE - -define(`_INCLUDE_FLAG',`__FLAG_$1_INCLUDE_`'_UPPER(m4_translit(`$2',`/.-',`___'))__')dnl - -define(`_PH_INCLUDE',`dnl -m4_ifdef(_INCLUDE_FLAG(PH,`$*'),,`dnl else -define(_INCLUDE_FLAG(PH,`$*'))dnl -_PUSH(SECTION_PHEADER) -#include <$*> -_POP() -')dnl endif -')dnl - -define(`_CC_INCLUDE',`dnl -m4_ifdef(_INCLUDE_FLAG(CC,`$*'),,`dnl else -define(_INCLUDE_FLAG(CC,`$*'))dnl -_PUSH(SECTION_CC_INCLUDES) -#include <$*> -_POP() -')dnl endif -')dnl - -define(`_PINCLUDE', defn(`_PH_INCLUDE')) - -# Put these, for instance, around gtkmmproc macros (_WRAP_SIGNAL) -# to make the #ifndef appear around the generated code in both the .h -# and .cc files. -# e.g. _GTKMMPROC_H_AND_CC(#ifndef _SUN_CC_) -# e.g. _GTKMMPROC_H_AND_CC(#endif //_SUN_CC_) -# _GTKMMPROC_H_AND_CC(code) -define(`_GTKMMPROC_H_AND_CC',`dnl -$1 -_PUSH(SECTION_CC) -$1 - -_POP() -')dnl - -# Same thing as _GTKMMPROC_H_AND_CC but for signals (_WRAP_SIGNAL) -define(`_GTKMMPROC_SIGNAL_H_AND_CC',`dnl -$1 -_PUSH(SECTION_ANONYMOUS_NAMESPACE) -$1 -_POP() - -$1 -_PUSH(SECTION_H_DEFAULT_SIGNAL_HANDLERS) -$1 -_POP() - -$1 -_PUSH(SECTION_PCC_CLASS_INIT_DEFAULT_SIGNAL_HANDLERS) -$1 -_POP() - -$1 -_PUSH(SECTION_CC_DEFAULT_SIGNAL_HANDLERS) -$1 -_POP() - -$1 -_PUSH(SECTION_PCC_DEFAULT_SIGNAL_HANDLERS) -$1 -_POP() - -$1 -_PUSH(SECTION_CC_SIGNALPROXIES) -$1 -_POP() -')dnl - -m4_include(class_shared.m4) -m4_include(class_generic.m4) -m4_include(class_gobject.m4) -m4_include(class_gtkobject.m4) -m4_include(class_boxedtype.m4) -m4_include(class_boxedtype_static.m4) -m4_include(class_interface.m4) -m4_include(class_opaque_copyable.m4) -m4_include(class_opaque_refcounted.m4) -m4_include(gerror.m4) -m4_include(signal.m4) -m4_include(vfunc.m4) -m4_include(method.m4) -m4_include(member.m4) -m4_include(compare.m4) -m4_include(ctor.m4) -m4_include(property.m4) -m4_include(enum.m4) - -_SECTION(SECTION_HEADER1) - diff --git a/libs/glibmm2/tools/m4/class_boxedtype.m4 b/libs/glibmm2/tools/m4/class_boxedtype.m4 deleted file mode 100644 index 347c3940ea..0000000000 --- a/libs/glibmm2/tools/m4/class_boxedtype.m4 +++ /dev/null @@ -1,215 +0,0 @@ -dnl $Id: class_boxedtype.m4,v 1.3 2003/12/14 11:53:04 murrayc Exp $ - -dnl -dnl _CLASS_BOXEDTYPE(Region, GdkRegion, gdk_region_new, gdk_region_copy, gdk_region_destroy) -dnl - -define(`_CLASS_BOXEDTYPE',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') -define(`__BOXEDTYPE_FUNC_NEW',`$3') -define(`__BOXEDTYPE_FUNC_COPY',`$4') -define(`__BOXEDTYPE_FUNC_FREE',`$5') - -define(`_CUSTOM_DEFAULT_CTOR',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_DEFAULT_CTOR__',`$1') -_POP() -') - - -_POP() -_SECTION(SECTION_CLASS2) -') dnl End of _CLASS_BOXEDTYPE. - -dnl Some of the Gdk types are unions - e.g. GdkEvent. -define(`_CUSTOM_STRUCT_PROTOTYPE',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_STRUCT_PROTOTYPE__',`$1') -_POP() -') - -dnl -dnl _END_CLASS_BOXEDTYPE() -dnl denotes the end of a class -dnl -define(`_END_CLASS_BOXEDTYPE',` -_SECTION(SECTION_HEADER1) -ifdef(`__BOOL_CUSTOM_STRUCT_PROTOTYPE__',`dnl -',`dnl -#ifndef DOXYGEN_SHOULD_SKIP_THIS -extern "C" { typedef struct _`'__CNAME__ __CNAME__; } -#endif -')dnl - -_SECTION(SECTION_HEADER3) - -__NAMESPACE_BEGIN__ - -/** @relates __NAMESPACE__::__CPPNAME__ - * @param lhs The left-hand side - * @param rhs The right-hand side - */ -inline void swap(__CPPNAME__& lhs, __CPPNAME__& rhs) - { lhs.swap(rhs); } - -__NAMESPACE_END__ - -namespace Glib -{ -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else - -/** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. - * @result A C++ instance that wraps this C instance. - */ -__NAMESPACE__::__CPPNAME__ wrap(__CNAME__* object, bool take_copy = false); -')dnl endif __BOOL_NO_WRAP_FUNCTION__ - -#ifndef DOXYGEN_SHOULD_SKIP_THIS -template <> -class Value<__NAMESPACE__::__CPPNAME__> : public Glib::Value_Boxed<__NAMESPACE__::__CPPNAME__> -{}; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -} // namespace Glib - -_SECTION(SECTION_SRC_GENERATED) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else -namespace Glib -{ - -__NAMESPACE__::__CPPNAME__ wrap(__CNAME__* object, bool take_copy) -{ - return __NAMESPACE__::__CPPNAME__`'(object, take_copy); -} - -} // namespace Glib -')dnl endif - - -__NAMESPACE_BEGIN__ - -dnl -dnl The implementation: -dnl - -// static -GType __CPPNAME__::get_type() -{ - return _GET_TYPE_FUNC(__CNAME__); -} - -ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',`dnl -',`dnl else -__CPPNAME__::__CPPNAME__`'() -: -ifelse(__BOXEDTYPE_FUNC_NEW,NONE,`dnl - gobject_ (0) // Allows creation of invalid wrapper, e.g. for output arguments to methods. -',`dnl else - gobject_ (__BOXEDTYPE_FUNC_NEW`'()) -')dnl -{} -')dnl endif __BOOL_CUSTOM_DEFAULT_CTOR__ - -__CPPNAME__::__CPPNAME__`'(const __CPPNAME__& other) -: - gobject_ ((other.gobject_) ? __BOXEDTYPE_FUNC_COPY`'(other.gobject_) : 0) -{} - -__CPPNAME__::__CPPNAME__`'(__CNAME__* gobject, bool make_a_copy) -: - // For BoxedType wrappers, make_a_copy is true by default. The static - // BoxedType wrappers must always take a copy, thus make_a_copy = true - // ensures identical behaviour if the default argument is used. - gobject_ ((make_a_copy && gobject) ? __BOXEDTYPE_FUNC_COPY`'(gobject) : gobject) -{} - -__CPPNAME__& __CPPNAME__::operator=(const __CPPNAME__`'& other) -{ - __CPPNAME__ temp (other); - swap(temp); - return *this; -} - -__CPPNAME__::~__CPPNAME__`'() -{ -dnl This could be a free or an unref, we do not need to know. - if(gobject_) - __BOXEDTYPE_FUNC_FREE`'(gobject_); -} - -void __CPPNAME__::swap(__CPPNAME__& other) -{ - __CNAME__ *const temp = gobject_; - gobject_ = other.gobject_; - other.gobject_ = temp; -} - -__CNAME__* __CPPNAME__::gobj_copy() const -{ - return __BOXEDTYPE_FUNC_COPY`'(gobject_); -} - -_IMPORT(SECTION_CC) - -__NAMESPACE_END__ - - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl -dnl The actual class, e.g. Pango::FontDescription, declaration: -dnl -_IMPORT(SECTION_CLASS1) -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __CNAME__ BaseObjectType; - - static GType get_type() G_GNUC_CONST; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',`dnl -',`dnl else - __CPPNAME__`'(); -')dnl - - explicit __CPPNAME__`'(__CNAME__* gobject, bool make_a_copy = true); - - __CPPNAME__`'(const __CPPNAME__& other); - __CPPNAME__& operator=(const __CPPNAME__& other); - - ~__CPPNAME__`'(); - - void swap(__CPPNAME__& other); - - ///Provides access to the underlying C instance. - __CNAME__* gobj() { return gobject_; } - - ///Provides access to the underlying C instance. - const __CNAME__* gobj() const { return gobject_; } - - ///Provides access to the underlying C instance. The caller is responsible for freeing it. Use when directly setting fields in structs. - __CNAME__* gobj_copy() const; - -protected: - __CNAME__* gobject_; - -private: -_IMPORT(SECTION_CLASS2) -') - diff --git a/libs/glibmm2/tools/m4/class_boxedtype_static.m4 b/libs/glibmm2/tools/m4/class_boxedtype_static.m4 deleted file mode 100644 index 89c8bbfe7d..0000000000 --- a/libs/glibmm2/tools/m4/class_boxedtype_static.m4 +++ /dev/null @@ -1,169 +0,0 @@ -dnl $Id: class_boxedtype_static.m4,v 1.3 2003/12/14 11:53:04 murrayc Exp $ - -dnl -dnl _CLASS_BOXEDTYPE_STATIC(TreeIter, GtkTreeIter) -dnl -define(`_CLASS_BOXEDTYPE_STATIC',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') - -define(`_CUSTOM_DEFAULT_CTOR',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_DEFAULT_CTOR__',`$1') -_POP() -') - -define(`_CUSTOM_CTOR_CAST',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_CTOR_CAST__',`$1') -_POP() -') - -_POP() -_SECTION(SECTION_CLASS2) -') dnl End of _CLASS_BOXEDTYPE_STATIC. - -dnl TreeIterBase shouldn't have a wrap() method - we'll custom implement them for TreeIter and TreeRow: -define(`_NO_WRAP_FUNCTION',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_NO_WRAP_FUNCTION__',`$1') -_POP() -') - -dnl -dnl _END_CLASS_BOXEDTYPE_STATIC() -dnl denotes the end of a class -dnl -define(`_END_CLASS_BOXEDTYPE_STATIC',` - -_SECTION(SECTION_HEADER3) - -namespace Glib -{ -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else - -/** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @result A C++ instance that wraps this C instance. - */ -__NAMESPACE__::__CPPNAME__& wrap(__CNAME__* object); - -/** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @result A C++ instance that wraps this C instance. - */ -const __NAMESPACE__::__CPPNAME__& wrap(const __CNAME__* object); -')dnl endif __BOOL_NO_WRAP_FUNCTION__ - -#ifndef DOXYGEN_SHOULD_SKIP_THIS -template <> -class Value<__NAMESPACE__::__CPPNAME__> : public Glib::Value_Boxed<__NAMESPACE__::__CPPNAME__> -{}; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -} // namespace Glib - -_SECTION(SECTION_SRC_GENERATED) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else -namespace Glib -{ - -__NAMESPACE__::__CPPNAME__& wrap(__CNAME__* object) -{ - return *reinterpret_cast<__NAMESPACE__::__CPPNAME__*>(object); -} - -const __NAMESPACE__::__CPPNAME__& wrap(const __CNAME__* object) -{ - return *reinterpret_cast(object); -} - -} // namespace Glib -')dnl endif __BOOL_NO_WRAP_FUNCTION__ - - -__NAMESPACE_BEGIN__ - -dnl -dnl The implementation: -dnl - -dnl // static -dnl const __CNAME__ __CPPNAME__::gobject_initializer_ = { 0, }; -dnl -// static -GType __CPPNAME__::get_type() -{ - return _GET_TYPE_FUNC(__CNAME__); -} - -ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',,`dnl else -__CPPNAME__::__CPPNAME__`'() -{ - GLIBMM_INITIALIZE_STRUCT`'(gobject_, __CNAME__); -} -')dnl - -ifdef(`__BOOL_CUSTOM_CTOR_CAST__',,`dnl else -__CPPNAME__::__CPPNAME__`'(const __CNAME__* gobject) -{ - if(gobject) - gobject_ = *gobject; - else - GLIBMM_INITIALIZE_STRUCT`'(gobject_, __CNAME__); -} -')dnl - -_IMPORT(SECTION_CC) - -__NAMESPACE_END__ - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl -dnl The actual class, e.g. Gtk::TreeIter, declaration: -dnl -_IMPORT(SECTION_CLASS1) -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __CNAME__ BaseObjectType; - - static GType get_type() G_GNUC_CONST; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',,`dnl else - __CPPNAME__`'(); -')dnl - -ifdef(`__BOOL_CUSTOM_CTOR_CAST__',,`dnl else - explicit __CPPNAME__`'(const __CNAME__* gobject); // always takes a copy -')dnl - - ///Provides access to the underlying C instance. - __CNAME__* gobj() { return &gobject_; } - - ///Provides access to the underlying C instance. - const __CNAME__* gobj() const { return &gobject_; } - -protected: - __CNAME__ gobject_; -dnl static const __CNAME__ gobject_initializer_; - -private: - _IMPORT(SECTION_CLASS2) -') - diff --git a/libs/glibmm2/tools/m4/class_generic.m4 b/libs/glibmm2/tools/m4/class_generic.m4 deleted file mode 100644 index 790e7c1b85..0000000000 --- a/libs/glibmm2/tools/m4/class_generic.m4 +++ /dev/null @@ -1,54 +0,0 @@ -dnl $Id: class_generic.m4,v 1.1.1.1 2003/01/07 16:59:05 murrayc Exp $ - -dnl -dnl _CLASS_GENERIC(LayoutIter, PangoLayoutIter) -dnl - -define(`_CLASS_GENERIC',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') - -_POP() -_SECTION(SECTION_CLASS2) -') dnl End of _CLASS_GENERIC. - - -dnl -dnl _END_CLASS_GENERIC() -dnl denotes the end of a class -dnl -define(`_END_CLASS_GENERIC',` - -_SECTION(SECTION_SRC_GENERATED) - -__NAMESPACE_BEGIN__ - -dnl The implementation: - -_IMPORT(SECTION_CC) - -__NAMESPACE_END__ - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl -dnl The actual class, e.g. Pango::FontDescription, declaration: -dnl -_IMPORT(SECTION_CLASS1) -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __CNAME__ BaseObjectType; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -private: -_IMPORT(SECTION_CLASS2) -') - diff --git a/libs/glibmm2/tools/m4/class_gobject.m4 b/libs/glibmm2/tools/m4/class_gobject.m4 deleted file mode 100644 index acbe8db8a9..0000000000 --- a/libs/glibmm2/tools/m4/class_gobject.m4 +++ /dev/null @@ -1,240 +0,0 @@ -dnl $Id: class_gobject.m4,v 1.6 2004/04/29 22:43:44 murrayc Exp $ - - -define(`_CLASS_GOBJECT',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') -define(`__CCAST__',`$3') -define(`__BASE__',_LOWER(__CPPNAME__)) -define(`__CPPPARENT__',`$4') -define(`__CPARENT__',`$5') -define(`__PCAST__',`($5*)') - -dnl Some C types, e.g. GdkWindow or GdkPixmap, are a typedef to their base type, -dnl rather than the real instance type. That is really ugly, yes. We get around -dnl the problem by supporting optional __REAL_* arguments to this macro. -define(`__REAL_CNAME__',ifelse(`$6',,__CNAME__,`$6')) -define(`__REAL_CPARENT__',ifelse(`$7',,__CPARENT__,`$7')) - - -_POP() -_SECTION(SECTION_CLASS2) -') dnl end of _CLASS_GOBJECT - -dnl Widget and Object, and some others, have custom-written destructor implementations: -define(`_CUSTOM_DTOR',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_DTOR__',`$1') -_POP() -') - -dnl Gdk::Pixmap_Class::wrap_new() needs a custom implementation, in order -dnl to create a Gdk::Bitmap object if appropriate. See comments there. -define(`_CUSTOM_WRAP_NEW',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_WRAP_NEW__',`1') -_POP() -') - -dnl Gnome::Canvas::CanvasAA::CanvasAA() needs access to the -dnl normally-private canvas_class_ member variable. See comments there. -define(`_GMMPROC_PROTECTED_GCLASS',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_PROTECTED_GCLASS__',`1') -_POP() -') - -dnl Some of the Gdk types are actually direct typedefs of their base type. -dnl This means that 2 wrap functions would have the same argument. -dnl define(`_NO_WRAP_FUNCTION',`dnl -dnl _PUSH() -dnl Define this macro to be tested for later. -dnl define(`__BOOL_NO_WRAP_FUNCTION__',`$1') -dnl _POP() -dnl ') - -dnl -dnl _CREATE_METHOD(args_type_and_name_hpp, args_type_and_name_cpp,args_name_only); -dnl -define(`_CREATE_METHOD',` - static Glib::RefPtr<`'__CPPNAME__`'> create(`'$1`'); -_PUSH(SECTION_CC) -Glib::RefPtr<`'__CPPNAME__`'> __CPPNAME__`'::create(`'$2`') -{ - return Glib::RefPtr<`'__CPPNAME__`'>( new __CPPNAME__`'(`'$3`') ); -} -_POP() -') - - -dnl -dnl _END_CLASS_GOBJECT() -dnl denotes the end of a class -dnl -define(`_END_CLASS_GOBJECT',` -_SECTION(SECTION_HEADER1) -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl -_STRUCT_PROTOTYPE() -')dnl - -__NAMESPACE_BEGIN__ class __CPPNAME__`'_Class; __NAMESPACE_END__ -_SECTION(SECTION_HEADER3) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl -namespace Glib -{ - /** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. - * @result A C++ instance that wraps this C instance. - */ - Glib::RefPtr<__NAMESPACE__::__CPPNAME__> wrap(__REAL_CNAME__`'* object, bool take_copy = false); -} -')dnl - - -dnl -dnl -_SECTION(SECTION_PHEADER) - -#include - -__NAMESPACE_BEGIN__ - -_PH_CLASS_DECLARATION() - -__NAMESPACE_END__ - -_SECTION(SECTION_SRC_GENERATED) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else -namespace Glib -{ - -Glib::RefPtr<__NAMESPACE__::__CPPNAME__> wrap(__REAL_CNAME__`'* object, bool take_copy) -{ - return Glib::RefPtr<__NAMESPACE__::__CPPNAME__>( dynamic_cast<__NAMESPACE__::__CPPNAME__*> (Glib::wrap_auto ((GObject*)(object), take_copy)) ); - //We use dynamic_cast<> in case of multiple inheritance. -} - -} /* namespace Glib */ -')dnl endif - - - - -__NAMESPACE_BEGIN__ - - -/* The *_Class implementation: */ - -_PCC_CLASS_IMPLEMENTATION() - -m4_ifdef(`__BOOL_CUSTOM_WRAP_NEW__',,`dnl else -Glib::ObjectBase* __CPPNAME__`'_Class::wrap_new(GObject* object) -{ - return new __CPPNAME__`'((__CNAME__*)`'object); -} - -')dnl endif - -/* The implementation: */ - -__CNAME__* __CPPNAME__::gobj_copy() -{ - reference(); - return gobj(); -} - -__CPPNAME__::__CPPNAME__`'(const Glib::ConstructParams& construct_params) -: - __CPPPARENT__`'(construct_params) -{} - -__CPPNAME__::__CPPNAME__`'(__CNAME__* castitem) -: - __CPPPARENT__`'(__PCAST__`'(castitem)) -{} - -ifdef(`__BOOL_CUSTOM_DTOR__',`dnl -',`dnl -__CPPNAME__::~__CPPNAME__`'() -{} - -')dnl - - -_CC_CLASS_IMPLEMENTATION() - -__NAMESPACE_END__ - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl The actual class, e.g. Gtk::Widget, declaration: -dnl _IMPORT(SECTION_H_SIGNALPROXIES_CUSTOM) - -_IMPORT(SECTION_CLASS1) - -#ifndef DOXYGEN_SHOULD_SKIP_THIS - -public: - typedef __CPPNAME__ CppObjectType; - typedef __CPPNAME__`'_Class CppClassType; - typedef __CNAME__ BaseObjectType; - typedef __REAL_CNAME__`'Class BaseClassType; - -m4_ifdef(`__BOOL_PROTECTED_GCLASS__', -`protected:',`dnl else -private:')dnl endif - friend class __CPPNAME__`'_Class; - static CppClassType `'__BASE__`'_class_; - -private: - // noncopyable - __CPPNAME__`'(const __CPPNAME__&); - __CPPNAME__& operator=(const __CPPNAME__&); - -protected: - explicit __CPPNAME__`'(const Glib::ConstructParams& construct_params); - explicit __CPPNAME__`'(__CNAME__* castitem); - -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -public: - virtual ~__CPPNAME__`'(); - -#ifndef DOXYGEN_SHOULD_SKIP_THIS - static GType get_type() G_GNUC_CONST; - static GType get_base_type() G_GNUC_CONST; -#endif - - ///Provides access to the underlying C GObject. - __CNAME__* gobj() { return reinterpret_cast<__CNAME__*>(gobject_); } - - ///Provides access to the underlying C GObject. - const __CNAME__* gobj() const { return reinterpret_cast<__CNAME__*>(gobject_); } - - ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. - __CNAME__* gobj_copy(); - -private: -_IMPORT(SECTION_CLASS2) - -public: -_H_VFUNCS_AND_SIGNALS() - -') - diff --git a/libs/glibmm2/tools/m4/class_gtkobject.m4 b/libs/glibmm2/tools/m4/class_gtkobject.m4 deleted file mode 100644 index 09445d03ec..0000000000 --- a/libs/glibmm2/tools/m4/class_gtkobject.m4 +++ /dev/null @@ -1,225 +0,0 @@ -dnl $Id: class_gtkobject.m4,v 1.6 2006/03/08 12:23:04 murrayc Exp $ - - - -define(`_CLASS_GTKOBJECT',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') -define(`__CCAST__',`$3') -define(`__BASE__',_LOWER(__CPPNAME__)) -define(`__CPPPARENT__',`$4') -define(`__CPARENT__',`$5') -define(`__PCAST__',`($5*)') - -dnl Some C types, e.g. GdkWindow or GdkPixmap, are a typedef to their base type, -dnl rather than the real instance type. That is really ugly, yes. We get around -dnl the problem by supporting optional __REAL_* arguments to this macro. -define(`__REAL_CNAME__',ifelse(`$6',,__CNAME__,`$6')) -define(`__REAL_CPARENT__',ifelse(`$7',,__CPARENT__,`$7')) - - -dnl -dnl ----------------------- Constructors ------------------------- -dnl - - -_POP() -_SECTION(SECTION_CLASS2) -')dnl end of _CLASS_GTKOBJECT - -dnl Widget and Object, and some others, have custom-written destructor implementations: -define(`_CUSTOM_DTOR',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_DTOR__',`$1') -_POP() -') - -dnl Gtk::Object has a custom-written cast implementation: -define(`_CUSTOM_CTOR_CAST',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_CTOR_CAST__',`$1') -_POP() -') - -dnl Top-level windows can not be manage()ed, so we should not use manage() in wrap_new(). -define(`_UNMANAGEABLE',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_UNMANAGEABLE__',`$1') -_POP() -') - -dnl Optionally ifdef-out the whole .h and .cc files: -define(`_DEPRECATED',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_DEPRECATED__',`$1') -_POP() -') - -dnl Gnome::Canvas::CanvasAA::CanvasAA() needs access to the -dnl normally-private canvas_class_ member variable. See comments there. -define(`_GMMPROC_PROTECTED_GCLASS',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_PROTECTED_GCLASS__',`1') -_POP() -') - - -dnl -dnl _END_CLASS_GTKOBJECT() -dnl denotes the end of a class -dnl -define(`_END_CLASS_GTKOBJECT',` - -_SECTION(SECTION_HEADER1) -_STRUCT_PROTOTYPE() - -__NAMESPACE_BEGIN__ class __CPPNAME__`'_Class; __NAMESPACE_END__ -_SECTION(SECTION_HEADER3) - -namespace Glib -{ - /** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. - * @result A C++ instance that wraps this C instance. - */ - __NAMESPACE__::__CPPNAME__`'* wrap(__CNAME__`'* object, bool take_copy = false); -} //namespace Glib - -dnl -dnl -_SECTION(SECTION_PHEADER) - -#include - -__NAMESPACE_BEGIN__ - -_PH_CLASS_DECLARATION() - -__NAMESPACE_END__ - -_SECTION(SECTION_SRC_GENERATED) - -namespace Glib -{ - -__NAMESPACE__::__CPPNAME__`'* wrap(__CNAME__`'* object, bool take_copy) -{ - return dynamic_cast<__NAMESPACE__::__CPPNAME__ *> (Glib::wrap_auto ((GObject*)(object), take_copy)); -} - -} /* namespace Glib */ - -__NAMESPACE_BEGIN__ - - -/* The *_Class implementation: */ - -_PCC_CLASS_IMPLEMENTATION() - -Glib::ObjectBase* __CPPNAME__`'_Class::wrap_new(GObject* o) -{ -ifdef(`__BOOL_UNMANAGEABLE__',`dnl - return new __CPPNAME__`'((__CNAME__*)`'(o)); //top-level windows can not be manage()ed. -',`dnl - return manage(new __CPPNAME__`'((__CNAME__*)`'(o))); -') -} - - -/* The implementation: */ - -ifdef(`__BOOL_CUSTOM_CTOR_CAST__',`dnl necessary for Gtk::Object implementation -',`dnl -__CPPNAME__::__CPPNAME__`'(const Glib::ConstructParams& construct_params) -: - __CPPPARENT__`'(construct_params) -{ - _IMPORT(SECTION_CC_INITIALIZE_CLASS_EXTRA) dnl Does not seem to work - custom implement it instead. -} - -__CPPNAME__::__CPPNAME__`'(__CNAME__* castitem) -: - __CPPPARENT__`'(__PCAST__`'(castitem)) -{ - _IMPORT(SECTION_CC_INITIALIZE_CLASS_EXTRA) dnl Does not seem to work - custom implement it instead. -} - -')dnl -ifdef(`__BOOL_CUSTOM_DTOR__',`dnl -',`dnl -__CPPNAME__::~__CPPNAME__`'() -{ - destroy_(); -} - -')dnl -_CC_CLASS_IMPLEMENTATION() - -__NAMESPACE_END__ - -dnl -dnl -dnl -dnl -_POP() -dnl The actual class, e.g. Gtk::Widget, declaration: -dnl _IMPORT(SECTION_H_SIGNALPROXIES_CUSTOM) - -_IMPORT(SECTION_CLASS1) -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __CPPNAME__`'_Class CppClassType; - typedef __CNAME__ BaseObjectType; - typedef __REAL_CNAME__`'Class BaseClassType; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - - virtual ~__CPPNAME__`'(); - -#ifndef DOXYGEN_SHOULD_SKIP_THIS - -m4_ifdef(`__BOOL_PROTECTED_GCLASS__', -`protected:',`dnl else -private:')dnl endif - - friend class __CPPNAME__`'_Class; - static CppClassType `'__BASE__`'_class_; - - // noncopyable - __CPPNAME__`'(const __CPPNAME__&); - __CPPNAME__& operator=(const __CPPNAME__&); - -protected: - explicit __CPPNAME__`'(const Glib::ConstructParams& construct_params); - explicit __CPPNAME__`'(__CNAME__* castitem); - -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - static GType get_type() G_GNUC_CONST; - static GType get_base_type() G_GNUC_CONST; -#endif - - ///Provides access to the underlying C GtkObject. - __CNAME__* gobj() { return reinterpret_cast<__CNAME__*>(gobject_); } - - ///Provides access to the underlying C GtkObject. - const __CNAME__* gobj() const { return reinterpret_cast<__CNAME__*>(gobject_); } - -_H_VFUNCS_AND_SIGNALS() - -private: -_IMPORT(SECTION_CLASS2) - -') - diff --git a/libs/glibmm2/tools/m4/class_interface.m4 b/libs/glibmm2/tools/m4/class_interface.m4 deleted file mode 100644 index c08dec9ca2..0000000000 --- a/libs/glibmm2/tools/m4/class_interface.m4 +++ /dev/null @@ -1,264 +0,0 @@ -dnl $Id: class_interface.m4,v 1.7 2006/07/19 16:32:41 murrayc Exp $ - - -define(`_CLASS_INTERFACE',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') -define(`__CCAST__',`$3') -define(`__CCLASS__',`$4') dnl SomethingIface or SomethingClass, both suffixes are used. -define(`__BASE__',_LOWER(__CPPNAME__)) -define(`__CPPPARENT__',`Glib::Interface') -dnl define(`__CPARENT__',`GObject') -define(`__PCAST__',`(GObject*)') -define(`__BOOL_IS_INTERFACE__',`1') - - -_POP() -_SECTION(SECTION_CLASS2) -') dnl end of _CLASS_INTERFACE - - -dnl Some of the Gdk types are actually direct typedefs of their base type. -dnl This means that 2 wrap functions would have the same argument. -dnl define(`_NO_WRAP_FUNCTION',`dnl -dnl _PUSH() -dnl Define this macro to be tested for later. -dnl define(`__BOOL_NO_WRAP_FUNCTION__',`$1') -dnl _POP() -dnl ') - -dnl -dnl -dnl -define(`_PH_CLASS_DECLARATION_INTERFACE',`dnl -class __CPPNAME__`'_Class : public Glib::Interface_Class -{ -public: - typedef __CPPNAME__ CppObjectType; - typedef __CNAME__ BaseObjectType; - typedef __CCLASS__ BaseClassType; - typedef __CPPPARENT__`'_Class CppClassParent; - - friend class __CPPNAME__; - - const Glib::Interface_Class& init(); - - static void iface_init_function(void* g_iface, void* iface_data); - - static Glib::ObjectBase* wrap_new(GObject*); - -protected: - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - //Callbacks (default signal handlers): - //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. - //You could prevent the original default signal handlers being called by overriding the *_impl method. -_IMPORT(SECTION_PH_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - - //Callbacks (virtual functions): -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_PH_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED -}; -') - - -dnl -dnl -dnl -define(`_PCC_CLASS_IMPLEMENTATION_INTERFACE',`dnl -const Glib::Interface_Class& __CPPNAME__`'_Class::init() -{ - if(!gtype_) // create the GType if necessary - { - // Glib::Interface_Class has to know the interface init function - // in order to add interfaces to implementing types. - class_init_func_ = &__CPPNAME__`'_Class::iface_init_function; - - // We can not derive from another interface, and it is not necessary anyway. - gtype_ = _LOWER(__CCAST__)_get_type(); - } - - return *this; -} - -void __CPPNAME__`'_Class::iface_init_function(void* g_iface, void*) -{ - BaseClassType *const klass = static_cast(g_iface); - - //This is just to avoid an "unused variable" warning when there are no vfuncs or signal handlers to connect. - //This is a temporary fix until I find out why I can not seem to derive a GtkFileChooser interface. murrayc - g_assert(klass != 0); - -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_PCC_CLASS_INIT_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -_IMPORT(SECTION_PCC_CLASS_INIT_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -} - -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_PCC_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -_IMPORT(SECTION_PCC_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -') - - -dnl -dnl _END_CLASS_INTERFACE() -dnl denotes the end of a class -dnl -define(`_END_CLASS_INTERFACE',` -_SECTION(SECTION_HEADER1) -_STRUCT_PROTOTYPE() - -__NAMESPACE_BEGIN__ class __CPPNAME__`'_Class; __NAMESPACE_END__ -_SECTION(SECTION_HEADER3) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl -namespace Glib -{ - /** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. - * @result A C++ instance that wraps this C instance. - */ - Glib::RefPtr<__NAMESPACE__::__CPPNAME__> wrap(__CNAME__`'* object, bool take_copy = false); - -} // namespace Glib - -')dnl -dnl -dnl -_SECTION(SECTION_PHEADER) - -#include - -__NAMESPACE_BEGIN__ - -_PH_CLASS_DECLARATION_INTERFACE() - -__NAMESPACE_END__ - -_SECTION(SECTION_SRC_GENERATED) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else -namespace Glib -{ - -Glib::RefPtr<__NAMESPACE__::__CPPNAME__> wrap(__CNAME__`'* object, bool take_copy) -{ - return Glib::RefPtr<__NAMESPACE__::__CPPNAME__>( dynamic_cast<__NAMESPACE__::__CPPNAME__*> (Glib::wrap_auto ((GObject*)(object), take_copy)) ); - //We use dynamic_cast<> in case of multiple inheritance. -} - -} // namespace Glib -')dnl endif - - -__NAMESPACE_BEGIN__ - - -/* The *_Class implementation: */ - -_PCC_CLASS_IMPLEMENTATION_INTERFACE() - -Glib::ObjectBase* __CPPNAME__`'_Class::wrap_new(GObject* object) -{ - return new __CPPNAME__`'((__CNAME__*)`'(object)); -} - - -/* The implementation: */ - -__CPPNAME__::__CPPNAME__`'() -: - Glib::Interface(__BASE__`'_class_.init()) -{} - -__CPPNAME__::__CPPNAME__`'(__CNAME__* castitem) -: - __CPPPARENT__`'(__PCAST__`'(castitem)) -{} - -__CPPNAME__::~__CPPNAME__`'() -{} - -// static -void __CPPNAME__`'::add_interface(GType gtype_implementer) -{ - __BASE__`'_class_.init().add_interface(gtype_implementer); -} - -_CC_CLASS_IMPLEMENTATION() - -__NAMESPACE_END__ - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl The actual class, e.g. Gtk::Widget, declaration: -dnl _IMPORT(SECTION_H_SIGNALPROXIES_CUSTOM) - -_IMPORT(SECTION_CLASS1) - -#ifndef DOXYGEN_SHOULD_SKIP_THIS - -public: - typedef __CPPNAME__ CppObjectType; - typedef __CPPNAME__`'_Class CppClassType; - typedef __CNAME__ BaseObjectType; - typedef __CCLASS__ BaseClassType; - -private: - friend class __CPPNAME__`'_Class; - static CppClassType `'__BASE__`'_class_; - - // noncopyable - __CPPNAME__`'(const __CPPNAME__&); - __CPPNAME__& operator=(const __CPPNAME__&); - -protected: - __CPPNAME__`'(); // you must derive from this class - explicit __CPPNAME__`'(__CNAME__* castitem); - -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -public: - virtual ~__CPPNAME__`'(); - - static void add_interface(GType gtype_implementer); - -#ifndef DOXYGEN_SHOULD_SKIP_THIS - static GType get_type() G_GNUC_CONST; - static GType get_base_type() G_GNUC_CONST; -#endif - - ///Provides access to the underlying C GObject. - __CNAME__* gobj() { return reinterpret_cast<__CNAME__*>(gobject_); } - - ///Provides access to the underlying C GObject. - const __CNAME__* gobj() const { return reinterpret_cast<__CNAME__*>(gobject_); } - -private: -_IMPORT(SECTION_CLASS2) - -public: -_H_VFUNCS_AND_SIGNALS() - -') - diff --git a/libs/glibmm2/tools/m4/class_opaque_copyable.m4 b/libs/glibmm2/tools/m4/class_opaque_copyable.m4 deleted file mode 100644 index 0b8417fd95..0000000000 --- a/libs/glibmm2/tools/m4/class_opaque_copyable.m4 +++ /dev/null @@ -1,181 +0,0 @@ -dnl $Id: class_opaque_copyable.m4,v 1.2 2003/12/14 11:53:04 murrayc Exp $ - -dnl -dnl _CLASS_OPAQUE_COPYABLE(Region, GdkRegion, gdk_region_new, gdk_region_copy, gdk_region_destroy) -dnl - -define(`_CLASS_OPAQUE_COPYABLE',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') -define(`__OPAQUE_FUNC_NEW',`$3') -define(`__OPAQUE_FUNC_COPY',`$4') -define(`__OPAQUE_FUNC_FREE',`$5') - -define(`_CUSTOM_DEFAULT_CTOR',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_CUSTOM_DEFAULT_CTOR__',`$1') -_POP() -') - -_POP() -_SECTION(SECTION_CLASS2) -') dnl End of _CLASS_OPAQUE_COPYABLE. - - -dnl -dnl _END_CLASS_OPAQUE_COPYABLE() -dnl denotes the end of a class -dnl -define(`_END_CLASS_OPAQUE_COPYABLE',` - -_SECTION(SECTION_HEADER3) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else -namespace Glib -{ - - /** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. - * @result A C++ instance that wraps this C instance. - */ -__NAMESPACE__::__CPPNAME__ wrap(__CNAME__* object, bool take_copy = false); - -} // namespace Glib -')dnl endif __BOOL_NO_WRAP_FUNCTION__ - -_SECTION(SECTION_SRC_GENERATED) - -ifdef(`__BOOL_NO_WRAP_FUNCTION__',`dnl -',`dnl else -namespace Glib -{ - -__NAMESPACE__::__CPPNAME__ wrap(__CNAME__* object, bool take_copy /* = false */) -{ - return __NAMESPACE__::__CPPNAME__`'(object, take_copy); -} - -} // namespace Glib -')dnl endif - - -__NAMESPACE_BEGIN__ - -dnl -dnl The implementation: -dnl - -ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',`dnl -',`dnl else -__CPPNAME__::__CPPNAME__`'() -: -ifelse(__OPAQUE_FUNC_NEW,NONE,`dnl - gobject_ (0) // Allows creation of invalid wrapper, e.g. for output arguments to methods. -',`dnl else - gobject_ (__OPAQUE_FUNC_NEW`'()) -')dnl -{} -')dnl endif __BOOL_CUSTOM_DEFAULT_CTOR__ - -__CPPNAME__::__CPPNAME__`'(const __CPPNAME__& src) -: - gobject_ ((src.gobject_) ? __OPAQUE_FUNC_COPY`'(src.gobject_) : 0) -{} - -__CPPNAME__::__CPPNAME__`'(__CNAME__* castitem, bool make_a_copy /* = false */) -{ - if(!make_a_copy) - { - // It was given to us by a function which has already made a copy for us to keep. - gobject_ = castitem; - } - else - { - // We are probably getting it via direct access to a struct, - // so we can not just take it - we have to take a copy of it. - if(castitem) - gobject_ = __OPAQUE_FUNC_COPY`'(castitem); - else - gobject_ = 0; - } -} - -ifelse(__OPAQUE_FUNC_COPY,NONE,`dnl -',`dnl else -__CPPNAME__& __CPPNAME__::operator=(const __CPPNAME__`'& src) -{ - __CNAME__ *const new_gobject = (src.gobject_) ? __OPAQUE_FUNC_COPY`'(src.gobject_) : 0; - - if(gobject_) - __OPAQUE_FUNC_FREE`'(gobject_); - - gobject_ = new_gobject; - - return *this; -} -')dnl - -__CPPNAME__::~__CPPNAME__`'() -{ - if(gobject_) - __OPAQUE_FUNC_FREE`'(gobject_); -} - -__CNAME__* __CPPNAME__::gobj_copy() const -{ - return __OPAQUE_FUNC_COPY`'(gobject_); -} - -_IMPORT(SECTION_CC) - -__NAMESPACE_END__ - - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl -dnl The actual class, e.g. Pango::FontDescription, declaration: -dnl -_IMPORT(SECTION_CLASS1) -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __CNAME__ BaseObjectType; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -ifdef(`__BOOL_CUSTOM_DEFAULT_CTOR__',`dnl -',`dnl else - __CPPNAME__`'(); -')dnl - - // Use make_a_copy=true when getting it directly from a struct. - explicit __CPPNAME__`'(__CNAME__* castitem, bool make_a_copy = false); - - __CPPNAME__`'(const __CPPNAME__& src); - __CPPNAME__& operator=(const __CPPNAME__& src); - - ~__CPPNAME__`'(); - - __CNAME__* gobj() { return gobject_; } - const __CNAME__* gobj() const { return gobject_; } - - ///Provides access to the underlying C instance. The caller is responsible for freeing it. Use when directly setting fields in structs. - __CNAME__* gobj_copy() const; - -protected: - __CNAME__* gobject_; - -private: -_IMPORT(SECTION_CLASS2) -') - diff --git a/libs/glibmm2/tools/m4/class_opaque_refcounted.m4 b/libs/glibmm2/tools/m4/class_opaque_refcounted.m4 deleted file mode 100644 index e64b2647c1..0000000000 --- a/libs/glibmm2/tools/m4/class_opaque_refcounted.m4 +++ /dev/null @@ -1,172 +0,0 @@ -dnl $Id: class_opaque_refcounted.m4,v 1.3 2003/12/14 11:53:04 murrayc Exp $ - -dnl -dnl _CLASS_OPAQUE_REFCOUNTED(Coverage, PangoCoverage, pango_coverage_new, pango_coverage_ref, pango_coverage_unref) -dnl - -define(`_CLASS_OPAQUE_REFCOUNTED',`dnl -_PUSH() -dnl -dnl Define the args for later macros -define(`__CPPNAME__',`$1') -define(`__CNAME__',`$2') -define(`__OPAQUE_FUNC_NEW',`$3') -define(`__OPAQUE_FUNC_REF',`$4') -define(`__OPAQUE_FUNC_UNREF',`$5') - -_POP() -_SECTION(SECTION_CLASS2) -')dnl End of _CLASS_OPAQUE_REFCOUNTED. - - -dnl -dnl _END_CLASS_OPAQUE_REFCOUNTED() -dnl denotes the end of a class -dnl -define(`_END_CLASS_OPAQUE_REFCOUNTED',` - -_SECTION(SECTION_HEADER3) - -namespace Glib -{ - - /** @relates __NAMESPACE__::__CPPNAME__ - * @param object The C instance - * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. - * @result A C++ instance that wraps this C instance. - */ - Glib::RefPtr<__NAMESPACE__::__CPPNAME__> wrap(__CNAME__* object, bool take_copy = false); - -} // namespace Glib - -_SECTION(SECTION_SRC_GENERATED) - -/* Why reinterpret_cast<__CPPNAME__*>(gobject) is needed: - * - * A __CPPNAME__ instance is in fact always a __CNAME__ instance. - * Unfortunately, __CNAME__ cannot be a member of __CPPNAME__, - * because it is an opaque struct. Also, the C interface does not provide - * any hooks to install a destroy notification handler, thus we cannot - * wrap it dynamically either. - * - * The cast works because __CPPNAME__ does not have any member data, and - * it is impossible to derive from it. This is ensured by not implementing - * the (protected) default constructor. The ctor is protected rather than - * private just to avoid a compile warning. - */ - -namespace Glib -{ - -Glib::RefPtr<__NAMESPACE__::__CPPNAME__> wrap(__CNAME__* object, bool take_copy) -{ - if(take_copy && object) - __OPAQUE_FUNC_REF`'(object); - - // See the comment at the top of this file, if you want to know why the cast works. - return Glib::RefPtr<__NAMESPACE__::__CPPNAME__>(reinterpret_cast<__NAMESPACE__::__CPPNAME__*>(object)); -} - -} // namespace Glib - - -__NAMESPACE_BEGIN__ - -dnl -dnl The implementation: -dnl - -ifelse(__OPAQUE_FUNC_NEW,NONE,`dnl -',`dnl else -// static -Glib::RefPtr<__CPPNAME__> __CPPNAME__::create() -{ - // See the comment at the top of this file, if you want to know why the cast works. - return Glib::RefPtr<__CPPNAME__>(reinterpret_cast<__CPPNAME__*>(__OPAQUE_FUNC_NEW`'())); -} -')dnl endif __OPAQUE_FUNC_NEW - -void __CPPNAME__::reference() const -{ - // See the comment at the top of this file, if you want to know why the cast works. - __OPAQUE_FUNC_REF`'(reinterpret_cast<__CNAME__*>(const_cast<__CPPNAME__*>(this))); -} - -void __CPPNAME__::unreference() const -{ - // See the comment at the top of this file, if you want to know why the cast works. - __OPAQUE_FUNC_UNREF`'(reinterpret_cast<__CNAME__*>(const_cast<__CPPNAME__*>(this))); -} - -__CNAME__* __CPPNAME__::gobj() -{ - // See the comment at the top of this file, if you want to know why the cast works. - return reinterpret_cast<__CNAME__*>(this); -} - -const __CNAME__* __CPPNAME__::gobj() const -{ - // See the comment at the top of this file, if you want to know why the cast works. - return reinterpret_cast(this); -} - -__CNAME__* __CPPNAME__::gobj_copy() const -{ - // See the comment at the top of this file, if you want to know why the cast works. - __CNAME__ *const gobject = reinterpret_cast<__CNAME__*>(const_cast<__CPPNAME__*>(this)); - __OPAQUE_FUNC_REF`'(gobject); - return gobject; -} - -_IMPORT(SECTION_CC) - -__NAMESPACE_END__ - - -dnl -dnl -dnl -dnl -_POP() -dnl -dnl -dnl The actual class, e.g. Pango::FontDescription, declaration: -dnl -_IMPORT(SECTION_CLASS1) -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __CNAME__ BaseObjectType; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - -ifelse(__OPAQUE_FUNC_NEW,NONE,`dnl -',`dnl else - static Glib::RefPtr<__CPPNAME__> create(); -')dnl endif __OPAQUE_FUNC_NEW - - // For use with Glib::RefPtr<> only. - void reference() const; - void unreference() const; - - ///Provides access to the underlying C instance. - __CNAME__* gobj(); - - ///Provides access to the underlying C instance. - const __CNAME__* gobj() const; - - ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. - __CNAME__* gobj_copy() const; - -protected: - // Do not derive this. __NAMESPACE__::__CPPNAME__ can neither be constructed nor deleted. - __CPPNAME__`'(); - void operator delete(void*, size_t); - -private: - // noncopyable - __CPPNAME__`'(const __CPPNAME__&); - __CPPNAME__& operator=(const __CPPNAME__&); - -_IMPORT(SECTION_CLASS2) -') - diff --git a/libs/glibmm2/tools/m4/class_shared.m4 b/libs/glibmm2/tools/m4/class_shared.m4 deleted file mode 100644 index c96f6099ac..0000000000 --- a/libs/glibmm2/tools/m4/class_shared.m4 +++ /dev/null @@ -1,221 +0,0 @@ -dnl $Id: class_shared.m4,v 1.6 2006/09/19 20:07:30 murrayc Exp $ - -define(`_CLASS_START',`dnl -_PUSH(SECTION_CLASS1) -') - -dnl -dnl -dnl -define(`_H_VFUNCS_AND_SIGNALS',`dnl - -public: - //C++ methods used to invoke GTK+ virtual functions: -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_H_VFUNCS_CPPWRAPPER) -#endif //GLIBMM_VFUNCS_ENABLED - -protected: - //GTK+ Virtual Functions (override these to change behaviour): -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_H_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED - - //Default Signal Handlers:: -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -_IMPORT(SECTION_H_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -') - - -dnl -dnl -dnl -define(`_IMPLEMENTS_INTERFACE_CC',`dnl -_PUSH(SECTION_CC_IMPLEMENTS_INTERFACES) -ifelse(`$2',,,`#ifdef $2' -)dnl - $1`'::add_interface(get_type()); -ifelse(`$2',,,` -#endif // $2 -')dnl -_POP() -') - - - -dnl -dnl -dnl -define(`_PH_CLASS_DECLARATION',`dnl -class __CPPNAME__`'_Class : public Glib::Class -{ -public: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef __CPPNAME__ CppObjectType; - typedef __REAL_CNAME__ BaseObjectType; -ifdef(`__BOOL_NO_DERIVED_CLASS__',`dnl -',`dnl - typedef __REAL_CNAME__`'Class BaseClassType; - typedef __CPPPARENT__`'_Class CppClassParent; - typedef __REAL_CPARENT__`'Class BaseClassParent; -')dnl - - friend class __CPPNAME__; -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - - const Glib::Class& init(); - -ifdef(`__BOOL_NO_DERIVED_CLASS__',`dnl -',`dnl - static void class_init_function(void* g_class, void* class_data); -')dnl - - static Glib::ObjectBase* wrap_new(GObject*); - -protected: - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - //Callbacks (default signal handlers): - //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. - //You could prevent the original default signal handlers being called by overriding the *_impl method. -_IMPORT(SECTION_PH_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - - //Callbacks (virtual functions): -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_PH_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED -}; -') - - -dnl -dnl -dnl -define(`_PCC_CLASS_IMPLEMENTATION',`dnl -const Glib::Class& __CPPNAME__`'_Class::init() -{ - if(!gtype_) // create the GType if necessary - { - // Glib::Class has to know the class init function to clone custom types. - class_init_func_ = &__CPPNAME__`'_Class::class_init_function; - - // This is actually just optimized away, apparently with no harm. - // Make sure that the parent type has been created. - //CppClassParent::CppObjectType::get_type(); - - // Create the wrapper type, with the same class/instance size as the base type. - register_derived_type(_LOWER(__CCAST__)_get_type()); - - // Add derived versions of interfaces, if the C type implements any interfaces: -_IMPORT(SECTION_CC_IMPLEMENTS_INTERFACES) - } - - return *this; -} -ifdef(`__BOOL_NO_DERIVED_CLASS__',`dnl -',`dnl - -void __CPPNAME__`'_Class::class_init_function(void* g_class, void* class_data) -{ - BaseClassType *const klass = static_cast(g_class); - CppClassParent::class_init_function(klass, class_data); - -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_PCC_CLASS_INIT_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -_IMPORT(SECTION_PCC_CLASS_INIT_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -} -')dnl - -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_PCC_VFUNCS) -#endif //GLIBMM_VFUNCS_ENABLED - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -_IMPORT(SECTION_PCC_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -') - - - -dnl -dnl -dnl -define(`_CC_CLASS_IMPLEMENTATION',`dnl -__CPPNAME__::CppClassType __CPPNAME__::`'__BASE__`'_class_; // initialize static member - -GType __CPPNAME__::get_type() -{ - return __BASE__`'_class_.init().get_type(); -} - -GType __CPPNAME__::get_base_type() -{ - return _LOWER(__CCAST__)_get_type(); -} - -_IMPORT(SECTION_CC) - -dnl _IMPORT(SECTION_CC_SIGNALPROXIES_CUSTOM) - -_IMPORT(SECTION_CC_SIGNALPROXIES) - -_IMPORT(SECTION_CC_PROPERTYPROXIES) - -#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -_IMPORT(SECTION_CC_DEFAULT_SIGNAL_HANDLERS) -#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED - -#ifdef GLIBMM_VFUNCS_ENABLED -_IMPORT(SECTION_CC_VFUNCS) -_IMPORT(SECTION_CC_VFUNCS_CPPWRAPPER) -#endif //GLIBMM_VFUNCS_ENABLED -') - -dnl _PARENT_GCLASS_FROM_OBJECT(object_instance_name) -define(`_PARENT_GCLASS_FROM_OBJECT',`dnl -g_type_class_peek_parent`'(G_OBJECT_GET_CLASS`'($1)) // Get the parent class of the object class (The original underlying C class). -') - -dnl _IFACE_PARENT_FROM_OBJECT(object_instance_name) -define(`_IFACE_PARENT_FROM_OBJECT',`dnl -g_type_interface_peek_parent`'( // Get the parent interface of the interface (The original underlying C interface). -g_type_interface_peek`'(G_OBJECT_GET_CLASS`'($1), CppObjectType::get_type`'()) // Get the interface. -)dnl -') - -dnl Bonobo doesn't use the "typedef struct _somestruct struct" system. -define(`_STRUCT_NOT_HIDDEN',`dnl -_PUSH() -dnl Define this macro to be tested for later. -define(`__BOOL_STRUCT_NOT_HIDDEN__',`$1') -_POP() -') - -dnl _STRUCT_PROTOTYPE() -define(`_STRUCT_PROTOTYPE',`dnl -#ifndef DOXYGEN_SHOULD_SKIP_THIS -ifdef(`__BOOL_STRUCT_NOT_HIDDEN__',`dnl -',`dnl -typedef struct _`'__CNAME__ __CNAME__; -typedef struct _`'__CNAME__`'Class __CNAME__`'Class; -')dnl -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ -') - -dnl _GTKMMPROC_WIN32_NO_WRAP -dnl Just process it to remove it from the generated file. -dnl generate_wrap_init.pl will look for this in the original .hg file. -dnl -define(`_GTKMMPROC_WIN32_NO_WRAP', dnl -`//This is not available in on Win32. -//This source file will not be compiled, -//and the class will not be registered in wrap_init.h or wrap_init.cc -')dnl - - diff --git a/libs/glibmm2/tools/m4/compare.m4 b/libs/glibmm2/tools/m4/compare.m4 deleted file mode 100644 index c439700306..0000000000 --- a/libs/glibmm2/tools/m4/compare.m4 +++ /dev/null @@ -1,118 +0,0 @@ -dnl $Id: compare.m4,v 1.2 2003/12/14 11:53:04 murrayc Exp $ - -define(`__OPERATOR_DECL',`dnl -/** @relates __NAMESPACE__::__CPPNAME__ - * @param lhs The left-hand side - * @param rhs The right-hand side - * @result The result - */ -bool operator`'$1`'(const __CPPNAME__& lhs, const __CPPNAME__& rhs); -') - -define(`__OPERATOR_IMPL',`dnl -bool operator`'$1`'(const __CPPNAME__& lhs, const __CPPNAME__& rhs) -{' -ifelse`'(`__UNCONST__',`unconst',`dnl - return ($2`'(const_cast<__CNAME__*>(lhs.gobj()), const_cast<__CNAME__*>(rhs.gobj())) $3); -',`dnl else - return ($2`'(lhs.gobj(), rhs.gobj()) $3); -')`dnl endif -} -') - - -dnl -dnl _WRAP_EQUAL(gdk_region_equal, unconst) -dnl -define(`_WRAP_EQUAL',`dnl -pushdef(`__FUNC_EQUAL__',$1)dnl -pushdef(`__UNCONST__',$2)dnl -_PUSH(SECTION_HEADER3) - -__NAMESPACE_BEGIN__ - -__OPERATOR_DECL(`==') -__OPERATOR_DECL(`!=') - -__NAMESPACE_END__ - -_SECTION(SECTION_CC) - -__OPERATOR_IMPL(`==', __FUNC_EQUAL__, `!= 0') -__OPERATOR_IMPL(`!=', __FUNC_EQUAL__, `== 0') - -_POP() -popdef(`__UNCONST__')dnl -popdef(`__FUNC_EQUAL__')dnl -')dnl enddef _WRAP_EQUAL - - -dnl -dnl _WRAP_COMPARE(gtk_tree_path_compare) -dnl -define(`_WRAP_COMPARE',`dnl -pushdef(`__FUNC_COMPARE__',$1)dnl -pushdef(`__UNCONST__',$2)dnl -_PUSH(SECTION_HEADER3) - -__NAMESPACE_BEGIN__ - -__OPERATOR_DECL(`==') -__OPERATOR_DECL(`!=') -__OPERATOR_DECL(`<') -__OPERATOR_DECL(`>') -__OPERATOR_DECL(`<=') -__OPERATOR_DECL(`>=') - -__NAMESPACE_END__ - -_SECTION(SECTION_CC) - -__OPERATOR_IMPL(`==', __FUNC_COMPARE__, `== 0') -__OPERATOR_IMPL(`!=', __FUNC_COMPARE__, `!= 0') -__OPERATOR_IMPL(`<', __FUNC_COMPARE__, `< 0') -__OPERATOR_IMPL(`>', __FUNC_COMPARE__, `> 0') -__OPERATOR_IMPL(`<=', __FUNC_COMPARE__, `<= 0') -__OPERATOR_IMPL(`>=', __FUNC_COMPARE__, `>= 0') - -_POP() -popdef(`__UNCONST__')dnl -popdef(`__FUNC_COMPARE__')dnl -')dnl enddef _WRAP_COMPARE - - -dnl -dnl _WRAP_EQUAL_AND_COMPARE(gtk_text_iter_equal, gtk_text_iter_compare) -dnl -define(`_WRAP_EQUAL_AND_COMPARE',`dnl -pushdef(`__FUNC_EQUAL__',$1)dnl -pushdef(`__FUNC_COMPARE__',$2)dnl -pushdef(`__UNCONST__',$3)dnl -_PUSH(SECTION_HEADER3) - -__NAMESPACE_BEGIN__ - -__OPERATOR_DECL(`==') -__OPERATOR_DECL(`!=') -__OPERATOR_DECL(`<') -__OPERATOR_DECL(`>') -__OPERATOR_DECL(`<=') -__OPERATOR_DECL(`>=') - -__NAMESPACE_END__ - -_SECTION(SECTION_CC) - -__OPERATOR_IMPL(`==', __FUNC_EQUAL__, `!= 0') -__OPERATOR_IMPL(`!=', __FUNC_EQUAL__, `== 0') -__OPERATOR_IMPL(`<', __FUNC_COMPARE__, `< 0') -__OPERATOR_IMPL(`>', __FUNC_COMPARE__, `> 0') -__OPERATOR_IMPL(`<=', __FUNC_COMPARE__, `<= 0') -__OPERATOR_IMPL(`>=', __FUNC_COMPARE__, `>= 0') - -_POP() -popdef(`__UNCONST__')dnl -popdef(`__FUNC_COMPARE__')dnl -popdef(`__FUNC_EQUAL__')dnl -')dnl enddef _WRAP_EQUAL_AND_COMPARE - diff --git a/libs/glibmm2/tools/m4/convert_base.m4 b/libs/glibmm2/tools/m4/convert_base.m4 deleted file mode 100644 index 2d97d1ddd9..0000000000 --- a/libs/glibmm2/tools/m4/convert_base.m4 +++ /dev/null @@ -1,71 +0,0 @@ -dnl $Id: convert_base.m4,v 1.3 2006/05/16 19:42:36 murrayc Exp $ - -# -# Define a hashing for names -# -define(`__HASH',`__`'m4_translit(`$*',`ABCDEFGHIJKLMNOPQRSTUVWXYZ<>[]&*, ',`abcdefghijklmnopqrstuvwxyzVBNMRSC_')`'') -define(`__EQUIV',`m4_ifdef(EV`'__HASH(`$1'),EV`'__HASH(`$1'),`$1')') - -define(`__HASH2',`dnl -pushdef(`__E1',__EQUIV(`$1'))pushdef(`__E2',__EQUIV(`$2'))dnl -m4_ifelse(__E1,__E2,`__EQ',__HASH(__E1)`'__HASH(__E2))`'dnl -popdef(`__E1')popdef(`__E2')`'') - -define(`CF__EQ',`$3') - -# -# _CONVERT(fromtype, totype, name, wrap_line) -# Print the conversion from ctype to cpptype -define(`_CONVERT',`dnl -m4_ifelse(`$2',void,`$3',`dnl -pushdef(`__COV',`CF`'__HASH2(`$1',`$2')')dnl -m4_ifdef(__COV,`m4_indir(__COV,`$1',`$2',`$3')',` -m4_errprint(`No conversion from $1 to $2 defined (line: $4, parameter name: $3) -') -m4_m4exit(1) -')`'dnl -')`'dnl -') - - -# -# Functions for populating the tables. -# -define(`_CONVERSION',` -m4_ifelse(`$3',,,`define(CF`'__HASH2(`$1',`$2'),`$3')') -') - -define(`_EQUAL',`define(EV`'__HASH(`$1'),`$2')') - -/*******************************************************************/ - - -define(`__ARG3__',`$`'3') -define(`_CONV_ENUM',`dnl -_CONVERSION(`$1$2', `$2', (($2)(__ARG3__))) -_CONVERSION(`$1$2', `$1::$2', (($1::$2)(__ARG3__))) -_CONVERSION(`$2', `$1$2', (($1$2)(__ARG3__))) -_CONVERSION(`$1::$2', `$1$2', (($1$2)(__ARG3__))) -')dnl - -# e.g. Glib::RefPtr to GdkSomething* -define(`__CONVERT_REFPTR_TO_P',`Glib::unwrap($`'3)') - -# e.g. Glib::RefPtr to GdkSomething* -#define(`__CONVERT_CONST_REFPTR_TO_P',`const_cast<$`'2>($`'3->gobj())') -define(`__CONVERT_CONST_REFPTR_TO_P',`const_cast<$`'2>(Glib::unwrap($`'3))') - -# The Sun Forte compiler doesn't seem to be able to handle these, so we are using the altlernative, __CONVERT_CONST_REFPTR_TO_P_SUN. -# The Sun compiler gives this error, for instance: -#  "widget.cc", line 4463: Error: Overloading ambiguity between "Glib::unwrap(const Glib::RefPtr&)" and -# "Glib::unwrap(const Glib::RefPtr&)". -# -define(`__CONVERT_CONST_REFPTR_TO_P_SUN',`const_cast<$`'2>(Glib::unwrap<$1>($`'3))') - - -include(convert_gtk.m4) -include(convert_pango.m4) -include(convert_gdk.m4) -include(convert_atk.m4) -include(convert_glib.m4) - diff --git a/libs/glibmm2/tools/m4/convert_glib.m4 b/libs/glibmm2/tools/m4/convert_glib.m4 deleted file mode 100644 index 990b664894..0000000000 --- a/libs/glibmm2/tools/m4/convert_glib.m4 +++ /dev/null @@ -1,64 +0,0 @@ -dnl -dnl Glib C names have prefix 'G' but C++ namespace Glib -dnl -define(`_CONV_GLIB_ENUM',`dnl -_CONVERSION(`G$1', `$1', (($1)(__ARG3__))) -_CONVERSION(`G$1', `Glib::$1', ((Glib::$1)(__ARG3__))) -_CONVERSION(`$1', `G$1', ((G$1)(__ARG3__))) -_CONVERSION(`Glib::$1', `G$1', ((G$1)(__ARG3__))) -')dnl - -_EQUAL(gchar,char) -_EQUAL(gchar*,char*) -_EQUAL(gchar**,char**) -_EQUAL(gint**,int**) -_EQUAL(gchar**,char*[]) -_EQUAL(const gchar*,const char*) -_EQUAL(const-gchar*,const char*) -_EQUAL(gpointer*,void**) - -_CONV_GLIB_ENUM(IOStatus) -_CONV_GLIB_ENUM(IOFlags) -_CONV_GLIB_ENUM(IOCondition) -_CONV_GLIB_ENUM(SeekType) -_CONV_GLIB_ENUM(OptionArg) -_CONV_GLIB_ENUM(KeyFileFlags) - -_CONVERSION(`gunichar&',`gunichar*',`&($3)') -_CONVERSION(`gsize&',`gsize*',`&($3)') - - -# Strings: -define(`__GCHARP_TO_USTRING',`Glib::convert_const_gchar_ptr_to_ustring($`'3)') -define(`__GCHARP_TO_STDSTRING',`Glib::convert_const_gchar_ptr_to_stdstring($`'3)') - -_CONVERSION(`const Glib::ustring&',`const char*',`$3.c_str()') -_CONVERSION(`const std::string&',`const char*',`$3.c_str()') -_CONVERSION(`const Glib::ustring&',`gchar*',`const_cast($3.c_str())') -_CONVERSION(`gchar*',`Glib::ustring',__GCHARP_TO_USTRING) -_CONVERSION(`const-gchar*',`Glib::ustring',__GCHARP_TO_USTRING) -_CONVERSION(`const gchar*',`Glib::ustring',__GCHARP_TO_USTRING) -_CONVERSION(`const char*',`Glib::ustring',__GCHARP_TO_USTRING) -_CONVERSION(`const char*',`std::string',__GCHARP_TO_STDSTRING) -_CONVERSION(`const gchar*',`const Glib::ustring&',__GCHARP_TO_USTRING) -_CONVERSION(`const char*',`const-gchar*',`$3') -_CONVERSION(`const-gchar*',`const char*',`$3') - -_CONVERSION(`return-gchar*',`Glib::ustring',`Glib::convert_return_gchar_ptr_to_ustring($3)') -_CONVERSION(`return-gchar*',`std::string',`Glib::convert_return_gchar_ptr_to_stdstring($3)') -_CONVERSION(`return-char*',`Glib::ustring',`Glib::convert_return_gchar_ptr_to_ustring($3)') - -_CONVERSION(`const Glib::RefPtr&',`GObject*',__CONVERT_REFPTR_TO_P) -_CONVERSION(`const Glib::RefPtr&',`GObject*',__CONVERT_CONST_REFPTR_TO_P_SUN(Glib::Object)) -_CONVERSION(`GObject*',`Glib::RefPtr',`Glib::wrap($3)') -_CONVERSION(`GObject*',`Glib::RefPtr',`Glib::wrap($3)') - -_CONVERSION(`Glib::ValueBase&',`GValue*',`($3).gobj()') -_CONVERSION(`const Glib::ValueBase&',`const GValue*',`($3).gobj()') -_CONVERSION(`const Glib::ValueBase&',`GValue*',`const_cast(($3).gobj())') -_CONVERSION(`GValue*', `Glib::ValueBase&', `*reinterpret_cast($3)') -_CONVERSION(`const GValue*', `const Glib::ValueBase&', `*reinterpret_cast($3)') - -_CONVERSION(`OptionGroup&',`GOptionGroup*',`($3).gobj()') -#_CONVERSION(`GOptionGroup*',`OptionGroup',`Glib::wrap(($3), true /* take_copy */)') - diff --git a/libs/glibmm2/tools/m4/ctor.m4 b/libs/glibmm2/tools/m4/ctor.m4 deleted file mode 100644 index 9c00433aa1..0000000000 --- a/libs/glibmm2/tools/m4/ctor.m4 +++ /dev/null @@ -1,64 +0,0 @@ -dnl $Id: ctor.m4,v 1.1.1.1 2003/01/07 16:59:09 murrayc Exp $ - -dnl -dnl -dnl Code generation sections for making a constructor. -dnl -dnl - -dnl -dnl Declares and implements the default constructor -dnl -define(`_CTOR_DEFAULT',`dnl -__CPPNAME__`'(); -_PUSH(SECTION_CC) -__CPPNAME__::__CPPNAME__`'() -: - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - __CPPPARENT__`'(Glib::ConstructParams(__BASE__`'_class_.init())) -{ - _IMPORT(SECTION_CC_INITIALIZE_CLASS_EXTRA) -} - -_POP()') - - -dnl -dnl Constructors for _new functions. -dnl $1 $2 $3 $4 -dnl _CTOR_IMPL(cppname,cname,cppargs,c_varargs) -define(`_CTOR_IMPL',`dnl -_PUSH(SECTION_CC) -__CPPNAME__::$1`'($3) -: - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - __CPPPARENT__`'(Glib::ConstructParams(__BASE__`'_class_.init()`'ifelse(`$4',,,`, $4')`', (char*) 0)) -{ - _IMPORT(SECTION_CC_INITIALIZE_CLASS_EXTRA) -} - -_POP()') - -define(`_CONSTRUCT',`dnl -Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - __CPPPARENT__`'(Glib::ConstructParams(__BASE__`'_class_.init()ifelse(`$1',,,`, $@'), (char*) 0))dnl -')dnl - -dnl _CONSTRUCT() does not deal with multiple class definitions in one file. -dnl If necessary, _CONSTRUCT_SPECIFIC(BaseClass, Class) must be used instead. -dnl -define(`_CONSTRUCT_SPECIFIC',`dnl -Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - $1`'(Glib::ConstructParams(_LOWER($2)_class_.init()ifelse(`$3',,,`, shift(shift($@))'), (char*) 0))dnl -')dnl - - -dnl -dnl Extra code for initialize_class. -dnl Not commonly used. -dnl -define(`_INITIALIZE_CLASS_EXTRA',`dnl -_PUSH(SECTION_CC_INITIALIZE_CLASS_EXTRA) -$1 -_POP()') - diff --git a/libs/glibmm2/tools/m4/doc.m4 b/libs/glibmm2/tools/m4/doc.m4 deleted file mode 100644 index 9bc055159d..0000000000 --- a/libs/glibmm2/tools/m4/doc.m4 +++ /dev/null @@ -1,3 +0,0 @@ -dnl $Id: doc.m4,v 1.1.1.1 2003/01/07 16:59:09 murrayc Exp $ - -divert(-1) diff --git a/libs/glibmm2/tools/m4/enum.m4 b/libs/glibmm2/tools/m4/enum.m4 deleted file mode 100644 index bb5cabcd59..0000000000 --- a/libs/glibmm2/tools/m4/enum.m4 +++ /dev/null @@ -1,101 +0,0 @@ - -dnl -dnl _ENUM(cpp_type, c_type, value_suffix, `element_list', `flags', `optional_refdoc_comment', 'get_type_function_name') -dnl -m4_define(`_ENUM',`dnl -_PUSH() - -m4_define(`__ENUM_CPPNAME__',`$1') -m4_define(`__ENUM_CNAME__',`$2') -m4_define(`__ENUM_VALUE_BASE__',`Glib::Value_$3<__NAMESPACE__::__ENUM_CPPNAME__>') - -_POP() -dnl -dnl // Define a new Doxygen group if this is the first enum in the file. -dnl -m4_ifdef(`__DOCGROUP_'__MODULE_CANONICAL__`_ENUMS__',,`dnl else -m4_define(`__DOCGROUP_'__MODULE_CANONICAL__`_ENUMS__')dnl -/** @addtogroup '__MODULE_CANONICAL__`Enums Enums and Flags */ - -')dnl endif -dnl -dnl -/**$6 - * @ingroup __MODULE_CANONICAL__`'Enums -m4_ifelse($3,Flags,`dnl - * @par Bitwise operators: - * %__ENUM_CPPNAME__ operator|(__ENUM_CPPNAME__, __ENUM_CPPNAME__)
- * %__ENUM_CPPNAME__ operator&(__ENUM_CPPNAME__, __ENUM_CPPNAME__)
- * %__ENUM_CPPNAME__ operator^(__ENUM_CPPNAME__, __ENUM_CPPNAME__)
- * %__ENUM_CPPNAME__ operator~(__ENUM_CPPNAME__)
- * %__ENUM_CPPNAME__& operator|=(__ENUM_CPPNAME__&, __ENUM_CPPNAME__)
- * %__ENUM_CPPNAME__& operator&=(__ENUM_CPPNAME__&, __ENUM_CPPNAME__)
- * %__ENUM_CPPNAME__& operator^=(__ENUM_CPPNAME__&, __ENUM_CPPNAME__)
-')dnl endif - */ -enum __ENUM_CPPNAME__ -{ -$4 -}; -m4_ifelse($3,Flags,`dnl - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__ operator|(__ENUM_CPPNAME__ lhs, __ENUM_CPPNAME__ rhs) - { return static_cast<__ENUM_CPPNAME__>(static_cast(lhs) | static_cast(rhs)); } - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__ operator&(__ENUM_CPPNAME__ lhs, __ENUM_CPPNAME__ rhs) - { return static_cast<__ENUM_CPPNAME__>(static_cast(lhs) & static_cast(rhs)); } - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__ operator^(__ENUM_CPPNAME__ lhs, __ENUM_CPPNAME__ rhs) - { return static_cast<__ENUM_CPPNAME__>(static_cast(lhs) ^ static_cast(rhs)); } - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__ operator~(__ENUM_CPPNAME__ flags) - { return static_cast<__ENUM_CPPNAME__>(~static_cast(flags)); } - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__& operator|=(__ENUM_CPPNAME__& lhs, __ENUM_CPPNAME__ rhs) - { return (lhs = static_cast<__ENUM_CPPNAME__>(static_cast(lhs) | static_cast(rhs))); } - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__& operator&=(__ENUM_CPPNAME__& lhs, __ENUM_CPPNAME__ rhs) - { return (lhs = static_cast<__ENUM_CPPNAME__>(static_cast(lhs) & static_cast(rhs))); } - -/** @ingroup __MODULE_CANONICAL__`'Enums */ -inline __ENUM_CPPNAME__& operator^=(__ENUM_CPPNAME__& lhs, __ENUM_CPPNAME__ rhs) - { return (lhs = static_cast<__ENUM_CPPNAME__>(static_cast(lhs) ^ static_cast(rhs))); } -')dnl endif Flags - -m4_ifelse($5,`NO_GTYPE',,`dnl else -__NAMESPACE_END__ - - -#ifndef DOXYGEN_SHOULD_SKIP_THIS -namespace Glib -{ - -template <> -class Value<__NAMESPACE__::__ENUM_CPPNAME__> : public __ENUM_VALUE_BASE__ -{ -public: - static GType value_type() G_GNUC_CONST; -}; - -} // namespace Glib -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - - -__NAMESPACE_BEGIN__ -_PUSH(SECTION_SRC_GENERATED) -// static -GType Glib::Value<__NAMESPACE__::__ENUM_CPPNAME__>::value_type() -{ - return _GET_TYPE_FUNC(__ENUM_CNAME__); -} - -_POP() -')dnl endif !NO_GTYPE -')dnl enddef _ENUM - diff --git a/libs/glibmm2/tools/m4/gerror.m4 b/libs/glibmm2/tools/m4/gerror.m4 deleted file mode 100644 index 12f166f138..0000000000 --- a/libs/glibmm2/tools/m4/gerror.m4 +++ /dev/null @@ -1,102 +0,0 @@ -dnl $Id: gerror.m4,v 1.2 2006/05/12 08:08:45 murrayc Exp $ - -dnl -dnl _GERROR(PixbufError,GdkPixbufError,GDK_PIXBUF_ERROR,`',[NO_GTYPE]) -dnl - -m4_define(`_GERROR',`dnl -_PUSH() -dnl -dnl Define the args for later macros -m4_define(`__CPPNAME__',`$1') -m4_define(`__CNAME__',`$2') -m4_define(`__CQUARK__',`$3') -m4_define(`__VALUE_BASE__',`Glib::Value_Enum<__NAMESPACE__::__CPPNAME__::Code>') -_POP() -class __CPPNAME__ : public Glib::Error -{ -public: - enum Code - { -$4 - }; - - __CPPNAME__`'(Code error_code, const Glib::ustring& error_message); - explicit __CPPNAME__`'(GError* gobject); - Code code() const; - -#ifndef DOXYGEN_SHOULD_SKIP_THIS -private: - -#ifdef GLIBMM_EXCEPTIONS_ENABLED - static void throw_func(GError* gobject); -#else - //When not using exceptions, we just pass the Exception object around without throwing it: - static std::auto_ptr throw_func(GError* gobject); -#endif //GLIBMM_EXCEPTIONS_ENABLED - - friend void wrap_init(); // uses throw_func() -#endif -}; - -m4_ifelse($5,`NO_GTYPE',,`dnl else -__NAMESPACE_END__ - -#ifndef DOXYGEN_SHOULD_SKIP_THIS -namespace Glib -{ - -template <> -class Value<__NAMESPACE__::__CPPNAME__::Code> : public __VALUE_BASE__ -{ -public: - static GType value_type() G_GNUC_CONST; -}; - -} // namespace Glib -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - - -__NAMESPACE_BEGIN__ -')dnl endif !NO_GTYPE -_PUSH(SECTION_SRC_GENERATED) - -__NAMESPACE__::__CPPNAME__::__CPPNAME__`'(__NAMESPACE__::__CPPNAME__::Code error_code, const Glib::ustring& error_message) -: - Glib::Error (__CQUARK__, error_code, error_message) -{} - -__NAMESPACE__::__CPPNAME__::__CPPNAME__`'(GError* gobject) -: - Glib::Error (gobject) -{} - -__NAMESPACE__::__CPPNAME__::Code __NAMESPACE__::__CPPNAME__::code() const -{ - return static_cast(Glib::Error::code()); -} - -#ifdef GLIBMM_EXCEPTIONS_ENABLED -void __NAMESPACE__::__CPPNAME__::throw_func(GError* gobject) -{ - throw __NAMESPACE__::__CPPNAME__`'(gobject); -} -#else -//When not using exceptions, we just pass the Exception object around without throwing it: -std::auto_ptr __NAMESPACE__::__CPPNAME__::throw_func(GError* gobject) -{ - return std::auto_ptr(new __NAMESPACE__::__CPPNAME__`'(gobject)); -} -#endif //GLIBMM_EXCEPTIONS_ENABLED - -m4_ifelse($5,`NO_GTYPE',,`dnl else -// static -GType Glib::Value<__NAMESPACE__::__CPPNAME__::Code>::value_type() -{ - return _GET_TYPE_FUNC(__CNAME__); -} - -')dnl endif !NO_GTYPE -_POP() -') dnl enddef _GERROR - diff --git a/libs/glibmm2/tools/m4/list.m4 b/libs/glibmm2/tools/m4/list.m4 deleted file mode 100644 index c92b13df65..0000000000 --- a/libs/glibmm2/tools/m4/list.m4 +++ /dev/null @@ -1,230 +0,0 @@ -_PUSH() - -dnl -dnl These variables affect the generation of the list -dnl -define(GP_LIST_HELPER_NAMESPACE,`define(`__LIST_NAMESPACE__',$1)') -define(GP_LIST_ELEM,`define(`__LISTELEM__',`$*')') -define(GP_LIST_ITER,`define(`__LISTITER__',`$*')') -define(GP_LIST_NOINSERT,`define(`__LISTEO__')') - -dnl -dnl GP_LIST(ListName, ParentCppType, ParentCType, ChildCppType, FieldNameC) -dnl -dnl In the .ccg file, you'll need to implement: -dnl iterator insert(iterator position, element_type& e); -dnl -dnl Fieldname assumed to be children if not specified -define(GP_LIST,` -_PUSH() - -define(`__LISTNAME__',$1) -define(`__LISTPARENT__',$2) -define(`__LISTPARENT_G__',$3) -define(`__LISTTYPE__',$4) -define(`__LISTELEM__',const Element) -define(`__LISTITER__',Glib::List_Iterator< __LISTTYPE__ >) -define(`__LIST_NAMESPACE__',$2_Helpers) -#define(`__LISTFIELD__',ifelse($5,,children,$5)) -define(`__LISTFIELD__',$5) - -_SECTION(SECTION_USR) -') - -dnl -dnl GP_LIST_END() -dnl -dnl Closes a list -define(GP_LIST_END,`dnl -_POP() - -class __LISTNAME__ : public Glib::HelperList< __LISTTYPE__, __LISTELEM__, __LISTITER__ > -{ -public: - __LISTNAME__`'(); - explicit __LISTNAME__`'(__LISTPARENT_G__* gparent); - __LISTNAME__`'(const __LISTNAME__& src); - virtual ~__LISTNAME__`'() {} - - __LISTNAME__& operator=(const __LISTNAME__& src); - - typedef Glib::HelperList< __LISTTYPE__, __LISTELEM__, __LISTITER__ > type_base; - - __LISTPARENT_G__* gparent(); - const __LISTPARENT_G__* gparent() const; - - virtual GList*& glist() const; // front of list - - virtual void erase(iterator start, iterator stop); - virtual iterator erase(iterator); //Implented as custom or by LIST_CONTAINER_REMOVE - virtual void remove(const_reference); //Implented as custom or by LIST_CONTAINER_REMOVE - - /// This is order n. (use at own risk) - reference operator[](size_type l) const; - -ifdef(`__LISTEO__',`dnl -protected: - //Hide these because it's read-only: - iterator insert(iterator position, element_type& e); - - inline void pop_front(); - inline void pop_back(); -,`dnl -public: - iterator insert(iterator position, element_type& e); //custom-implemented. - - template - inline void insert(iterator position, InputIterator first, InputIterator last) - { - for(;first != last; ++first) - position = insert(position, *first); - } - - inline void push_front(element_type& e) - { insert(begin(), e); } - inline void push_back(element_type& e) - { insert(end(), e); } -')dnl - -_IMPORT(SECTION_USR) -}; - -_PUSH(SECTION_CC) - -namespace __LIST_NAMESPACE__ -{ - -__LISTNAME__::__LISTNAME__`'() -{} - -__LISTNAME__::__LISTNAME__`'(__LISTPARENT_G__* gparent) -: type_base((GObject*)gparent) -{} - -__LISTNAME__::__LISTNAME__`'(const __LISTNAME__& src) -: - type_base(src) -{} - -__LISTNAME__& __LISTNAME__::operator=(const __LISTNAME__& src) -{ - type_base::operator=(src); - return *this; -} - -ifelse(__LISTFIELD__,CUSTOM,`dnl -',`dnl else -GList*& __LISTNAME__::glist() const -{ - return ((__LISTPARENT_G__*)gparent_)->__LISTFIELD__; -} -')dnl endif - -void __LISTNAME__::erase(iterator start, iterator stop) -{ - type_base::erase(start, stop); -} - -__LISTPARENT_G__* __LISTNAME__::gparent() -{ - return (__LISTPARENT_G__*)type_base::gparent(); -} - -const __LISTPARENT_G__* __LISTNAME__::gparent() const -{ - return (__LISTPARENT_G__*)type_base::gparent(); -} - -__LISTNAME__::reference __LISTNAME__::operator[](size_type l) const -{ - return type_base::operator[](l); -} - -} /* namespace __LIST_NAMESPACE__ */ - -undefine(`__LISTNAME__')dnl -undefine(`__LISTTYPE__')dnl -undefine(`__LISTPARENT__')dnl -undefine(`__LISTELEM__')dnl -undefine(`__LISTFIELD__')dnl -_POP() -') - -dnl -dnl GP_LIST_FIND(access_method) -dnl -dnl Defines find(containertype) and find(Widget&) -dnl access_method is the name of method returning a Widget* -define(GP_LIST_FIND,` - iterator find(const_reference c); - iterator find(Widget&); -_PUSH(SECTION_CC) - -namespace __LIST_NAMESPACE__ -{ - -__LISTNAME__::iterator __LISTNAME__::find(const_reference w) -{ - iterator i = begin(); - for(i = begin(); i != end() && (i->ifelse($1,,,$1()->)gobj() != w.ifelse($1,,,$1()->)gobj()); i++); - return i; -} - -__LISTNAME__::iterator __LISTNAME__::find(Widget& w) -{ - iterator i; - for(i = begin(); i != end() && ((GtkWidget*)i->ifelse($1,,,$1()->)gobj() != w.gobj()); i++); - return i; -} - -} /* namespace __LIST_NAMESPACE__ */ - -_POP() -') - -dnl -dnl GP_LIST_CONTAINER_REMOVE(access_method) -dnl -dnl Implements remove(const_reference), erase(iterator) -dnl and defines remove(Widget&) -dnl (assumes that the widget uses gtk+ container methods). -dnl access_method is the name of the method returning a Widget* -define(GP_LIST_CONTAINER_REMOVE,` -virtual void remove(Widget& w); //Implented as custom or by LIST_CONTAINER_REMOVE -_PUSH(SECTION_CC) - -namespace __LIST_NAMESPACE__ -{ - -void __LISTNAME__::remove(const_reference child) -{ - gtk_container_remove(GTK_CONTAINER(gparent_), - (GtkWidget*)(child.ifelse($1,,,$1()->)gobj())); -} - -void __LISTNAME__::remove(Widget& widget) -{ - gtk_container_remove(GTK_CONTAINER(gparent_), (GtkWidget*)(widget.gobj())); -} - -__LISTNAME__::iterator __LISTNAME__::erase(iterator position) -{ - //Check that it is a valid iterator, to a real item: - if ( !position.node_|| (position == end()) ) - return end(); - - //Get an iterator the the next item, to return: - iterator next = position; - next++; - - //Use GTK+ C function to remove it, by providing the GtkWidget*: - gtk_container_remove( GTK_CONTAINER(gparent_), (GtkWidget*)(position->ifelse($1,,,$1()->)gobj()) ); - return next; -} - -} /* namespace __LIST_NAMESPACE__ */ - -_POP() -') - -_POP()dnl diff --git a/libs/glibmm2/tools/m4/member.m4 b/libs/glibmm2/tools/m4/member.m4 deleted file mode 100644 index ed144cdd5e..0000000000 --- a/libs/glibmm2/tools/m4/member.m4 +++ /dev/null @@ -1,132 +0,0 @@ -dnl -dnl --------------------------- Accessors ---------------------------- -dnl - - -dnl Get: - - -dnl Creates accessors for simple types: -dnl _MEMBER_GET(cpp_name, c_name, cpp_type, c_type, deprecated (optional)) -define(`_MEMBER_GET',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -$3 get_$1() const; -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl -_PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -$3 __CPPNAME__::get_$1() const -{ - return _CONVERT($4,$3,`gobj()->$2'); -} -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl - -_POP()') - -dnl Creates two accessors for pointer types, one const and one non-const: -define(`_MEMBER_GET_PTR',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -$3 get_$1(); - const $3 get_$1() const; -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl -_PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -$3 __CPPNAME__::get_$1() -{ - return _CONVERT($4,$3,`gobj()->$2'); -} - -const $3 __CPPNAME__::get_$1() const -{ - return _CONVERT($4,const $3,`gobj()->$2'); -} -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl - -_POP()') - -dnl Creates accessors for GObject-derived types that must be ref()ed. -define(`_MEMBER_GET_GOBJECT',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -Glib::RefPtr<$3> get_$1(); - Glib::RefPtr get_$1() const; -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl -_PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -Glib::RefPtr<$3> __CPPNAME__::get_$1() -{ - Glib::RefPtr<$3> ref_ptr(_CONVERT($4,Glib::RefPtr<$3>,`gobj()->$2')); - -dnl We could use the bool with Glib::wrap(), but we want to share the m4 type-conversion map. - if(ref_ptr) - ref_ptr->reference(); - - return ref_ptr; -} - -Glib::RefPtr __CPPNAME__::get_$1() const -{ - Glib::RefPtr ref_ptr(_CONVERT($4,Glib::RefPtr,`gobj()->$2')); - -dnl We could use the bool with Glib::wrap(), but we want to share the m4 type-conversion map. - if(ref_ptr) - ref_ptr->reference(); - - return ref_ptr; -} -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl - -_POP()') - - -dnl Set: - -dnl Creates accessors for simple types: -define(`_MEMBER_SET',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -void set_$1(const $3`'& value); -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl -_PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -void __CPPNAME__::set_$1(const $3`'& value) -{ - gobj()->$2 = _CONVERT($3,$4,`value'); -} -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl - -_POP()') - -dnl Creates accessors for pointer types: -define(`_MEMBER_SET_PTR',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -void set_$1($3 value); -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl -_PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -void __CPPNAME__::set_$1($3 value) -{ - gobj()->$2 = _CONVERT($3,$4,`value'); -} -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl - -_POP()') - -dnl Creates accessors for GObject-derived types that must be ref()ed. -define(`_MEMBER_SET_GOBJECT',`dnl -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -void set_$1(const Glib::RefPtr<$3>& value); -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl -_PUSH(SECTION_CC) -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_START ') dnl -void __CPPNAME__::set_$1(const Glib::RefPtr<$3>& value) -{ - Glib::RefPtr<$3> valueOld(_CONVERT($4,Glib::RefPtr<$3>,`gobj()->$2')); //Take possession of the old one, unref-ing it in the destructor. - - if(value) - value->reference(); //Ref once for the recipient. - - gobj()->$2 = _CONVERT(const Glib::RefPtr<$3>&,$4,`value'); -} -ifelse(`$5',`deprecated',`_DEPRECATE_IFDEF_END ') dnl - -_POP()') - - diff --git a/libs/glibmm2/tools/m4/method.m4 b/libs/glibmm2/tools/m4/method.m4 deleted file mode 100644 index b6b5eeca08..0000000000 --- a/libs/glibmm2/tools/m4/method.m4 +++ /dev/null @@ -1,108 +0,0 @@ -dnl $Id: method.m4,v 1.10 2006/09/19 20:07:30 murrayc Exp $ - -dnl -dnl -dnl Code generation sections for making a method. -dnl -dnl - - -dnl -dnl method -dnl $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 -dnl _METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,const,refreturn,errthrow,deprecated,constversion,ifdef, arglist_without_types) -define(`_METHOD',`dnl -_PUSH(SECTION_CC) -ifelse(`$10',,,`_DEPRECATE_IFDEF_START -')dnl -ifelse(`$13',,,`#ifdef $13' -)dnl -ifelse(`$9',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED' -)dnl -$3 __CPPNAME__::$1`'($5)ifelse(`$7',1,` const') -ifelse(`$9',,,`#else -$3 __CPPNAME__::$1`'(`'$5`'ifelse(($5),(),`',`, ')std::auto_ptr& error)ifelse(`$7',1,` const') -#endif //GLIBMM_EXCEPTIONS_ENABLED -')dnl -{ -ifelse(`$11',,dnl -`ifelse(`$8'`$9',,dnl If it is not errthrow or refreturn -`ifelse(`$3',void,dnl If it returns voids: -`$2(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6);' dnl It it returns non-void: -,` return _CONVERT($4,$3,`$2`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6)');')'dnl End if it returns voids. -,dnl If is errthrow or refreturn -`ifelse(`$9',,,` GError* gerror = 0;') - ifelse(`$3',void,,``$3' retvalue = ')_CONVERT($4,$3,`$2`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'ifelse(`$6',,,`, ')$6)');dnl -ifelse(`$9',,,` -#ifdef GLIBMM_EXCEPTIONS_ENABLED - if(gerror) - ::Glib::Error::throw_exception(gerror); -#else - if(gerror) - error = ::Glib::Error::throw_exception(gerror); -#endif //GLIBMM_EXCEPTIONS_ENABLED -') -ifelse(`$8',,,`dnl - if(retvalue) - retvalue->reference(); //The function does not do a ref for us. -')dnl -ifelse(`$3',void,,` return retvalue;') -')dnl End errthrow/refreturn -',` return const_cast<__CPPNAME__*>(this)->$1($12);') -} - -ifelse(`$13',,,` -#endif // $13 -')dnl -ifelse(`$10',,,`_DEPRECATE_IFDEF_END -')dnl -_POP()') - -dnl -dnl static method -dnl $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 -dnl _STATIC_METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,refreturn,errthrow,deprecated,ifdef)) -define(`_STATIC_METHOD',`dnl -_PUSH(SECTION_CC) -ifelse(`$9',,,`_DEPRECATE_IFDEF_START -')dnl -ifelse(`$10',,,`#ifdef $10' -)dnl -ifelse(`$8',,,`#ifdef GLIBMM_EXCEPTIONS_ENABLED -')dnl -$3 __CPPNAME__::$1($5) -ifelse(`$8',,,`#else -$3 __CPPNAME__::$1(`'$5`'ifelse(($5),(),`',`, ')std::auto_ptr& error) -#endif //GLIBMM_EXCEPTIONS_ENABLED -')dnl -{ -ifelse(`$7'`$8',,dnl -`ifelse(`$3',void,,` return ')_CONVERT($4,$3,`$2`'($6)'); -',dnl -`ifelse(`$8',,,` GError* gerror = 0;') - ifelse(`$3',void,,``$3' retvalue = ')_CONVERT($4,$3,`$2`'($6)'); -ifelse(`$8',,,` -#ifdef GLIBMM_EXCEPTIONS_ENABLED - if(gerror) - ::Glib::Error::throw_exception(gerror); -#else - if(gerror) - error = ::Glib::Error::throw_exception(gerror); -#endif //GLIBMM_EXCEPTIONS_ENABLED -') -ifelse(`$7',,,`dnl - if(retvalue) - retvalue->reference(); //The function does not do a ref for us. -')dnl -ifelse(`$3',void,,` return retvalue;') -')dnl -} - -ifelse(`$10',,,` -#endif // $10 -')dnl -ifelse(`$9',,,`_DEPRECATE_IFDEF_END -') -_POP()') - - diff --git a/libs/glibmm2/tools/m4/property.m4 b/libs/glibmm2/tools/m4/property.m4 deleted file mode 100644 index a031ff4eeb..0000000000 --- a/libs/glibmm2/tools/m4/property.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl $Id: property.m4,v 1.6 2006/05/12 08:08:45 murrayc Exp $ - -dnl -dnl -dnl Code generation sections for properties -dnl -dnl - -dnl -dnl _PROPERTY_PROXY(name, name_underscored, cpp_type, proxy_suffix, docs) -dnl proxy_suffix could be "_WriteOnly" or "_ReadOnly" -dnl The method will be const if the propertyproxy is _ReadOnly. -dnl -define(`_PROPERTY_PROXY',`dnl -dnl -dnl Put spaces around the template parameter if necessary. -pushdef(`__PROXY_TYPE__',`dnl -Glib::PropertyProxy$4<'ifelse(regexp(_QUOTE($3),`>$'),`-1',_QUOTE($3),` '_QUOTE($3)` ')`>'dnl -)dnl -#ifdef GLIBMM_PROPERTIES_ENABLED -/** $5 - * - * You rarely need to use properties because there are get_ and set_ methods for almost all of them. - * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when - * the value of the property changes. - */ - __PROXY_TYPE__ property_$2`'() ifelse($4,_ReadOnly, const,); -#endif //#GLIBMM_PROPERTIES_ENABLED -_PUSH(SECTION_CC_PROPERTYPROXIES) -#ifdef GLIBMM_PROPERTIES_ENABLED -__PROXY_TYPE__ __CPPNAME__::property_$2`'() ifelse($4,_ReadOnly, const,) -{ - return __PROXY_TYPE__`'(this, "$1"); -} -#endif //GLIBMM_PROPERTIES_ENABLED - -_POP() -popdef(`__PROXY_TYPE__')dnl -')dnl - diff --git a/libs/glibmm2/tools/m4/signal.m4 b/libs/glibmm2/tools/m4/signal.m4 deleted file mode 100644 index 952975f5d0..0000000000 --- a/libs/glibmm2/tools/m4/signal.m4 +++ /dev/null @@ -1,267 +0,0 @@ - -# -# --------------------------- Signal Decl---------------------------- -# - -dnl _SIGNAL_PROXY($1 = c_signal_name, -dnl $2 = c_return_type, -dnl $3 = `', -dnl $4 = cpp_signal_name, -dnl $5 = cpp_return_type, -dnl $6 = `', -dnl $7 = `', -dnl $8 = `custom_c_callback (boolean)', -dnl $9 = `refdoc_comment', -dnl $10 = ifdef) - -define(`_SIGNAL_PROXY',` -$9 - -ifelse(`$10',,,`#ifdef $10' -)dnl - Glib::SignalProxy`'_NUM($6)< $5`'_COMMA_PREFIX($6) > signal_$4`'(); -ifelse(`$10',,,`#endif // $10 -')dnl -dnl -_PUSH(SECTION_ANONYMOUS_NAMESPACE) - -ifelse(`$10',,,`#ifdef $10' -)dnl -dnl -ifelse($2`'_NUM($3)`'$5`'_NUM($6),`void0void0',`dnl -dnl -dnl Use predefined callback for SignalProxy0, to reduce code size. - -static const Glib::SignalProxyInfo __CPPNAME__`'_signal_$4_info = -{ - "$1", - (GCallback) &Glib::SignalProxyNormal::slot0_void_callback, - (GCallback) &Glib::SignalProxyNormal::slot0_void_callback -}; -',`dnl else - -ifelse($8,`1',,`dnl Do not generate the implementation if it should be custom: -static $2 __CPPNAME__`'_signal_$4_callback`'(__CNAME__`'* self, _COMMA_SUFFIX($3)`'void* data) -{ - using namespace __NAMESPACE__; - typedef sigc::slot< $5`'_COMMA_PREFIX($6) > SlotType; - - // Do not try to call a signal on a disassociated wrapper. - if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) - { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - #endif //GLIBMM_EXCEPTIONS_ENABLED - if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot`'(data)) -ifelse(`$2',void,`dnl - (*static_cast(slot))($7); -',`dnl else - return _CONVERT($5,$2,`(*static_cast(slot))($7)'); -')dnl endif - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - } -ifelse($2,void,,`dnl else - - typedef $2 RType; - return RType`'(); -')dnl -} -ifelse($2,void,,`dnl else - -static $2 __CPPNAME__`'_signal_$4_notify_callback`'(__CNAME__`'* self, _COMMA_SUFFIX($3)`' void* data) -{ - using namespace __NAMESPACE__; - typedef sigc::slot< void`'_COMMA_PREFIX($6) > SlotType; - - // Do not try to call a signal on a disassociated wrapper. - if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) - { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try - { - #endif //GLIBMM_EXCEPTIONS_ENABLED - if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot`'(data)) - (*static_cast(slot))($7); - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - } - - typedef $2 RType; - return RType`'(); -} -')dnl endif -')dnl endif - -static const Glib::SignalProxyInfo __CPPNAME__`'_signal_$4_info = -{ - "$1", - (GCallback) &__CPPNAME__`'_signal_$4_callback, - (GCallback) &__CPPNAME__`'_signal_$4_`'ifelse($2,void,,notify_)`'callback -}; -')dnl endif - -ifelse(`$10',,,`#endif // $10 -')dnl - -_SECTION(SECTION_CC_SIGNALPROXIES) - -ifelse(`$10',,,`#ifdef $10' -)dnl -Glib::SignalProxy`'_NUM($6)< $5`'_COMMA_PREFIX($6) > __CPPNAME__::signal_$4`'() -{ - return Glib::SignalProxy`'_NUM($6)< $5`'_COMMA_PREFIX($6) >(this, &__CPPNAME__`'_signal_$4_info); -} -ifelse(`$10',,,`#endif // $10 -')dnl - -_POP()') - - -dnl -dnl _SIGNAL_PH(gname, crettype, cargs and names) -dnl Create a callback and set it in our derived G*Class. -dnl -define(`_SIGNAL_PH',`dnl -_PUSH(SECTION_PCC_CLASS_INIT_DEFAULT_SIGNAL_HANDLERS) -ifelse(`$4',,,`#ifdef $4' -)dnl - klass->$1 = `&'$1_callback; -ifelse(`$4',,,`#endif // $4 -')dnl -_SECTION(SECTION_PH_DEFAULT_SIGNAL_HANDLERS) -ifelse(`$4',,,`#ifdef $4' -)dnl - static $2 $1_callback`'($3); -ifelse(`$4',,,`#endif // $4 -')dnl -_POP()') - - - -dnl $1 $2 $3 $4 -dnl _SIGNAL_PCC(cppname,gname,cpprettype,crettype, -dnl $5 $6 $7 $8 $9 -dnl `',`',`', firstarg, ) -dnl -define(`_SIGNAL_PCC',`dnl -_PUSH(SECTION_PCC_DEFAULT_SIGNAL_HANDLERS) -ifelse(`$9',,,`#ifdef $9' -)dnl -$4 __CPPNAME__`'_Class::$2_callback`'($5) -{ -dnl We cast twice to allow for multiple-inheritance casts, which might -dnl change the value. We have to use a dynamic_cast because we do not -dnl know the actual type from which to cast up. - CppObjectType *const obj = dynamic_cast( - Glib::ObjectBase::_get_current_wrapper`'((GObject*)$8)); - -_IMPORT(SECTION_CHECK) - // Non-gtkmmproc-generated custom classes implicitly call the default - // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc- - // generated classes can use this optimisation, which avoids the unnecessary - // parameter conversions if there is no possibility of the virtual function - // being overridden: - if(obj && obj->is_derived_()) - { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. - { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. -ifelse($4,void,`dnl - obj->on_$1`'($7); -',`dnl - return _CONVERT($3,$4,`obj->on_$1`'($7)'); -')dnl - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(...) - { - Glib::exception_handlers_invoke`'(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - } - else - { - BaseClassType *const base = static_cast( -ifdef(`__BOOL_IS_INTERFACE__',`dnl - _IFACE_PARENT_FROM_OBJECT($8)dnl -',`dnl - _PARENT_GCLASS_FROM_OBJECT($8)dnl -') ); -dnl g_assert(base != 0); - - // Call the original underlying C function: - if(base && base->$2) - ifelse($4,void,,`return ')(*base->$2)`'($6); - } -ifelse($4,void,,`dnl - - typedef $4 RType; - return RType`'(); -')dnl -} -ifelse(`$9',,,`#endif // $9 -')dnl -_POP()') - - -dnl $1 $2 $3 $4 -dnl _SIGNAL_H(signame, rettype, `', ) -dnl -define(`_SIGNAL_H',`dnl -_PUSH(SECTION_H_DEFAULT_SIGNAL_HANDLERS) -ifelse(`$4',,,`#ifdef $4' -)dnl - virtual $2 on_$1`'($3); -ifelse(`$4',,,`#endif // $4 -')dnl -_POP()') - -dnl $1 $2 $3 $4 $5 $6 $7 $8 $9 -dnl _SIGNAL_CC(signame,gname,rettype,crettype,`',`', const, refreturn, ) -dnl -define(`_SIGNAL_CC',`dnl -_PUSH(SECTION_CC_DEFAULT_SIGNAL_HANDLERS) -ifelse(`$9',,,`#ifdef $9' -)dnl -$3 __NAMESPACE__::__CPPNAME__::on_$1`'($5) -{ - BaseClassType *const base = static_cast( -ifdef(`__BOOL_IS_INTERFACE__',`dnl - _IFACE_PARENT_FROM_OBJECT(gobject_)dnl -',`dnl - _PARENT_GCLASS_FROM_OBJECT(gobject_)dnl -') ); -dnl g_assert(base != 0); - - if(base && base->$2) -ifelse($3,void,`dnl - (*base->$2)`'(gobj`'()`'_COMMA_PREFIX($6)); -',`dnl -ifelse($8,refreturn,`dnl Assume Glib::wrap() is correct if refreturn is requested. - return Glib::wrap((*base->$2)`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'_COMMA_PREFIX($6)), true); -',`dnl - return _CONVERT($4,$3,`(*base->$2)`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'_COMMA_PREFIX($6))'); -')dnl - - typedef $3 RType; - return RType`'(); -')dnl -} -ifelse(`$9',,,`#endif // $9 -')dnl -_POP()') - diff --git a/libs/glibmm2/tools/m4/vfunc.m4 b/libs/glibmm2/tools/m4/vfunc.m4 deleted file mode 100644 index dc3eba10d2..0000000000 --- a/libs/glibmm2/tools/m4/vfunc.m4 +++ /dev/null @@ -1,145 +0,0 @@ -dnl -dnl _VFUNC_PH(gtkname, crettype, cargs and names) -dnl Create a callback and set it in our derived G*Class. -dnl -define(`_VFUNC_PH',`dnl -_PUSH(SECTION_PCC_CLASS_INIT_VFUNCS) -ifelse(`$4',,,`#ifdef $4' -)dnl - klass->$1 = `&'$1_vfunc_callback; -ifelse(`$4',,,`#endif // $4 -')dnl -_SECTION(SECTION_PH_VFUNCS) -ifelse(`$4',,,`#ifdef $4' -)dnl - static $2 $1_vfunc_callback`'($3); -ifelse(`$4',,,`#endif // $4 -')dnl -_POP()') - - -dnl $1 $2 $3 $4 -dnl _VFUNC_PCC(cppname,gtkname,cpprettype,crettype, -dnl $5 $6 $7 $8 $9 $10 -dnl `',`',`',firstarg, refreturn_ctype, ifdef) -dnl -define(`_VFUNC_PCC',`dnl -_PUSH(SECTION_PCC_VFUNCS) -ifelse(`$10',,,`#ifdef $10' -)dnl -$4 __CPPNAME__`'_Class::$2_vfunc_callback`'($5) -{ -dnl We cast twice to allow for multiple-inheritance casts, which might -dnl change the value. We have to use a dynamic_cast because we do not -dnl know the actual type from which to cast up. - CppObjectType *const obj = dynamic_cast( - Glib::ObjectBase::_get_current_wrapper`'((GObject*)$8)); - -_IMPORT(SECTION_CHECK) - // Non-gtkmmproc-generated custom classes implicitly call the default - // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc- - // generated classes can use this optimisation, which avoids the unnecessary - // parameter conversions if there is no possibility of the virtual function - // being overridden: - if(obj && obj->is_derived_()) - { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. - { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. -ifelse($4,void,`dnl - obj->$1`'($7); -',`dnl -ifelse($9,refreturn_ctype,`dnl Assume Glib::unwrap_copy() is correct if refreturn_ctype is requested. - return Glib::unwrap_copy`'(`obj->$1'($7)); -',`dnl - return _CONVERT($3,$4,`obj->$1`'($7)'); -')dnl -')dnl - #ifdef GLIBMM_EXCEPTIONS_ENABLED - } - catch(...) - { - Glib::exception_handlers_invoke`'(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED - } - else - { - BaseClassType *const base = static_cast( -ifdef(`__BOOL_IS_INTERFACE__',`dnl - _IFACE_PARENT_FROM_OBJECT($8)dnl -',`dnl - _PARENT_GCLASS_FROM_OBJECT($8)dnl -') ); -dnl g_assert(base != 0); - - // Call the original underlying C function: - if(base && base->$2) - ifelse($4,void,,`return ')(*base->$2)`'($6); - } -ifelse($4,void,,`dnl - - typedef $4 RType; - return RType`'(); -')dnl -} -ifelse(`$10',,,`#endif // $10 -')dnl -_POP()') - -# $1 $2 $3 $4 $5 $6 $7 $8 $9 -# _VFUNC_CC(vfunc_name, gtkname, cpp_rettype, c_rettype, `', `', is_const, refreturn, $ifdef) -# -define(`_VFUNC_CC',`dnl -_PUSH(SECTION_CC_VFUNCS) -ifelse(`$9',,,`#ifdef $9' -)dnl -$3 __NAMESPACE__::__CPPNAME__::$1`'($5) ifelse($7,1,const,) -{ - BaseClassType *const base = static_cast( -ifdef(`__BOOL_IS_INTERFACE__',`dnl - _IFACE_PARENT_FROM_OBJECT(gobject_)dnl -',`dnl - _PARENT_GCLASS_FROM_OBJECT(gobject_)dnl -') ); -dnl g_assert(base != 0); - - if(base && base->$2) -ifelse($3,void,`dnl - (*base->$2)`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'_COMMA_PREFIX($6)); -',`dnl -ifelse($8,refreturn,`dnl Assume Glib::wrap() is correct if refreturn is requested. - return Glib::wrap((*base->$2)`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'_COMMA_PREFIX($6)), true); -',`dnl - return _CONVERT($4,$3,`(*base->$2)`'(ifelse(`$7',1,const_cast<__CNAME__*>(gobj()),gobj())`'_COMMA_PREFIX($6))'); -')dnl - - typedef $3 RType; - return RType`'(); -')dnl -} -ifelse(`$9',,,`#endif // $9 -')dnl -_POP()') - - -# $1 $2 $3 $4 $5 -# _VFUNC_H(vfunc_name, rettype, `', is_const, ifndef) -# Only used for custom vfuncs. -# -define(`_VFUNC_H',`dnl -_PUSH(SECTION_H_VFUNCS) -ifelse(`$5',,,`#ifdef $5' -)dnl -ifelse($4,`1',`dnl -virtual $2 $1`'($3) const; -',`dnl -virtual $2 $1`'($3); -') -ifelse(`$5',,,`#endif // $5 -')dnl -_POP()') - - diff --git a/libs/glibmm2/tools/pm/DocsParser.pm b/libs/glibmm2/tools/pm/DocsParser.pm deleted file mode 100644 index 62ff6e718f..0000000000 --- a/libs/glibmm2/tools/pm/DocsParser.pm +++ /dev/null @@ -1,490 +0,0 @@ -# gtkmm - DocsParser module -# -# Copyright 2001 Free Software Foundation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# - -# Based on XML::Parser tutorial found at http://www.devshed.com/Server_Side/Perl/PerlXML/PerlXML1/page1.html -# This module isn't properly Object Orientated because the XML Parser needs global callbacks. - -package DocsParser; -use XML::Parser; -use strict; -use warnings; - -# use Util; -use Function; -use GtkDefs; -use Object; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - - @ISA = qw(Exporter); - @EXPORT = ( ); - %EXPORT_TAGS = ( ); - - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = ( ); -} -our @EXPORT_OK; - -##################################### - -use strict; -use warnings; - -##################################### - -$DocsParser::CurrentFile = ""; - -$DocsParser::refAppendTo = undef; # string reference to store the data into -$DocsParser::currentParam = undef; - -$DocsParser::objCurrentFunction = undef; #Function -%DocsParser::hasharrayFunctions = (); #Function elements -#~ $DocsParser::bOverride = 0; #First we parse the C docs, then we parse the C++ override docs. - -$DocsParser::commentStart = " /** "; -$DocsParser::commentMiddleStart = " * "; -$DocsParser::commentEnd = " */"; - -sub read_defs($$$) -{ - my ($path, $filename, $filename_override) = @_; - - my $objParser = new XML::Parser(ErrorContext => 0); - $objParser->setHandlers(Start => \&parse_on_start, End => \&parse_on_end, Char => \&parse_on_cdata); - - # C documentation: - $DocsParser::CurrentFile = "$path/$filename"; - if ( ! -r $DocsParser::CurrentFile) - { - print "DocsParser.pm: Warning: Can't read file \"" . $DocsParser::CurrentFile . "\".\n"; - return; - } - # Parse - eval { $objParser->parsefile($DocsParser::CurrentFile) }; - if( $@ ) - { - $@ =~ s/at \/.*?$//s; - print "\nError in \"" . $DocsParser::CurrentFile . "\":$@\n"; - return; - } - - # C++ overide documentation: - $DocsParser::CurrentFile = "$path/$filename_override"; - if ( ! -r $DocsParser::CurrentFile) - { - print "DocsParser.pm: Warning: Can't read file \"" . $DocsParser::CurrentFile . "\".\n"; - return; - } - # Parse - eval { $objParser->parsefile($DocsParser::CurrentFile) }; - if( $@ ) - { - $@ =~ s/at \/.*?$//s; - print "\nError in \"" . $DocsParser::CurrentFile . "\":$@"; - return; - } -} - -sub parse_on_start($$%) -{ - my ($objParser, $tag, %attr) = @_; - - $tag = lc($tag); - - if($tag eq "function") - { - if(defined $DocsParser::objCurrentFunction) - { - $objParser->xpcroak("\nClose a function tag before you open another one."); - } - - my $functionName = $attr{name}; - - #Reuse existing Function, if it exists: - #(For instance, if this is the override parse) - $DocsParser::objCurrentFunction = $DocsParser::hasharrayFunctions{$functionName}; - if(!$DocsParser::objCurrentFunction) - { - #Make a new one if necessary: - $DocsParser::objCurrentFunction = Function::new_empty(); - # The idea is to change the policy a bit: - # If a function is redefined in a later parsing run only values which are redefined - # will be overwritten. For the name this is trivial. The description is simply rewritten. - # Same goes for the return description and the class mapping. Only exception is the - # parameter list. Everytime we enter a tag the list is emptied again. - $$DocsParser::objCurrentFunction{name} = $functionName; - $$DocsParser::objCurrentFunction{description} = ""; - $$DocsParser::objCurrentFunction{param_names} = []; - $$DocsParser::objCurrentFunction{param_descriptions} = (); - $$DocsParser::objCurrentFunction{return_description} = ""; - $$DocsParser::objCurrentFunction{mapped_class} = ""; - # We don't need this any more, the only reference to this field is commented - # $$DocsParser::objCurrentFunction{description_overridden} = $DocsParser::bOverride; - } - } - elsif($tag eq "parameters") - { - $$DocsParser::objCurrentFunction{param_names} = []; - $$DocsParser::objCurrentFunction{param_descriptions} = (); - } - elsif($tag eq "parameter") - { - $DocsParser::currentParam = $attr{name}; - $$DocsParser::objCurrentFunction{param_descriptions}->{$DocsParser::currentParam} = ""; - } - elsif($tag eq "description") - { - $$DocsParser::objCurrentFunction{description} = ""; - # Set destination for parse_on_cdata(). - $DocsParser::refAppendTo = \$$DocsParser::objCurrentFunction{description}; - } - elsif($tag eq "parameter_description") - { - # Set destination for parse_on_cdata(). - my $param_desc = \$$DocsParser::objCurrentFunction{param_descriptions}; - $DocsParser::refAppendTo = \$$param_desc->{$DocsParser::currentParam}; - } - elsif($tag eq "return") - { - $$DocsParser::objCurrentFunction{return_description} = ""; - # Set destination for parse_on_cdata(). - $DocsParser::refAppendTo = \$$DocsParser::objCurrentFunction{return_description}; - } - elsif($tag eq "mapping") - { - $$DocsParser::objCurrentFunction{mapped_class} = $attr{class}; - } - elsif($tag ne "root") - { - $objParser->xpcroak("\nUnknown tag \"$tag\"."); - } -} - - -sub parse_on_end($$) -{ - my ($parser, $tag) = @_; - - # Clear destination for parse_on_cdata(). - $DocsParser::refAppendTo = undef; - - $tag = lc($tag); - - if($tag eq "function") - { - # Store the Function structure in the array: - my $functionName = $$DocsParser::objCurrentFunction{name}; - $DocsParser::hasharrayFunctions{$functionName} = $DocsParser::objCurrentFunction; - $DocsParser::objCurrentFunction = undef; - } - elsif($tag eq "parameter") - { - # and means the same. - if($DocsParser::currentParam eq "returns") - { - my $param_descriptions = \$$DocsParser::objCurrentFunction{param_descriptions}; - my $return_description = \$$DocsParser::objCurrentFunction{return_description}; - $$return_description = delete $$param_descriptions->{"returns"}; - } - else - { - # Append to list of parameters. - push(@{$$DocsParser::objCurrentFunction{param_names}}, $DocsParser::currentParam); - } - - $DocsParser::currentParam = undef; - } -} - - -sub parse_on_cdata($$) -{ - my ($parser, $data) = @_; - - if(defined $DocsParser::refAppendTo) - { - # Dispatch $data to the current destination string. - $$DocsParser::refAppendTo .= $data; - } -} - - -# $strCommentBlock lookup_documentation($strFunctionName) -sub lookup_documentation($$) -{ - my ($functionName, $deprecation_docs) = @_; - - my $objFunction = $DocsParser::hasharrayFunctions{$functionName}; - if(!$objFunction) - { - #print "DocsParser.pm: Warning: function not found: $functionName\n"; - return "" - } - - my $text = $$objFunction{description}; - - if(length($text) eq 0) - { - print "DocsParser.pm: Warning: No C docs for function: \"$functionName\"\n"; - } - - - DocsParser::convert_docs_to_cpp($objFunction, \$text); - - #Add note about deprecation if we have specified that in our _WRAP_METHOD() call: - if($deprecation_docs ne "") - { - $text .= "\n\@deprecated $deprecation_docs"; - } - - DocsParser::append_parameter_docs($objFunction, \$text); - DocsParser::append_return_docs($objFunction, \$text); - - - # Escape the space after "i.e." or "e.g." in the brief description. - $text =~ s/^([^.]*\b(?:i\.e\.|e\.g\.))\s/$1\\ /; - - # Convert to Doxygen-style comment. - $text =~ s/\n/\n${DocsParser::commentMiddleStart}/g; - $text = $DocsParser::commentStart . $text; - $text .= "\n${DocsParser::commentEnd}\n"; - - return $text; -} - - -sub append_parameter_docs($$) -{ - my ($obj_function, $text) = @_; - - my @param_names = @{$$obj_function{param_names}}; - my $param_descriptions = \$$obj_function{param_descriptions}; - - # Strip first parameter if this is a method. - my $defs_method = GtkDefs::lookup_method_dont_mark($$obj_function{name}); - # the second alternative is for use with method-mappings meaning: - # this function is mapped into this Gtk::class - shift(@param_names) if(($defs_method && $$defs_method{class} ne "") || - ($$obj_function{mapped_class} ne "")); - - foreach my $param (@param_names) - { - my $desc = $$param_descriptions->{$param}; - - $param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g; - DocsParser::convert_docs_to_cpp($obj_function, \$desc); - if(length($desc) > 0) - { - $desc .= '.' unless($desc =~ /(?:^|\.)$/); - $$text .= "\n\@param ${param} \u${desc}"; - } - } -} - - -sub append_return_docs($$) -{ - my ($obj_function, $text) = @_; - - my $desc = $$obj_function{return_description}; - DocsParser::convert_docs_to_cpp($obj_function, \$desc); - - $desc =~ s/\.$//; - $$text .= "\n\@return \u${desc}." unless($desc eq ""); -} - - -sub convert_docs_to_cpp($$) -{ - my ($obj_function, $text) = @_; - - # Chop off leading and trailing whitespace. - $$text =~ s/^\s+//; - $$text =~ s/\s+$//; -# HagenM: this is the only reference to $$obj_function{description_overridden} -# and it seems not to be in use. -# if(!$$obj_function{description_overridden}) -# { - # Convert C documentation to C++. - DocsParser::convert_tags_to_doxygen($text); - DocsParser::substitute_identifiers($$obj_function{name}, $text); - - $$text =~ s/\bX\s+Window\b/X \%Window/g; - $$text =~ s/\bWindow\s+manager/\%Window manager/g; -# } -} - - -sub convert_tags_to_doxygen($) -{ - my ($text) = @_; - - for($$text) - { - # Replace format tags. - s"<(/?)emphasis>"<$1em>"g; - s"<(/?)literal>"<$1tt>"g; - s"<(/?)function>"<$1tt>"g; - - # Some argument names are suffixed by "_" -- strip this. - # gtk-doc uses @thearg, but doxygen uses @a thearg. - s" ?\@([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?\b" \@a $1 "g; - s"^Note ?\d?: "\@note "mg; - - s"</?programlisting>""g; - s"<informalexample>"\@code"g; - s"</informalexample>"\@endcode"g; - s"<!>""g; - - # Remove all link tags. - s"</?u?link[^&]*>""g; - - # Remove all para tags (from tmpl sgml files). - s"</?para>""g; - - # Use our doxgen since/newin tags: - # TODO: Do this generically, regardless of the number: - s"Since: 2\.2"\@newin2p2"mg; - s"Since: 2\.4"\@newin2p4"mg; - s"Since: 2\.6"\@newin2p6"mg; - s"Since: 2\.8"\@newin2p8"mg; - s"Since: 2\.10"\@newin2p10"mg; - - s"\b->\b"->"g; - - # Doxygen is too dumb to handle — - s"—" \@htmlonly—\@endhtmlonly "g; - - s"\%?FALSE\b"false"g; - s"\%?TRUE\b"true"g; - s"\%?NULL\b"0"g; - - s"#?\bgboolean\b"bool"g; - s"#?\bg(int|short|long)\b"$1"g; - s"#?\bgu(int|short|long)\b"unsigned $1"g; - - # For Gtk::TextIter. - s"(\\[rn])\b"\\$1"g; - } -} - - -sub substitute_identifiers($$) -{ - my ($doc_func, $text) = @_; - - for($$text) - { - # TODO: handle more than one namespace - - s/[#%]([A-Z][a-z]*)([A-Z][A-Za-z]+)\b/$1::$2/g; # type names - - s/[#%]([A-Z])([A-Z]*)_([A-Z\d_]+)\b/$1\L$2\E::$3/g; # enum values - - # Undo wrong substitutions. - s/\bHas::/HAS_/g; - s/\bNo::/NO_/g; - - # Replace C function names with C++ counterparts. - s/\b([a-z]+_[a-z][a-z\d_]+) ?\(\)/&DocsParser::substitute_function($doc_func, $1)/eg; - } -} - - -sub substitute_function($$) -{ - my ($doc_func, $name) = @_; - - if(my $defs_method = GtkDefs::lookup_method_dont_mark($name)) - { - if(my $defs_object = DocsParser::lookup_object_of_method($$defs_method{class}, $name)) - { - my $module = $$defs_object{module}; - my $class = $$defs_object{name}; - - DocsParser::build_method_name($doc_func, $module, $class, \$name); - } - } - else - { - # Not perfect, but better than nothing. - $name =~ s/^g_/Glib::/; - } - - return $name . "()"; -} - - -sub lookup_object_of_method($$) -{ - my ($object, $name) = @_; - - if($object ne "") - { - # We already know the C object name, because $name is a non-static method. - return GtkDefs::lookup_object($object); - } - - my @parts = split(/_/, $name); - pop(@parts); - - # (gtk, foo, bar) -> (Gtk, Foo, Bar) - foreach(@parts) { $_ = (length > 2) ? ucfirst : uc; } - - # Do a bit of try'n'error. - while(scalar(@parts) > 1) - { - my $try = join("", @parts); - - if(my $defs_object = GtkDefs::lookup_object($try)) - { return $defs_object; } - - pop(@parts); - } - - return undef; -} - - -sub build_method_name($$$$) -{ - my ($doc_func, $module, $class, $name) = @_; - - my $prefix = $module . $class; - - $prefix =~ s/([a-z])([A-Z])/$1_$2/g; - $prefix = lc($prefix) . '_'; - - if($$name =~ /^$prefix/) - { - my $scope = ""; - $scope = "${module}::${class}::" unless($doc_func =~ /^$prefix/); - - substr($$name, 0, length($prefix)) = $scope; - } -} - - -1; # indicate proper module load. diff --git a/libs/glibmm2/tools/pm/Enum.pm b/libs/glibmm2/tools/pm/Enum.pm deleted file mode 100644 index 47485e152a..0000000000 --- a/libs/glibmm2/tools/pm/Enum.pm +++ /dev/null @@ -1,246 +0,0 @@ -package Enum; - -use strict; -use warnings; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - @ISA = qw(Exporter); - @EXPORT = ( ); - %EXPORT_TAGS = ( ); - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = ( ); - } -our @EXPORT_OK; - -# class Enum -# { -# bool flags; -# string type; -# string module; -# string c_type; -# -# string array elem_names; -# string array elem_values; -# -# bool mark; -# } - - -sub new -{ - my ($def) = @_; - my $self = {}; - bless $self; - - $def =~ s/^\(//; - $def =~ s/\)$//; - - $$self{mark} = 0; - $$self{flags} = 0; - - $$self{elem_names} = []; - $$self{elem_values} = []; - - # snarf down the fields - - if($def =~ s/^define-(enum|flags)-extended (\S+)//) - { - $$self{type} = $2; - $$self{flags} = 1 if($1 eq "flags"); - } - - $$self{module} = $1 if($def =~ s/\(in-module "(\S+)"\)//); - $$self{c_type} = $1 if($def =~ s/\(c-name "(\S+)"\)//); - - # values are compound lisp statement - if($def =~ s/\(values((?: '\("\S+" "\S+" "[^"]+"\))*) \)//) - { - $self->parse_values($1); - } - - if($def !~ /^\s*$/) - { - GtkDefs::error("Unhandled enum def ($def) in $$self{module}\::$$self{type}\n") - } - - # this should never happen - warn if(scalar(@{$$self{elem_names}}) != scalar(@{$$self{elem_values}})); - - return $self; -} - -sub parse_values($$) -{ - my ($self, $value) = @_; - - my $elem_names = []; - my $elem_values = []; - my $common_prefix = undef; - - # break up the value statements - foreach(split(/\s*'*[()]\s*/, $value)) - { - next if($_ eq ""); - - if(/^"\S+" "(\S+)" "([^"]+)"$/) - { - my ($name, $value) = ($1, $2); - - # detect whether there is module prefix common to all names, e.g. GTK_ - my $prefix = $1 if ($name =~ /^([^_]+_)/); - - if (not defined($common_prefix)) - { - $common_prefix = $prefix; - } - elsif ($prefix ne $common_prefix) - { - $common_prefix = ""; - } - - push(@$elem_names, $name); - push(@$elem_values, $value); - } - else - { - GtkDefs::error("Unknown value statement ($_) in $$self{c_type}\n"); - } - } - - if ($common_prefix) - { - # cut off the module prefix, e.g. GTK_ - s/^$common_prefix// foreach (@$elem_names); - } - - $$self{elem_names} = $elem_names; - $$self{elem_values} = $elem_values; -} - -sub beautify_values($) -{ - my ($self) = @_; - - return if($$self{flags}); - - my $elem_names = $$self{elem_names}; - my $elem_values = $$self{elem_values}; - - my $num_elements = scalar(@$elem_values); - return if($num_elements == 0); - - my $first = $$elem_values[0]; - return if($first !~ /^-?[0-9]+$/); - - my $prev = $first; - - # Continuous? (Aliases to prior enum values are allowed.) - foreach my $value (@$elem_values) - { - return if(($value < $first) || ($value > $prev + 1)); - $prev = $value; - } - - # This point is reached only if the values are a continuous range. - # 1) Let's kill all the superfluous values, for better readability. - # 2) Substitute aliases to prior enum values. - - my %aliases = (); - - for(my $i = 0; $i < $num_elements; ++$i) - { - my $value = \$$elem_values[$i]; - my $alias = \$aliases{$$value}; - - if(defined($$alias)) - { - $$value = $$alias; - } - else - { - $$alias = $$elem_names[$i]; - $$value = "" unless($first != 0 && $$value == $first); - } - } -} - -sub build_element_list($$$$) -{ - my ($self, $ref_flags, $ref_no_gtype, $indent) = @_; - - my @subst_in = []; - my @subst_out = []; - - # Build a list of custom substitutions, and recognize some flags too. - - foreach(@$ref_flags) - { - if(/^\s*(NO_GTYPE)\s*$/) - { - $$ref_no_gtype = $1; - } - elsif(/^\s*(get_type_func=)(\s*)\s*$/) - { - my $part1 = $1; - my $part2 = $2; - } - elsif(/^\s*s#([^#]+)#([^#]*)#\s*$/) - { - push(@subst_in, $1); - push(@subst_out, $2); - } - elsif($_ !~ /^\s*$/) - { - return undef; - } - } - - my $elem_names = $$self{elem_names}; - my $elem_values = $$self{elem_values}; - - my $num_elements = scalar(@$elem_names); - my $elements = ""; - - for(my $i = 0; $i < $num_elements; ++$i) - { - my $name = $$elem_names[$i]; - my $value = $$elem_values[$i]; - - for(my $ii = 0; $ii < scalar(@subst_in); ++$ii) - { - $name =~ s/${subst_in[$ii]}/${subst_out[$ii]}/; - $value =~ s/${subst_in[$ii]}/${subst_out[$ii]}/; - } - - $elements .= "${indent}${name}"; - $elements .= " = ${value}" if($value ne ""); - $elements .= ",\n" if($i < $num_elements - 1); - } - - return $elements; -} - -sub dump($) -{ - my ($self) = @_; - - print "\n"; - - my $elem_names = $$self{elem_names}; - my $elem_values = $$self{elem_values}; - - for(my $i = 0; $i < scalar(@$elem_names); ++$i) - { - print " \n"; - } - - print "\n\n"; -} - -1; # indicate proper module load. diff --git a/libs/glibmm2/tools/pm/Function.pm b/libs/glibmm2/tools/pm/Function.pm deleted file mode 100644 index 93cf596542..0000000000 --- a/libs/glibmm2/tools/pm/Function.pm +++ /dev/null @@ -1,351 +0,0 @@ -package Function; - -use strict; -use warnings; -use Util; -use FunctionBase; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - @ISA = qw(FunctionBase); - @EXPORT = qw(&func1 &func2 &func4); - %EXPORT_TAGS = ( ); - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = qw($Var1 %Hashit &func3); - } -our @EXPORT_OK; - -################################################## -### Function -# Commonly used algorithm for parsing a function declaration into -# its component pieces -# -# class Function : FunctionBase -# { -# string rettype; -# bool const; -# bool static; -# string name; e.g. gtk_accelerator_valid -# string c_name; -# string array param_type; -# string array param_name; -# string array param_default_value; -# string in_module; e.g. Gtk -# string signal_when. e.g. first, last, or both. -# string class e.g. GtkButton ( == of-object. Useful for signal because their names are not unique. -# string entity_type. e.g. method or signal -# } - -sub new_empty() -{ - my $self = {}; - bless $self; - - return $self; -} - -# $objFunction new($function_declaration, $objWrapParser) -sub new($$) -{ - #Parse a function/method declaration. - #e.g. guint gtk_something_set_thing(guint a, const gchar* something) - - my ($line, $objWrapParser) = @_; - - my $self = {}; - bless $self; - - #Initialize member data: - $$self{rettype} = ""; - $$self{rettype_needs_ref} = 0; #Often the gtk function doesn't do an extra ref for the receiver. - $$self{const} = 0; - $$self{name} = ""; - $$self{param_types} = []; - $$self{param_names} = []; - $$self{param_default_values} = []; - $$self{in_module} = ""; - $$self{class} = ""; - $$self{entity_type} = "method"; - - $line =~ s/^\s+//; # Remove leading whitespace. - $line =~ s/\s+/ /g; # Compress white space. - - if ($line =~ /^static\s+([^()]+)\s+(\S+)\s*\((.*)\)\s*$/) - { - $$self{rettype} = $1; - $$self{name} = $2; - $$self{c_name} = $2; - $self->parse_param($3); - $$self{static} = 1; - } - elsif ($line =~ /^([^()]+)\s+(\S+)\s*\((.*)\)\s*(const)*$/) - { - no warnings qw(uninitialized); # disable the uninitialize warning for $4 - $$self{rettype} = $1; - $$self{name} = $2; - $$self{c_name} = $2; - $self->parse_param($3); - $$self{const} = ($4 eq "const"); - } - else - { - $objWrapParser->error("fail to parse $line\n"); - } - - return $self; -} - - -# $objFunction new_ctor($function_declaration, $objWrapParser) -# Like new(), but the function_declaration doesn't need a return type. -sub new_ctor($$) -{ - #Parse a function/method declaration. - #e.g. guint gtk_something_set_thing(guint a, const gchar* something) - - my ($line, $objWrapParser) = @_; - - my $self = {}; - bless $self; - - #Initialize member data: - $$self{rettype} = ""; - $$self{rettype_needs_ref} = 0; - $$self{const} = 0; - $$self{name} = ""; - $$self{param_types} = []; - $$self{param_names} = []; - $$self{param_default_values} = []; - $$self{in_module} = ""; - $$self{class} = ""; - $$self{entity_type} = "method"; - - $line =~ s/^\s+//; # Remove leading whitespace. - $line =~ s/\s+/ /g; # Compress white space. - - if ($line =~ /^(\S+)\s*\((.*)\)\s*/) - { - $$self{name} = $1; - $$self{c_name} = $2; - $self->parse_param($2); - } - else - { - $objWrapParser->error("fail to parse $line\n"); - } - - return $self; -} - -# $num num_args() -sub num_args #($) -{ - my ($self) = @_; - my $param_types = $$self{param_types}; - return $#$param_types+1; -} - -# parses C++ parameter lists. -# forms a list of types, names, and initial values -# (we don't currently use values) -sub parse_param($$) -{ - my ($self, $line) = @_; - - - my $type = ""; - my $name = ""; - my $value = ""; - my $id = 0; - my $has_value = 0; - - my $param_types = $$self{param_types}; - my $param_names = $$self{param_names}; - my $param_default_values = $$self{param_default_values}; - - # clean up space and handle empty case - $line = string_trim($line); - $line =~ s/\s+/ /g; # Compress whitespace. - return if ($line =~ /^$/); - - # parse through argument list - my @str = (); - my $par = 0; - foreach (split(/(const )|([,=&*()])|(<[^,]*>)|(\s+)/, $line)) #special characters OR OR whitespace. - { - next if ( !defined($_) or $_ eq "" ); - - if ( $_ eq "(" ) #Detect the opening bracket. - { - push(@str, $_); - $par++; #Increment the number of parameters. - next; - } - elsif ( $_ eq ")" ) - { - push(@str, $_); - $par--; #Decrement the number of parameters. - next; - } - elsif ( $par || /^(const )|(<[^,]*>)|([*&])|(\s+)/ ) #TODO: What's happening here? - { - push(@str, $_); #This looks like part of the type, so we store it. - next; - } - elsif ( $_ eq "=" ) #Default value - { - $type = join("", @str); #The type is everything before the = character. - @str = (); #Wipe it so that it will only contain the default value, which comes next. - $has_value = 1; - next; - } - elsif ( $_ eq "," ) #The end of one parameter: - { - if ($has_value) - { - $value = join("", @str); # If there's a default value, then it's the part before the next ",". - } - else - { - $type = join("", @str); - } - - if ($name eq "") - { - $name = sprintf("p%s", $#$param_types + 2) - } - - $type = string_trim($type); - - push(@$param_types, $type); - push(@$param_names, $name); - push(@$param_default_values, $value); - - #Clear variables, ready for the next parameter. - @str = (); - $type= ""; - $value = ""; - $has_value = 0; - $name = ""; - - $id = 0; - - next; - } - - if ($has_value) - { - push(@str, $_); - next; - } - - $id++; - $name = $_ if ($id == 2); - push(@str, $_) if ($id == 1); - - if ($id > 2) - { - print STDERR "Can't parse $line.\n"; - print STDERR " arg type so far: $type\n"; - print STDERR " arg name so far: $name\n"; - print STDERR " arg default value so far: $value\n"; - } - } - - # handle last argument (There's no , at the end.) - if ($has_value) - { - $value = join("", @str); - } - else - { - $type = join("", @str); - } - - if ($name eq "") - { - $name = sprintf("p%s", $#$param_types + 2) - } - - $type = string_trim($type); - - push(@$param_types, $type); - push(@$param_names, $name); - push(@$param_default_values, $value); -} - -# add_parameter_autoname($, $type, $name) -# Adds e.g "sometype somename" -sub add_parameter_autoname($$) -{ - my ($self, $type) = @_; - - add_parameter($self, $type, ""); -} - -# add_parameter($, $type, $name) -# Adds e.g GtkSomething* p1" -sub add_parameter($$$) -{ - my ($self, $type, $name) = @_; - $type = string_unquote($type); - $type =~ s/-/ /g; - - my $param_names = $$self{param_names}; - - if ($name eq "") - { - $name = sprintf("p%s", $#$param_names + 2); - } - - push(@$param_names, $name); - - my $param_types = $$self{param_types}; - - push(@$param_types, $type); - - return $self; -} - -# $string get_refdoc_comment() -# Generate a readable prototype for signals. -sub get_refdoc_comment($) -{ - my ($self) = @_; - - my $str = " /**\n"; - - $str .= " * \@par Prototype:\n"; - $str .= " * $$self{rettype} \%$$self{name}("; - - my $param_names = $$self{param_names}; - my $param_types = $$self{param_types}; - my $num_params = scalar(@$param_types); - - # List the parameters: - for(my $i = 0; $i < $num_params; ++$i) - { - $str .= $$param_types[$i] . ' ' . $$param_names[$i]; - $str .= ", " if($i < $num_params - 1); - } - - $str .= ")\n"; - $str .= " */"; - - return $str; -} - -sub get_is_const($) -{ - my ($self) = @_; - - return $$self{const}; -} - -1; # indicate proper module load. - diff --git a/libs/glibmm2/tools/pm/FunctionBase.pm b/libs/glibmm2/tools/pm/FunctionBase.pm deleted file mode 100644 index 00c1c05183..0000000000 --- a/libs/glibmm2/tools/pm/FunctionBase.pm +++ /dev/null @@ -1,217 +0,0 @@ -package FunctionBase; - -use strict; -use warnings; -use Util; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - @ISA = qw(Exporter); - @EXPORT = qw(&func1 &func2 &func4); - %EXPORT_TAGS = ( ); - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = qw($Var1 %Hashit &func3); - } -our @EXPORT_OK; - -################################################## -### FunctionBase -# Contains data and methods used by both Function (C++ declarations) and GtkDefs::Function (C defs descriptions) -# Note that GtkDefs::Signal inherits from GtkDefs::Function so it get these methods too. -# -# class Function : FunctionBase -# { -# string array param_types; -# string array param_names; -# string array param_documentation; -# string return_documention; -# } - - -# $string args_types_only($) -# comma-delimited argument types. -sub args_types_only($) -{ - my ($self) = @_; - - my $param_types = $$self{param_types}; - return join(", ", @$param_types); -} - -# $string args_names_only($) -sub args_names_only($) -{ - my ($self) = @_; - - my $param_names = $$self{param_names}; - return join(", ", @$param_names); -} - -# $string args_types_and_names($) -sub args_types_and_names($) -{ - my ($self) = @_; - - my $i; - - my $param_names = $$self{param_names}; - my $param_types = $$self{param_types}; - my @out; - - #debugging: - #if($#$param_types) - #{ - # return "NOARGS"; - #} - - for ($i = 0; $i < $#$param_types + 1; $i++) - { - my $str = sprintf("%s %s", $$param_types[$i], $$param_names[$i]); - push(@out, $str); - } - - my $result = join(", ", @out); - return $result; -} - -# $string args_names_only_without_object($) -sub args_names_only_without_object2($) -{ - my ($self) = @_; - - my $param_names = $$self{param_names}; - - my $result = ""; - my $bInclude = 0; #Ignore the first (object) arg. - foreach (@{$param_names}) - { - # Add comma if there was an arg before this one: - if( $result ne "") - { - $result .= ", "; - } - - # Append this arg if it's not the first one: - if($bInclude) - { - $result .= $_; - } - - $bInclude = 1; - } - - return $result; -} - -# $string args_types_and_names_without_object($) -sub args_types_and_names_without_object($) -{ - my ($self) = @_; - - my $param_names = $$self{param_names}; - my $param_types = $$self{param_types}; - my $i = 0; - my @out; - - for ($i = 1; $i < $#$param_types + 1; $i++) #Ignore the first arg. - { - my $str = sprintf("%s %s", $$param_types[$i], $$param_names[$i]); - push(@out, $str); - } - - return join(", ", @out); -} - -# $string args_names_only_without_object($) -sub args_names_only_without_object($) -{ - my ($self) = @_; - - my $param_names = $$self{param_names}; - - my $result = ""; - my $bInclude = 0; #Ignore the first (object) arg. - foreach (@{$param_names}) - { - # Add comma if there was an arg before this one: - if( $result ne "") - { - $result .= ", "; - } - - # Append this arg if it's not the first one: - if($bInclude) - { - $result .= $_; - } - - $bInclude = 1; - } - - return $result; -} - -sub dump($) -{ - my ($self) = @_; - - my $param_types = $$self{param_types}; - my $param_names = $$self{param_names}; - - print "\n"; - foreach (keys %$self) - { - print " <$_ value=\"$$self{$_}\"/>\n" if (!ref $$self{$_} && $$self{$_} ne ""); - } - - if (scalar(@$param_types)>0) - { - print " \n"; - - for (my $i = 0; $i < scalar(@$param_types); $i++) - { - print " \"$$param_types[$i]\" \"$$param_names[$i]\" \n"; - } - - print " \n"; - } - - print "\n\n"; -} - -sub args_types_and_names_with_default_values($) -{ - my ($self) = @_; - - my $i; - - my $param_names = $$self{param_names}; - my $param_types = $$self{param_types}; - my $param_default_values = $$self{param_default_values}; - my @out; - - for ($i = 0; $i < $#$param_types + 1; $i++) - { - my $str = sprintf("%s %s", $$param_types[$i], $$param_names[$i]); - - if(defined($$param_default_values[$i])) - { - if($$param_default_values[$i] ne "") - { - $str .= " = " . $$param_default_values[$i]; - } - } - - push(@out, $str); - } - - return join(", ", @out); -} - -1; # indicate proper module load. - diff --git a/libs/glibmm2/tools/pm/GtkDefs.pm b/libs/glibmm2/tools/pm/GtkDefs.pm deleted file mode 100644 index fbe1d1c276..0000000000 --- a/libs/glibmm2/tools/pm/GtkDefs.pm +++ /dev/null @@ -1,635 +0,0 @@ -# gtkmm - GtkDefs module -# -# Copyright 2001 Free Software Foundation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# -package GtkDefs; -use strict; -use warnings; - -use Util; -use Enum; -use Object; -use Property; -use FunctionBase; - -# -# Public functions -# read_defs(path, file) -# -# @ get_methods() -# @ get_signals() -# @ get_properties() -# -# $ lookup_enum(c_type) -# $ lookup_object(c_name) -# $ lookup_method(c_name) -# $ lookup_function(c_name) -# $ lookup_property(object, c_name) -# $ lookup_signal(object, c_name) -# - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - - @ISA = qw(Exporter); - @EXPORT = ( ); - %EXPORT_TAGS = ( ); - - # your exported package globals go here, -# # as well as any optionally exported functions - @EXPORT_OK = ( ); -} -our @EXPORT_OK; - -##################################### - -use strict; -use warnings; - -##################################### - -%GtkDefs::enums = (); #Enum -%GtkDefs::objects = (); #Object -%GtkDefs::methods = (); #GtkDefs::Function -%GtkDefs::signals = (); #GtkDefs::Signal -%GtkDefs::properties = (); #Property - -@GtkDefs::read = (); -@GtkDefs::file = (); - - -##################################### -#prototype to get rid of warning -sub read_defs($$;$); - -sub read_defs($$;$) -{ - my ($path, $filename, $restrict) = @_; - $restrict = "" if ($#_ < 2); - - # check that the file is there. - if ( ! -r "$path/$filename") - { - print "Error: can't read defs file $filename\n"; - return; - } - - # break the tokens into lisp phrases up to three levels deep. - # WARNING: reading the following perl statement may induce seizures, - # please flush eyes with water immediately, and consult a mortician. - my @tokens = split( - m/( - \( - (?: - [^()]* - \( - (?: - [^()]* - \( - [^()]* - \) - )* - [^()]* - \) - )* - [^()]* - \) - )/x, - read_file($path, $filename)); - - # scan through top level tokens - while ($#tokens > -1) - { - my $token = shift @tokens; - next if ($token =~ /^\s*$/); - - if ($token =~ /\(include (\S+)\)/) - { - read_defs($path,$1,$restrict); - next; - } - elsif ($token =~ /^\(define-flags-extended.*\)$/) - { on_enum($token); } - elsif ($token =~ /^\(define-enum-extended.*\)$/) - { on_enum($token); } - elsif ($token =~ /^\(define-flags.*\)$/) - { } - elsif ($token =~ /^\(define-enum.*\)$/) - { } - elsif ($token =~ /^\(define-object.*\)$/) - { on_object($token); } - elsif ($token =~ /^\(define-function.*\)$/) - { on_function($token); } - elsif ($token =~ /^\(define-method.*\)$/) - { on_method($token); } - elsif ($token =~ /^\(define-property.*\)$/) - { on_property($token); } - elsif ($token =~ /^\(define-signal.*\)$/) - { on_signal($token); } - elsif ($token =~ /^\(define-vfunc.*\)$/) - { on_vfunc($token); } - else - { - if ( $token =~ /^\(define-(\S+) (\S+)/) - { - # FIXME need to figure out the line number. - print STDERR "Broken lisp definition for $1 $2.\n"; - } - else - { - print "unknown token $token \n"; - } - } - } -} - - -sub read_file($$) -{ - my ($path, $filename)=@_; - my @buf = (); - - # don't read a file twice - foreach (@GtkDefs::read) - { - return "" if ($_ eq "$path/$filename"); - } - push @GtkDefs::read, "$path/$filename"; - - # read file while stripping comments - open(FILE, "$path/$filename"); - while () - { - s/^;.*$//; # remove comments - chop; # remove new lines - push(@buf, $_); - } - close(FILE); - - $_ = join("", @buf); - s/\s+/ /g; - return $_; -} - - -sub on_enum($) -{ - my $thing = Enum::new(shift(@_)); - $GtkDefs::enums{$$thing{c_type}} = $thing; -} - -sub on_object($) -{ - my $thing = Object::new(shift(@_)); - $GtkDefs::objects{$$thing{c_name}} = $thing; -} - -sub on_function($) -{ - my $thing = GtkDefs::Function::new(shift(@_)); - $GtkDefs::methods{$$thing{c_name}} = $thing; -} - -sub on_method($) -{ - my $thing = GtkDefs::Function::new(shift(@_)); - $GtkDefs::methods{$$thing{c_name}} = $thing if ($thing); -} - -sub on_property($) -{ - my $thing = Property::new(shift(@_)); - $GtkDefs::properties{"$$thing{class}::$$thing{name}"} = $thing; -} - -sub on_signal($) -{ - my $thing = GtkDefs::Signal::new(shift(@_)); - $GtkDefs::signals{"$$thing{class}::$$thing{name}"} = $thing; -} - -sub on_vfunc($) -{ - my $thing = GtkDefs::Signal::new(shift(@_)); - $GtkDefs::signals{"$$thing{class}::$$thing{name}"} = $thing; -} - -########################## - -sub get_enums -{ - return sort {$$a{c_type} cmp $$b{c_type}} values %GtkDefs::enums; -} -sub get_methods -{ - return sort {$$a{c_name} cmp $$b{c_name}} values %GtkDefs::methods; -} -sub get_signals -{ - return sort {$$a{name} cmp $$b{name}} values %GtkDefs::signals; -} -sub get_properties -{ - return sort {$$a{name} cmp $$b{name}} values %GtkDefs::properties; -} - -sub get_marked -{ - no warnings; - return grep {$$_{mark}==1} values %GtkDefs::methods; -} - -# This searches for items wrapped by this file and then tries to locate -# other functions/signal/properties which may have been left unmarked. -sub get_unwrapped -{ - # find methods which were used in for a _WRAP - my @targets; - push @targets,grep {$$_{entity_type} eq "method" && $$_{mark}==1} values %GtkDefs::methods; - push @targets,grep {$$_{mark}==1} values %GtkDefs::signals; - push @targets,grep {$$_{mark}==1} values %GtkDefs::properties; - - # find the classes which used them. - my @classes = join(" ", unique(map { $$_{class} } @targets)); - - # find methods which are in those classes which didn't get marked. - my @unwrapped; - my $class; - foreach $class (@classes) - { - push @unwrapped, grep {$$_{class} eq $class && $$_{mark}==0} values %GtkDefs::methods; - push @unwrapped, grep {$$_{class} eq $class && $$_{mark}==0} values %GtkDefs::properties; - push @unwrapped, grep {$$_{class} eq $class && $$_{mark}==0} values %GtkDefs::signals; - } - - return @unwrapped; -} - -########################## - -sub lookup_enum($) -{ - no warnings; - my ($c_type) = @_; - my $obj = $GtkDefs::enums{$c_type}; - return 0 if(!$obj); - $$obj{mark} = 1; - return $obj; -} - -sub lookup_object($) -{ - no warnings; - return $GtkDefs::objects{$_[0]}; -} - -# $objProperty lookup_property($name, $parent_object_name) -sub lookup_property($$) -{ - no warnings; - my ($parent_object_name, $name) = @_; - $name =~ s/-/_/g; - my $obj = $GtkDefs::properties{"${parent_object_name}::${name}"}; - return 0 if ($obj eq ""); - $$obj{mark} = 1; - return $obj; -} - -sub lookup_method_dont_mark($) -{ - no warnings; - my ($c_name) = @_; - $c_name =~ s/-/_/g; - - my $obj = $GtkDefs::methods{$c_name}; - return 0 if ($obj eq ""); - - return $obj; -} - -sub lookup_method($) -{ - my $obj = lookup_method_dont_mark($_); - - $$obj{mark} = 1 if($obj); - return $obj; -} - -sub lookup_function($) -{ - return lookup_method($_[0]); -} - -sub lookup_signal($$) -{ - no warnings; - my ($parent_object_name, $name) = @_; - - $name =~ s/-/_/g; - my $obj = $GtkDefs::signals{"${parent_object_name}::${name}"}; - return 0 if ($obj eq ""); - $$obj{mark} = 1; - return $obj; -} - -sub error -{ - my $format = shift @_; - printf STDERR "GtkDefs.pm: $format\n", @_; -} - - -######################################################################## -package GtkDefs::Function; -BEGIN { @GtkDefs::Function::ISA=qw(FunctionBase); } - -# class Function : FunctionBase -# -# { -# string name; e.g. gtk_accelerator_valid -# string c_name; -# string class e.g. GtkButton -# -# string rettype; -# string array param_types; -# string array param_names; -# -# string entity_type. e.g. method or signal -# -# bool varargs; -# bool mark; -# -# } - -# "new" can't have prototype -sub new -{ - my ($def) = @_; - my $whole = $def; - my $self = {}; - bless $self; - - $def =~ s/^\(//; - $def =~ s/\)$//; - $def =~ s/^\s*define-(\S+)\s+(\S+)\s*//; - $$self{entity_type} = $1; - $$self{name} = $2; - $$self{name} =~ s/-/_/g; # change - to _ - - # init variables - $$self{mark} = 0; - $$self{rettype} = "none"; - $$self{param_types} = []; - $$self{param_names} = []; - $$self{class} = ""; - - # snarf down lisp fields - $$self{c_name} = $1 if ($def=~s/\(c-name "(\S+)"\)//); - $$self{class} = $1 if ($def=~s/\(of-object "(\S+)"\)//); - - if ($def =~ s/\(return-type "(\S+)"\)//) - { - $$self{rettype} = $1; - $$self{rettype} =~ s/-/ /g; #e.g. replace const-gchar* with const gchar*. Otherwise it will be used in code. - } - - $$self{varargs} = 1 if ($def=~s/\(varargs\s+#t\)//); - $$self{rettype} = "void" if ($$self{rettype} eq "none"); - - # methods have a parameter not stated in the defs file - if ($$self{entity_type} eq "method") - { - push( @{$$self{param_types}}, "$$self{class}*" ); - push( @{$$self{param_names}}, "self" ); - } - - # parameters are compound lisp statement - if ($def =~ s/\(parameters(( '\("\S+" "\S+"\))*) \)//) - { - $self->parse_param($1); - } - - # is-constructor-of: - if ($def =~ s/\(is-constructor-of "(\S+)"\)//) - { - #Ignore them. - } - - # of-object - if ($def =~ s/\(of-object "(\S+)"\)//) - { - #Ignore them. - } - - GtkDefs::error("Unhandled function parameter ($def) in $$self{c_name}\n") - if ($def !~ /^\s*$/); - - return $self; -} - -sub parse_param($$) -{ - my ($self, $param) = @_; - - # break up the parameter statements - foreach (split(/\s*'*[()]\s*/, $param)) - { - next if ($_ eq ""); - if (/^"(\S+)" "(\S+)"$/) - { - my ($p1, $p2) = ($1,$2); - $p1 =~ s/-/ /; - push( @{$$self{param_types}}, $p1); - push( @{$$self{param_names}}, $p2); - } - else - { - GtkDefs::error("Unknown parameter statement ($_) in $$self{c_name}\n"); - } - } -} - - -# $string get_return_type_for_methods(). -# Changes gchar* (not const-gchar*) to return-gchar* so that _CONVERT knows that it needs to be freed. -sub get_return_type_for_methods($) -{ - my ($self) = @_; - - my $rettype = $$self{rettype}; - if($rettype eq "gchar*" || $rettype eq "char*") - { - $rettype = "return-" . $rettype; - } - - return $rettype; -} - -sub get_param_names -{ - my ($self) = @_; - return @$self{param_names}; -} - -###################################################################### -package GtkDefs::Signal; -BEGIN { @GtkDefs::Signal::ISA=qw(GtkDefs::Function); } - -# class Signal : Function -# { -# string name; e.g. gtk_accelerator_valid -# string class e.g. GtkButton ( == of-object.) -# -# string rettype; -# -# string when. e.g. first, last, or both. -# string entity_type. e.g. method or signal -# } - -# "new" can't have prototype -sub new -{ - my ($def) = @_; - - my $whole = $def; - my $self = {}; - bless $self; - - #Remove first and last braces: - $def =~ s/^\(//; - $def =~ s/\)$//; - - $def =~ s/^\s*define-(\S+)\s+(\S+)\s*//; - $$self{entity_type} = $1; - $$self{name} = $2; - $$self{name} =~ s/-/_/g; #change - to _ - - # init variables - $$self{mark}=0; - $$self{rettype} = "none"; - $$self{param_types} = []; - $$self{param_names} = []; - $$self{when} = ""; - $$self{class} = ""; - - # snarf down lisp fields - if($def =~ s/\(of-object "(\S+)"\)//) - { - $$self{class} = $1; - } - else - { - GtkDefs::error("define-signal/define-vfunc without of-object (entity type: $$self{entity_type}): $whole"); - } - - if($def =~ s/\(return-type "(\S+)"\)//) - { - $$self{rettype} = $1; - $$self{rettype} =~ s/-/ /g; #e.g. replace const-gchar* with const gchar*. Otherwise it will be used in code. - } - - if($def =~ s/\(when "(\S+)"\)//) - { - $$self{when} = $1; - } - - if($$self{rettype} eq "none") - { - $$self{rettype} = "void" - } - - # signals always have a parameter - push(@{$$self{param_types}}, "$$self{class}*"); - push(@{$$self{param_names}}, "self"); - - # parameters are compound lisp statement - if ($def =~ s/\(parameters(( '\("\S+" "\S+"\))+) \)//) - { - $self->parse_param($1); - } - - if ($def!~/^\s*$/) - { - GtkDefs::error("Unhandled signal/vfunc def ($def) in $$self{class}::$$self{name}"); - } - - return $self; -} - -# bool has_same_types($objFunction) -# Compares return types and argument types -sub has_same_types($$) -{ - my ($self, $objFuncOther) = @_; - - #Compare return types: - if($self->types_are_equal($$self{rettype}, $$objFuncOther{rettype}) ne 1) - { - # printf("debug: different return types: %s, %s\n", $$self{rettype}, $$objFuncOther{rettype}); - return 0; #Different types found. - } - - #Compare arguement types: - my $i = 0; - my $param_types = $$self{param_types}; - my $param_types_other = $$objFuncOther{param_types}; - for ($i = 1; $i < $#$param_types + 1; $i++) - { - my $type_a = $$param_types[$i]; - my $type_b = $$param_types_other[$i-1]; - - if($self->types_are_equal($type_a, $type_b) ne 1) - { - # printf("debug: different arg types: %s, %s\n", $type_a, $type_b); - return 0; #Different types found. - } - } - - return 1; #They must all be the same for it to get this far. -} - -# bool types_are_equal($a, $b) -# Compares types, ignoring gint/int differences, etc. -sub types_are_equal($$$) -{ - #TODO: Proper method of getting a normalized type name. - - my ($self, $type_a, $type_b) = @_; - - if($type_a ne $type_b) - { - #Try adding g to one of them: - if( ("g" . $type_a) ne $type_b ) - { - #Try adding g to the other one: - if( $type_a ne ("g" . $type_b) ) - { - #After all these checks it's still not equal: - return 0; #not equal. - } - } - } - - # printf("DEBUG: types are equal: %s, %s\n", $$type_a, $$type_b); - return 1; #They must be the same for it to get this far. -} - -1; # indicate proper module load. diff --git a/libs/glibmm2/tools/pm/Makefile b/libs/glibmm2/tools/pm/Makefile deleted file mode 100644 index 42d9ec01b0..0000000000 --- a/libs/glibmm2/tools/pm/Makefile +++ /dev/null @@ -1,434 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# tools/pm/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - -srcdir = . -top_srcdir = ../.. - -pkgdatadir = $(datadir)/glibmm -pkglibdir = $(libdir)/glibmm -pkgincludedir = $(includedir)/glibmm -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = /usr/bin/install -c -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(tools_pm_include_HEADERS) \ - $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment -subdir = tools/pm -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ - $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(tools_pm_includedir)" -tools_pm_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(tools_pm_include_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run aclocal-1.9 -I ./scripts -AMDEP_FALSE = # -AMDEP_TRUE = -AMTAR = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run autoconf -AUTOHEADER = : -AUTOMAKE = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run automake-1.9 -AWK = mawk -CC = gcc -CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CPP = gcc -E -CPPFLAGS = -CXX = g++ -CXXCPP = g++ -E -CXXDEPMODE = depmode=gcc3 -CXXFLAGS = -g -O2 -Wall -Wno-long-long -CYGPATH_W = echo -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISABLE_DEPRECATED_API_CFLAGS = -DISABLE_DEPRECATED_CFLAGS = -DLLTOOL = dlltool -ECHO = echo -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = grep -E -EXEEXT = -F77 = -FFLAGS = -GLIBMM_CFLAGS = -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GLIBMM_LIBS = -Wl,--export-dynamic -lsigc-2.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -GLIBMM_MAJOR_VERSION = 2 -GLIBMM_MICRO_VERSION = 3 -GLIBMM_MINOR_VERSION = 13 -GLIBMM_RELEASE = 2.13 -GLIBMM_VERSION = 2.13.3 -GTHREAD_CFLAGS = -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -GTHREAD_LIBS = -pthread -lgthread-2.0 -lrt -lglib-2.0 -GTKMMPROC_MERGECDOCS = -GTKMM_DOXYGEN_INPUT = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/glib/glibmm/ -GTKMM_FALSE_FALSE = -GTKMM_FALSE_TRUE = # -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s -LDFLAGS = -LIBGLIBMM_SO_VERSION = 1:24:0 -LIBOBJS = -LIBS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool -LN_S = ln -s -LTLIBOBJS = -M4 = m4 -MAINT = # -MAINTAINER_MODE_FALSE = -MAINTAINER_MODE_TRUE = # -MAKEINFO = ${SHELL} /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/missing --run makeinfo -OBJDUMP = objdump -OBJEXT = o -OS_WIN32_FALSE = -OS_WIN32_TRUE = # -PACKAGE = glibmm -PACKAGE_BUGREPORT = -PACKAGE_NAME = -PACKAGE_STRING = -PACKAGE_TARNAME = -PACKAGE_VERSION = -PATH_SEPARATOR = : -PERL_PATH = /usr/bin/perl -PKG_CONFIG = /usr/bin/pkg-config -PLATFORM_WIN32_FALSE = -PLATFORM_WIN32_TRUE = # -RANLIB = ranlib -SET_MAKE = -SHELL = /bin/bash -STRIP = strip -VERSION = 2.13.3 -ac_ct_AR = ar -ac_ct_AS = -ac_ct_CC = gcc -ac_ct_CXX = g++ -ac_ct_DLLTOOL = -ac_ct_F77 = -ac_ct_OBJDUMP = -ac_ct_RANLIB = ranlib -ac_ct_STRIP = strip -ac_pt_PKG_CONFIG = /usr/bin/pkg-config -am__fastdepCC_FALSE = # -am__fastdepCC_TRUE = -am__fastdepCXX_FALSE = # -am__fastdepCXX_TRUE = -am__include = include -am__leading_dot = . -am__quote = -am__tar = ${AMTAR} chof - "$$tardir" -am__untar = ${AMTAR} xf - -bindir = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -datadir = ${prefix}/share -exec_prefix = ${prefix} -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -includedir = ${prefix}/include -infodir = ${prefix}/info -install_sh = /home/carl/mnt/hg/ardour.org/trunk/libs/glibmm2/scripts/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localstatedir = ${prefix}/var -mandir = ${prefix}/man -mkdir_p = mkdir -p -- -oldincludedir = /usr/include -prefix = /usr/local -program_transform_name = s,x,x, -sbindir = ${exec_prefix}/sbin -sharedstatedir = ${prefix}/com -sysconfdir = ${prefix}/etc -target_alias = -files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_pm) - -# Install the .pm, files: -tools_pm_includedir = $(libdir)/glibmm-2.4/proc/pm -tools_pm_include_HEADERS = $(files_tools_pm) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/pm/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/pm/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: # $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): # $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-tools_pm_includeHEADERS: $(tools_pm_include_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(tools_pm_includedir)" || $(mkdir_p) "$(DESTDIR)$(tools_pm_includedir)" - @list='$(tools_pm_include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(tools_pm_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(tools_pm_includedir)/$$f'"; \ - $(tools_pm_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(tools_pm_includedir)/$$f"; \ - done - -uninstall-tools_pm_includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(tools_pm_include_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(tools_pm_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(tools_pm_includedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../tools/pm - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(tools_pm_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-tools_pm_includeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-tools_pm_includeHEADERS - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-tools_pm_includeHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-tools_pm_includeHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/libs/glibmm2/tools/pm/Makefile.am b/libs/glibmm2/tools/pm/Makefile.am deleted file mode 100644 index a4796c0491..0000000000 --- a/libs/glibmm2/tools/pm/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -include $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment - -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_pm) - -# Install the .pm, files: - -tools_pm_includedir = $(libdir)/glibmm-2.4/proc/pm -tools_pm_include_HEADERS = $(files_tools_pm) - diff --git a/libs/glibmm2/tools/pm/Makefile_list_of_sources.am_fragment b/libs/glibmm2/tools/pm/Makefile_list_of_sources.am_fragment deleted file mode 100644 index e8df8f447e..0000000000 --- a/libs/glibmm2/tools/pm/Makefile_list_of_sources.am_fragment +++ /dev/null @@ -1,2 +0,0 @@ -files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm - diff --git a/libs/glibmm2/tools/pm/Object.pm b/libs/glibmm2/tools/pm/Object.pm deleted file mode 100644 index aef72c3953..0000000000 --- a/libs/glibmm2/tools/pm/Object.pm +++ /dev/null @@ -1,72 +0,0 @@ -package Object; - -use strict; -use warnings; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - - @ISA = qw(Exporter); - @EXPORT = ( ); - %EXPORT_TAGS = ( ); - - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = ( ); -} -our @EXPORT_OK; - -# class Object -# { -# string name; -# string module; -# string parent; -# string c_name; -# string gtype_id; -# } - - -sub new -{ - my ($def) = @_; - - my $self = {}; - bless $self; - - $def =~ s/^\(//; - $def =~ s/\)$//; - - # snarf down the fields - $$self{name} = $1 if($def =~ s/^define-object (\S+)//); - $$self{module} = $1 if($def =~ s/\(in-module "(\S+)"\)//); - $$self{parent} = $1 if($def =~ s/\(parent "(\S+)"\)//); - $$self{c_name} = $1 if($def =~ s/\(c-name "(\S+)"\)//); - $$self{gtype_id} = $1 if($def =~ s/\(gtype-id "(\S+)"\)//); - - if($def !~ /^\s*$/) - { - GtkDefs::error("Unhandled object def ($def) in $$self{module}\::$$self{name}\n") - } - - return $self; -} - - -sub dump($) -{ - my ($self) = @_; - - print "\n"; - - foreach(keys %$self) - { print " <$_ value=\"$$self{$_}\"/>\n"; } - - print "\n\n"; -} - - -1; # indicate proper module load. diff --git a/libs/glibmm2/tools/pm/Output.pm b/libs/glibmm2/tools/pm/Output.pm deleted file mode 100644 index 6b4a475f1d..0000000000 --- a/libs/glibmm2/tools/pm/Output.pm +++ /dev/null @@ -1,928 +0,0 @@ -# Gtkmmproc Output module -# -# Copyright 2001 Free Software Foundation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# -package Output; -use strict; -BEGIN { @Namespace::ISA=qw(main); } - -# $objOutputter new() -sub new -{ - my ($m4path, $macrodirs) = @_; - my $self = {}; - bless $self; - - $$self{out} = []; - - $$self{source} = ""; - $$self{tmpdir} = "/tmp"; - $$self{destdir} = ""; - $$self{objDefsParser} = undef; # It will be set in set_defsparser() - - $$self{m4path} = $m4path; - $$self{m4args} = "-I"; - $$self{m4args} .= join(" -I", @$macrodirs); - - return $self; -} - -sub set_defsparser($$) -{ - my ($self, $objDefsParser) = @_; - - $$self{objDefsParser} = $objDefsParser; #Remember it so that we can use it in our output methods. -} - -sub m4args_append($$) -{ - my ($self, $str) = @_; - $$self{m4args} .= $str; -} - -sub append($$) -{ - my ($self, $str) = @_; - - push(@{$$self{out}}, $str); -} - -# void output_wrap_failed($cname, $error) -# Puts a comment in the header about the error during code-generation. -sub output_wrap_failed($$$) -{ - my ($self, $cname, $error) = @_; - - my $str = sprintf("//gtkmmproc error: %s : %s", $cname, $error); - print STDERR "Output.pm: $cname : $error\n"; - $self->append($str); -} - -sub error -{ - my $format=shift @_; - printf STDERR "Output.pm: $format",@_; -} - -sub ifdef($$) -{ - my ($self, $ifdef) = @_; - if ($ifdef) - { - $self->append("\n#ifdef $ifdef\n"); - } -} - -sub endif($$) -{ - my ($self, $ifdef) = @_; - if ($ifdef) - { - $self->append("\n#endif // $ifdef\n"); - } -} - -### Convert _WRAP to a virtual -# _VFUNC_H(signame,rettype,`') -# _VFUNC_PH(gtkname,crettype,cargs and names) -# void output_wrap_vfunc_h($filename, $line_num, $objCppfunc, $objCDefsFunc) -sub output_wrap_vfunc_h($$$$$$) -{ - my ($self, $filename, $line_num, $objCppfunc, $objCDefsFunc, $ifdef) = @_; - -#Old code. We removed _VFUNC_H from the .m4 file -# my $str = sprintf("_VFUNC_H(%s,%s,\`%s\',%s)dnl\n", -# $$objCppfunc{name}, -# $$objCppfunc{rettype}, -# $objCppfunc->args_types_and_names(), -# $objCppfunc->get_is_const() -# ); -# $self->append($str); - - my $cppVfuncDecl = "virtual " . $$objCppfunc{rettype} . " " . $$objCppfunc{name} . "(" . $objCppfunc->args_types_and_names() . ")"; - if($objCppfunc->get_is_const()) - { - $cppVfuncDecl .= " const"; - } - - $self->append("#ifdef GLIBMM_VFUNCS_ENABLED\n"); - $self->ifdef($ifdef); - $self->append(" $cppVfuncDecl;\n"); - $self->endif($ifdef); - $self->append("#endif //GLIBMM_VFUNCS_ENABLED\n"); - - #The default callback, which will call *_vfunc, which will then call the base default callback. - #Declares the callback in the private *Class class and sets it in the class_init function. - - my $str = sprintf("_VFUNC_PH(%s,%s,\`%s\',%s)dnl\n", - $$objCDefsFunc{name}, - $$objCDefsFunc{rettype}, - $objCDefsFunc->args_types_and_names(), - $ifdef - ); - $self->append($str); -} - -# _VFUNC_CC(signame,gtkname,rettype,crettype,`',`') -sub output_wrap_vfunc_cc($$$$$$$) -{ - my ($self, $filename, $line_num, $objCppfunc, $objDefsSignal, $ifdef) = @_; - - my $cname = $$objDefsSignal{name}; - - # e.g. Gtk::Button::draw_indicator: - - #Use a different macro for Interfaces, to generate an extra convenience method. - - my $refreturn = ""; - $refreturn = "refreturn" if($$objCppfunc{rettype_needs_ref}); - - my $str = sprintf("_VFUNC_CC(%s,%s,%s,%s,\`%s\',\`%s\',%s,%s,%s)dnl\n", - $$objCppfunc{name}, - $cname, - $$objCppfunc{rettype}, - $$objDefsSignal{rettype}, - $objCppfunc->args_types_and_names(), - convert_args_cpp_to_c($objCppfunc, $objDefsSignal, 0, $line_num), #$objCppfunc->args_names_only(), - $objCppfunc->get_is_const(), - $refreturn, - $ifdef); - - $self->append($str); - - # e.g. Gtk::ButtonClass::draw_indicator(): - - my $refreturn_ctype = ""; - $refreturn_ctype = "refreturn_ctype" if($$objDefsSignal{rettype_needs_ref}); - - my $str = sprintf("_VFUNC_PCC(%s,%s,%s,%s,\`%s\',\`%s\',\`%s\',%s,%s,%s)dnl\n", - $$objCppfunc{name}, - $cname, - $$objCppfunc{rettype}, - $$objDefsSignal{rettype}, - $objDefsSignal->args_types_and_names(), - $objDefsSignal->args_names_only(), - convert_args_c_to_cpp($objDefsSignal, $objCppfunc, $line_num), - ${$objDefsSignal->get_param_names()}[0], - $refreturn_ctype, - $ifdef); - - $self->append($str); -} - -### Convert _WRAP to a virtual -# _SIGNAL_H(signame,rettype, ifdef, `') -# _SIGNAL_PH(gtkname,crettype, ifdef, cargs and names) -# void output_wrap_default_signal_handler_h($filename, $line_num, $objCppfunc, $objCDefsFunc, $ifdef. @args) -sub output_wrap_default_signal_handler_h($$$$$$$) -{ - my ($self, $filename, $line_num, $objCppfunc, $objCDefsFunc, $ifdef) = @_; - - my $str = sprintf("_SIGNAL_H(%s,%s,\`%s\',%s)dnl\n", - $$objCppfunc{name}, - $$objCppfunc{rettype}, - $objCppfunc->args_types_and_names(), - $ifdef - ); - $self->append($str); - - - #The default callback, which will call *_impl, which will then call the base default callback. - #Declares the callback in the private *Class class and sets it in the class_init function. - - $str = sprintf("_SIGNAL_PH(%s,%s,\`%s\',%s)dnl\n", - $$objCDefsFunc{name}, - $$objCDefsFunc{rettype}, - $objCDefsFunc->args_types_and_names(), - $ifdef - ); - $self->append($str); -} - -# _SIGNAL_CC(signame, gtkname, rettype, crettype,`',`') -sub output_wrap_default_signal_handler_cc($$$$$$$$$) -{ - my ($self, $filename, $line_num, $objCppfunc, $objDefsSignal, $bImplement, $bCustomCCallback, $bRefreturn, $ifdef) = @_; - my $cname = $$objDefsSignal{name}; - # $cname = $1 if ($args[3] =~ /"(.*)"/); #TODO: What's this about? - - # e.g. Gtk::Button::on_clicked: - if($bImplement eq 1) - { - my $refreturn = ""; - $refreturn = "refreturn" if($bRefreturn eq 1); - - my $str = sprintf("_SIGNAL_CC(%s,%s,%s,%s,\`%s\',\`%s\',%s,%s,%s)dnl\n", - $$objCppfunc{name}, - $cname, - $$objCppfunc{rettype}, - $$objDefsSignal{rettype}, - $objCppfunc->args_types_and_names(), - convert_args_cpp_to_c($objCppfunc, $objDefsSignal, 0, $line_num), #$objCppfunc->args_names_only(), - $$objCppfunc{const}, - $refreturn, - $ifdef); - $self->append($str); - } - - - # e.g. Gtk::ButtonClass::on_clicked(): - - #Callbacks always take the object instance as the first argument: -# my $arglist_names = "object"; -# my $arglist_names_extra = $objDefsSignal->args_names_only(); -# if ($arglist_names_extra) -# { -# $arglist_names .= ", "; -# $arglist_names .= $arglist_names_extra; -# } - - if($bCustomCCallback ne 1) - { - my $str = sprintf("_SIGNAL_PCC(%s,%s,%s,%s,\`%s\',\`%s\',\`%s\',\`%s\',%s)dnl\n", - $$objCppfunc{name}, - $cname, - $$objCppfunc{rettype}, - $$objDefsSignal{rettype}, - $objDefsSignal->args_types_and_names(), - $objDefsSignal->args_names_only(), - convert_args_c_to_cpp($objDefsSignal, $objCppfunc, $line_num), - ${$objDefsSignal->get_param_names()}[0], - $ifdef); - $self->append($str); - } -} - -### Convert _WRAP to a method -# _METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,const) -# void output_wrap_meth($filename, $line_num, $objCppFunc, $objCDefsFunc, $cppMethodDecl, $documentation, $ifdef) -sub output_wrap_meth($$$$$$$) -{ - my ($self, $filename, $line_num, $objCppfunc, $objCDefsFunc, $cppMethodDecl, $documentation, $ifdef) = @_; - my $objDefsParser = $$self{objDefsParser}; - - # Allow the generated .h/.cc code to have an #ifndef around it, and add deprecation docs to the generated documentation. - my $deprecated = ""; - if($$objCDefsFunc{deprecated}) - { - $deprecated = "deprecated"; - } - - #Declaration: - if($deprecated ne "") - { - $self->append("\n_DEPRECATE_IFDEF_START"); - } - - # Doxygen documentation before the method declaration: - $self->output_wrap_meth_docs_only($filename, $line_num, $documentation); - - $self->ifdef($ifdef); - - if($$objCDefsFunc{throw_any_errors}) - { - $self->append("#ifdef GLIBMM_EXCEPTIONS_ENABLED\n"); - } - - $self->append(" ${cppMethodDecl};"); - - if($$objCDefsFunc{throw_any_errors}) - { - $self->append("\n#else\n"); - - # #Add an error argument, by searching for ) at the end and replacing it: - # my $declWithErrorArg = ${cppMethodDecl}; - # $declWithErrorArg =~ s/\)$/, std::auto_ptr& error\)/g; - - #Recreate the declaration, to remove the default values, which we can't have as well as an error parameter at the end: - my $declWithErrorArg = $$objCppfunc{rettype} . " " . $$objCppfunc{name} . "(" . $objCppfunc->args_types_and_names() . ", std::auto_ptr& error)"; - - if($$objCppfunc{static}) - { - $declWithErrorArg = "static " . $declWithErrorArg; - } - - if($objCppfunc->get_is_const() eq 1) - { - if($$objCppfunc{static} ne 1) #It can't be const and static at the same time. - { - $declWithErrorArg = $declWithErrorArg . " const"; - } - } - - #remove any superfluous ,: - $declWithErrorArg =~ s/\(, /\(/g; - - $self->append(" ${declWithErrorArg};"); - - $self->append("\n#endif //GLIBMM_EXCEPTIONS_ENABLED\n"); - } - - $self->endif($ifdef); - - - if($deprecated ne "") - { - $self->append("\n_DEPRECATE_IFDEF_END\n"); - } - - my $refneeded = ""; - if($$objCDefsFunc{rettype_needs_ref}) - { - $refneeded = "refreturn" - } - - my $errthrow = ""; - if($$objCDefsFunc{throw_any_errors}) - { - $errthrow = "errthrow" - } - - my $constversion = ""; #Whether it is just a const overload (so it can reuse code) - if($$objCDefsFunc{constversion}) - { - $constversion = "constversion" - } - - #Implementation: - my $str; - if ($$objCppfunc{static}) { - $str = sprintf("_STATIC_METHOD(%s,%s,%s,%s,\`%s\',\`%s\',%s,%s,%s,%s)dnl\n", - $$objCppfunc{name}, - $$objCDefsFunc{c_name}, - $$objCppfunc{rettype}, - $objCDefsFunc->get_return_type_for_methods(), - $objCppfunc->args_types_and_names(), - convert_args_cpp_to_c($objCppfunc, $objCDefsFunc, 1, $line_num, $errthrow), #1 means it's static, so it has 'object'. - $refneeded, - $errthrow, - $deprecated, - $ifdef); - } else { - $str = sprintf("_METHOD(%s,%s,%s,%s,\`%s\',\`%s\',%s,%s,%s,%s,%s,\`%s\',%s)dnl\n", - $$objCppfunc{name}, - $$objCDefsFunc{c_name}, - $$objCppfunc{rettype}, - $objCDefsFunc->get_return_type_for_methods(), - $objCppfunc->args_types_and_names(), - convert_args_cpp_to_c($objCppfunc, $objCDefsFunc, 0, $line_num, $errthrow), - $$objCppfunc{const}, - $refneeded, - $errthrow, - $deprecated, - $constversion, - $objCppfunc->args_names_only(), - $ifdef - ); - } - $self->append($str); -} - -### Convert _WRAP to a method -# _METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,const) -# void output_wrap_meth($filename, $line_num, $documentation) -sub output_wrap_meth_docs_only($$$$) -{ - my ($self, $filename, $line_num, $documentation) = @_; - my $objDefsParser = $$self{objDefsParser}; - - # Doxygen documentation before the method declaration: - $self->append("\n${documentation}"); -} - -### Convert _WRAP_CTOR to a ctor -# _METHOD(cppname,cname,cpprettype,crettype,arglist,cargs,const) -# void output_wrap_ctor($filename, $line_num, $objCppFunc, $objCDefsFunc, $cppMethodDecl) -sub output_wrap_ctor($$$$$) -{ - my ($self, $filename, $line_num, $objCppfunc, $objCDefsFunc, $cppMethodDecl) = @_; - my $objDefsParser = $$self{objDefsParser}; - - #Ctor Declaration: - #TODO: Add explicit. - $self->append("explicit " . $cppMethodDecl . ";"); - - #Implementation: - my $str = sprintf("_CTOR_IMPL(%s,%s,\`%s\',\`%s\')dnl\n", - $$objCppfunc{name}, - $$objCDefsFunc{c_name}, - $objCppfunc->args_types_and_names(), - get_ctor_properties($objCppfunc, $objCDefsFunc, $line_num) - ); - - $self->append($str); -} - -sub output_wrap_create($$$) -{ - my ($self, $args_type_and_name_with_default_values, $objWrapParser) = @_; - - #Re-use Function in a very hacky way, to separate the argument types_and_names. - my $fake_decl = "void fake_func(" . $args_type_and_name_with_default_values . ")"; - - my $objFunction = &Function::new($fake_decl, $objWrapParser); - my $args_names_only = $objFunction->args_names_only(); - my $args_type_and_name_hpp = $objFunction->args_types_and_names_with_default_values(); - my $args_type_and_name_cpp = $objFunction->args_types_and_names(); - - my $str = sprintf("_CREATE_METHOD(\`%s\',\`%s\',\`%s\')dnl\n", - $args_type_and_name_hpp, , $args_type_and_name_cpp, $args_names_only); - - $self->append($str) -} - -# void output_wrap_sig_decl($filename, $line_num, $objCSignal, $objCppfunc, $signal_name, $bCustomCCallback) -# custom_signalproxy_name is "" when no type conversion is required - a normal templates SignalProxy will be used instead. -sub output_wrap_sig_decl($$$$$$$) -{ - my ($self, $filename, $line_num, $objCSignal, $objCppfunc, $signal_name, $bCustomCCallback, $ifdef) = @_; - -# _SIGNAL_PROXY(c_signal_name, c_return_type, `', -# cpp_signal_name, cpp_return_type, `',`', -# refdoc_comment) - - my $str = sprintf("_SIGNAL_PROXY(%s,%s,\`%s\',%s,%s,\`%s\',\`%s\',\`%s\',%s,%s)dnl\n", - $signal_name, - $$objCSignal{rettype}, - $objCSignal->args_types_and_names_without_object(), - $$objCppfunc{name}, - $$objCppfunc{rettype}, - $objCppfunc->args_types_only(), - convert_args_c_to_cpp($objCSignal, $objCppfunc, $line_num), - $bCustomCCallback, #When this is true, it will not write the *_callback implementation for you. - $objCppfunc->get_refdoc_comment(), - $ifdef - ); - - $self->append($str); -} - -# void output_wrap_enum($filename, $line_num, $cpp_type, $c_type, $comment, @flags) -sub output_wrap_enum($$$$$$$) -{ - my ($self, $filename, $line_num, $cpp_type, $c_type, $comment, @flags) = @_; - - my $objEnum = GtkDefs::lookup_enum($c_type); - if(!$objEnum) - { - $self->output_wrap_failed($c_type, "enum defs lookup failed."); - return; - } - - $objEnum->beautify_values(); - - my $no_gtype = ""; - my $elements = $objEnum->build_element_list(\@flags, \$no_gtype, " "); - - if(!$elements) - { - $self->output_wrap_failed($c_type, "unknown _WRAP_ENUM() flag"); - return; - } - - my $value_suffix = "Enum"; - $value_suffix = "Flags" if($$objEnum{flags}); - - my $str = sprintf("_ENUM(%s,%s,%s,\`%s\',\`%s\',\`%s\')dnl\n", - $cpp_type, - $c_type, - $value_suffix, - $elements, - $no_gtype, - $comment - ); - - $self->append($str); -} - -# void output_wrap_gerror($filename, $line_num, $cpp_type, $c_enum, $domain, @flags) -sub output_wrap_gerror($$$$$$$) -{ - my ($self, $filename, $line_num, $cpp_type, $c_enum, $domain, @flags) = @_; - - my $objDefsParser = $$self{objDefsParser}; - - my $objEnum = GtkDefs::lookup_enum($c_enum); - if(!$objEnum) - { - $self->output_wrap_failed($c_enum, "enum defs lookup failed."); - return; - } - - # Shouldn't happen, and if it does, I'd like to know that. - warn if($$objEnum{flags}); - - $objEnum->beautify_values(); - - # cut off the module prefix, e.g. GDK_ - my $prefix = $domain; - $prefix =~ s/^[^_]+_//; - - # Chop off the domain prefix, because we put the enum into the class. - unshift(@flags, "s#^${prefix}_##"); - - my $no_gtype = ""; - my $elements = $objEnum->build_element_list(\@flags, \$no_gtype, " "); - - my $str = sprintf("_GERROR(%s,%s,%s,\`%s\',%s)dnl\n", - $cpp_type, - $c_enum, - $domain, - $elements, - $no_gtype - ); - - $self->append($str); -} - -# _PROPERTY_PROXY(name, cpp_type) -# void output_wrap_property($filename, $line_num, $name, $cpp_type) -sub output_wrap_property($$$$$$) -{ - my ($self, $filename, $line_num, $name, $cpp_type, $c_class) = @_; - - my $objDefsParser = $$self{objDefsParser}; - - my $objProperty = GtkDefs::lookup_property($c_class, $name); - if($objProperty eq 0) #If the lookup failed: - { - $self->output_wrap_failed($name, "property defs lookup failed."); - } - else - { - # We use a suffix to specify a particular Glib::PropertyProxy* class. - my $proxy_suffix = ""; - - # Read/Write: - if($objProperty->get_construct_only() eq 1) - { - # construct-only functions can be read, but not written. - $proxy_suffix = "_ReadOnly"; - } - elsif($objProperty->get_readable() ne 1) - { - $proxy_suffix = "_WriteOnly"; - } - elsif($objProperty->get_writable() ne 1) - { - $proxy_suffix = "_ReadOnly"; - } - - # Convert - to _ so we can use it in C++ method and variable names: - my $name_underscored = $name; - $name_underscored =~ s/-/_/g; - - my $str = sprintf("_PROPERTY_PROXY(%s,%s,%s,%s,%s)dnl\n", - $name, - $name_underscored, - $cpp_type, - $proxy_suffix, - $objProperty->get_docs() - ); - $self->append($str); - $self->append("\n"); - - # If the property is not already read-only, and the property can be read, then add a second const accessor for a read-only propertyproxy: - if( ($proxy_suffix ne "_ReadOnly") && ($objProperty->get_readable()) ) - { - my $str = sprintf("_PROPERTY_PROXY(%s,%s,%s,%s,%s)dnl\n", - $name, - $name_underscored, - $cpp_type, - "_ReadOnly", - $objProperty->get_docs() - ); - $self->append($str); - } - - - } -} - -# vpod output_temp_g1($filename, $section) e.g. output_temp_g1(button, gtk) -sub output_temp_g1($$) -{ - my ($self, $section) = @_; - - # Write out *.g1 temporary file - open(FILE, '>', "$$self{tmpdir}/gtkmmproc_$$.g1"); # $$ is the Process ID - - print FILE "include(base.m4)dnl\n"; - - my $module = $section; - my $module_canonical = Util::string_canonical($module); #In case there is a / character in the module. - print FILE "_START($$self{source},$module,$module_canonical)dnl\n"; - print FILE join("", @{$$self{out}}); - print FILE "_END()\n"; - close(FILE); -} - -sub make_g2_from_g1($) -{ - my ($self) = @_; - - # Execute m4 to get *.g2 file: - system("$$self{m4path} $$self{m4args} '$$self{tmpdir}/gtkmmproc_$$.g1' > '$$self{tmpdir}/gtkmmproc_$$.g2'"); - return ($? >> 8); -} - -# void write_sections_to_files() -# This is where we snip the /tmp/gtkmmproc*.g2 file into sections (,h, .cc, _private.h) -sub write_sections_to_files() -{ - my ($self) = @_; - - my $fname_h = "$$self{destdir}/$$self{source}.h"; - my $fname_ph = "$$self{destdir}/private/$$self{source}_p.h"; - my $fname_cc = "$$self{destdir}/$$self{source}.cc"; - - open(INPUT, '<', "$$self{tmpdir}/gtkmmproc_$$.g2"); # $$ is the process ID. - - # open tempory file for each section - open(OUTPUT_H, '>', "$fname_h.tmp"); - open(OUTPUT_PH, '>', "$fname_ph.tmp"); - open(OUTPUT_CC, '>', "$fname_cc.tmp"); - - my $oldfh = select(OUTPUT_H); - my $blank = 0; - - while() - { - # section switching - if(/^#S 0/) { select(OUTPUT_H); next; } - if(/^#S 1/) { select(OUTPUT_PH); next; } - if(/^#S 2/) { select(OUTPUT_CC); next; } - - # get rid of bogus blank lines - if(/^\s*$/) { ++$blank; } else { $blank = 0; } - next if($blank > 2); - - print $_; - } - - select($oldfh); - close(INPUT); - close(OUTPUT_H); - close(OUTPUT_PH); - close(OUTPUT_CC); - - foreach($fname_h, $fname_ph, $fname_cc) - { - # overwrite the source file only if it has actually changed - system("cmp -s '$_.tmp' '$_' || cp '$_.tmp' '$_' ; rm -f '$_.tmp'"); - } -} - - -sub remove_temp_files($) -{ - my ($self) = @_; - - system("rm -f \"$$self{tmpdir}/gtkmmproc_$$.g1\""); - system("rm -f \"$$self{tmpdir}/gtkmmproc_$$.g2\""); -} - - - -# procedure for generating CONVERT macros -# $string convert_args_cpp_to_c($objCppfunc, $objCDefsFunc, $static, $wrap_line_number,$automatic_error) -sub convert_args_cpp_to_c($$$$;$) -{ - my ($objCppfunc, $objCDefsFunc, $static, $wrap_line_number, $automatic_error) = @_; - - $automatic_error = "" unless defined $automatic_error; - - my $cpp_param_names = $$objCppfunc{param_names}; - my $cpp_param_types = $$objCppfunc{param_types}; - my $c_param_types = $$objCDefsFunc{param_types}; - - my @result; - - my $num_c_args_expected = scalar(@{$c_param_types}); - if( !($static) ) { $num_c_args_expected--; } #The cpp method will need an Object* paramater at the start. - - my $num_cpp_args = scalar(@{$cpp_param_types}); - - # add implicit last error parameter; - if ( $automatic_error ne "" && - $num_cpp_args == ($num_c_args_expected - 1) && - ${$c_param_types}[-1] eq "GError**" ) - { - $num_cpp_args++; - $cpp_param_names = [@{$cpp_param_names},"gerror"]; - $cpp_param_types = [@{$cpp_param_types},"GError*&"]; - } - - if ( $num_cpp_args != $num_c_args_expected ) - { - Output::error( "convert_args_cpp_to_c(): Incorrect number of arguments. (%d != %d)\n", - $num_cpp_args, - $num_c_args_expected ); - $objCppfunc->dump(); - $objCDefsFunc->dump(); - - return ""; - } - - - # Loop through the cpp parameters: - my $i; - my $cpp_param_max = $num_cpp_args; - # if( !($static) ) { $cpp_param_max++; } - - for ($i = 0; $i < $cpp_param_max; $i++) - { - #index of C parameter: - my $iCParam = $i; - if( !($static) ) { $iCParam++; } - - my $cppParamType = $$cpp_param_types[$i]; - $cppParamType =~ s/ &/&/g; #Remove space between type and & - $cppParamType =~ s/ \*/*/g; #Remove space between type and * - - my $cppParamName = $$cpp_param_names[$i]; - my $cParamType = $$c_param_types[$iCParam]; - - if ($cppParamType ne $cParamType) #If a type conversion is needed. - { - - - push(@result, sprintf("_CONVERT(%s,%s,%s,%s)", - $cppParamType, - $cParamType, - $cppParamName, - $wrap_line_number) ); - } - else - { - push(@result, $cppParamName); - } - } - - return join(", ", @result); -} - -# procedure for generating CONVERT macros -# Ignores the first C 'self' argument. -# $string convert_args_c_to_cpp($objCDefsFunc, $objCppFunc, $wrap_line_number) -sub convert_args_c_to_cpp($$$) -{ - my ($objCDefsFunc, $objCppfunc, $wrap_line_number) = @_; - - my $cpp_param_types = $$objCppfunc{param_types}; - my $c_param_types = $$objCDefsFunc{param_types}; - my $c_param_names = $$objCDefsFunc{param_names}; - - my @result; - - my $num_c_args = scalar(@{$c_param_types}); - - my $num_cpp_args = scalar(@{$cpp_param_types}); - - if ( ($num_cpp_args + 1) != $num_c_args ) - { - Output::error( "convert_args_c_to_cpp(): Incorrect number of arguments. (%d != %d)\n", - $num_cpp_args + 1, - $num_c_args); - $objCppfunc->dump(); - $objCDefsFunc->dump(); - - return ""; - } - - - # Loop through the c parameters: - my $i; - my $c_param_max = $num_c_args; - - for ($i = 1; $i < $c_param_max; $i++) - { - #index of C parameter: - my $iCppParam = $i - 1; - - my $cppParamType = $$cpp_param_types[$iCppParam]; - $cppParamType =~ s/ &/&/g; #Remove space between type and &. - $cppParamType =~ s/ \*/*/g; #Remove space between type and * - - my $cParamName = $$c_param_names[$i]; - my $cParamType = $$c_param_types[$i]; - - if ($cParamType ne $cppParamType) #If a type conversion is needed. - { - push(@result, sprintf("_CONVERT(%s,%s,%s,%s)\n", - $cParamType, - $cppParamType, - $cParamName, - $wrap_line_number) ); - } - else - { - push(@result, $cParamName); - } - } - - return join(", ",@result); -} - - -# generates the XXX in g_object_new(get_type(), XXX): A list of property names and values. -# Uses the cpp arg name as the property name. -# $string get_ctor_properties($objCppfunc, $objCDefsFunc, $wrap_line_number) -sub get_ctor_properties($$$$) -{ - my ($objCppfunc, $objCDefsFunc, $wrap_line_number) = @_; - - my $cpp_param_names = $$objCppfunc{param_names}; - my $cpp_param_types = $$objCppfunc{param_types}; - my $c_param_types = $$objCDefsFunc{param_types}; - - my @result; - - my $num_args = scalar(@{$c_param_types}); - - my $num_cpp_args = scalar(@{$cpp_param_types}); - if ( $num_cpp_args != $num_args ) - { - Output::error("get_ctor_properties(): Incorrect number of arguments. (%d != %d)\n", - $num_cpp_args, - $num_args ); - return ""; - } - - - # Loop through the cpp parameters: - my $i = 0; - - for ($i = 0; $i < $num_args; $i++) - { - my $cppParamType = $$cpp_param_types[$i]; - $cppParamType =~ s/ &/&/g; #Remove space between type and & - $cppParamType =~ s/ \*/*/g; #Remove space between type and * - - my $cppParamName = $$cpp_param_names[$i]; - my $cParamType = $$c_param_types[$i]; - - # Property name: - push(@result, "\"" . $cppParamName . "\""); - - # C property value: - if ($cppParamType ne $cParamType) #If a type conversion is needed. - { - push(@result, sprintf("_CONVERT(%s,%s,%s,%s)", - $cppParamType, - $cParamType, - $cppParamName, - $wrap_line_number) ); - } - else - { - push(@result, $cppParamName); - } - } - - return join(", ", @result); -} - -### Convert _WRAP to a corba method -# _CORBA_METHOD(retype, method_name,args, arg_names_only) - implemented in libbonobomm. -# void output_wrap_corba_method($filename, $line_num, $objCppFunc) -sub output_wrap_corba_method($$$$) -{ - my ($self, $filename, $line_num, $objCppfunc) = @_; - - my $str = sprintf("_CORBA_METHOD(%s,%s,\`%s\',\`%s\')dnl\n", - $$objCppfunc{rettype}, - $$objCppfunc{name}, - $objCppfunc->args_types_and_names(), - $objCppfunc->args_names_only() - ); - - $self->append($str); -} - -sub output_implements_interface($$) -{ - my ($self, $interface, $ifdef) = @_; - - my $str = sprintf("_IMPLEMENTS_INTERFACE_CC(%s, %s)dnl\n", - $interface, - $ifdef); - - $self->append($str); -} - -1; # indicate proper module load. diff --git a/libs/glibmm2/tools/pm/Property.pm b/libs/glibmm2/tools/pm/Property.pm deleted file mode 100644 index 703cfdccff..0000000000 --- a/libs/glibmm2/tools/pm/Property.pm +++ /dev/null @@ -1,119 +0,0 @@ -package Property; - -use strict; -use warnings; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - @ISA = qw(Exporter); - @EXPORT = qw(&func1 &func2 &func4); - %EXPORT_TAGS = ( ); - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = qw($Var1 %Hashit &func3); - } -our @EXPORT_OK; - -# class Property -# { -# string name; -# string class; -# string type; -# bool readable; -# bool writable; -# bool construct_only; -# string docs; -# } - - -sub new -{ - my ($def) = @_; - my $self = {}; - bless $self; - - $def=~s/^\(//; - $def=~s/\)$//; - # snarf down the fields - $$self{mark} = 0; - $$self{name} = $1 if ($def =~ s/^define-property (\S+)//); - $$self{class} = $1 if ($def =~ s/\(of-object "(\S+)"\)//); - $$self{type} = $1 if ($def =~ s/\(prop-type "(\S+)"\)//); - $$self{readable} = ($1 eq "#t") if ($def =~ s/\(readable (\S+)\)//); - $$self{writable} = ($1 eq "#t") if ($def =~ s/\(writable (\S+)\)//); - $$self{construct_only} = ($1 eq "#t") if ($def =~ s/\(construct-only (\S+)\)//); - - # Property documentation: - my $propertydocs = $1 if ($def =~ s/\(docs "([^"]*)"\)//); - # Add a full-stop if there is not one already: - if(defined($propertydocs)) - { - my $docslen = length($propertydocs); - if($docslen) - { - if( !(substr($propertydocs, $docslen - 1, 1) eq ".") ) - { - $propertydocs = $propertydocs . "."; - } - } - } - - $$self{docs} = $propertydocs; - - - $$self{name} =~ s/-/_/g; # change - to _ - - GtkDefs::error("Unhandled property def ($def) in $$self{class}\::$$self{name}\n") - if ($def !~ /^\s*$/); - - return $self; -} - -sub dump($) -{ - my ($self) = @_; - - print "\n"; - - foreach (keys %$self) - { print " <$_ value=\"$$self{$_}\"/>\n"; } - - print "\n\n"; -} - -sub get_construct_only($) -{ - my ($self) = @_; - return $$self{construct_only}; -} - -sub get_type($) -{ - my ($self) = @_; - return $$self{type}; -} - -sub get_readable($) -{ - my ($self) = @_; - return $$self{readable}; -} - -sub get_writable($) -{ - my ($self) = @_; - return $$self{writable}; -} - -sub get_docs($) -{ - my ($self) = @_; - return $$self{docs}; -} - - -1; # indicate proper module load. diff --git a/libs/glibmm2/tools/pm/Util.pm b/libs/glibmm2/tools/pm/Util.pm deleted file mode 100644 index c3076b4e8c..0000000000 --- a/libs/glibmm2/tools/pm/Util.pm +++ /dev/null @@ -1,113 +0,0 @@ -# gtkmm - Util module -# -# Copyright 2001 Free Software Foundation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# -# -# This file holds basic functions used throughout gtkmmproc modules. -# Functions in this module are exported so there is no need to -# request them by module name. -# -package Util; -use strict; -use warnings; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - @ISA = qw(Exporter); - @EXPORT = qw(&string_unquote &string_trim &string_canonical - &trace &unique); - %EXPORT_TAGS = ( ); - - # your exported package globals go here, - # as well as any optionally exported functions - #@EXPORT_OK = qw($Var1 %Hashit &func3); - } -our @EXPORT_OK; - - -#$ string_unquote($string) -# Removes leading and trailing quotes. -sub string_unquote($) -{ - my ($str) = @_; - - $str =~ s/^['`"]// ; - $str =~ s/['`"]$// ; - - return $str; -} - -# $ string_trim($string) -# Removes leading and trailing white space. -sub string_trim($) -{ - ($_) = @_; - s/^\s+//; - s/\s+$//; - return $_; -} - -# $ string_canonical($string) -# Convert - to _. -sub string_canonical($) -{ - ($_) = @_; - s/-/_/g ; # g means 'replace all' - s/\//_/g ; # g means 'replace all' - return $_; -} - -# -# Back tracing utility. -# Prints the call stack. -# -# void trace() -sub trace() -{ - my ($package, $filename, $line, $subroutine, $hasargs, - $wantarray, $evaltext, $is_require, $hints, $bitmask) = caller(1); - - no warnings qw(uninitialized); - - my $i = 2; - print "Trace on ${subroutine} called from ${filename}:${line}\n"; - while (1) - { - ($package, $filename, $line, $subroutine) = caller($i); - $i++; - next if ($line eq ""); - print " From ${subroutine} call from ${filename}:${line}\n"; - } -} - -sub unique(@) -{ - my %hash; - foreach (@_) - { - $hash{$_}=1; - } - - return keys %hash; -} - -1; # indicate proper module load. - diff --git a/libs/glibmm2/tools/pm/WrapParser.pm b/libs/glibmm2/tools/pm/WrapParser.pm deleted file mode 100644 index fb156e33ce..0000000000 --- a/libs/glibmm2/tools/pm/WrapParser.pm +++ /dev/null @@ -1,1343 +0,0 @@ -# gtkmm - WrapParser module -# -# Copyright 2001 Free Software Foundation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -# -package WrapParser; -use strict; -use warnings; -use Util; -use GtkDefs; -use Function; -use DocsParser; - -BEGIN { - use Exporter (); - our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); - - # set the version for version checking - $VERSION = 1.00; - @ISA = qw(Exporter); - @EXPORT = ( ); - %EXPORT_TAGS = ( ); - # your exported package globals go here, - # as well as any optionally exported functions - @EXPORT_OK = ( ); - } -our @EXPORT_OK; - -############################################################################ - -my @tokens = (); - -# $objWrapParser new($objOutputter) -sub new($) -{ - my ($objOutputter) = @_; - - my $self = {}; - bless $self; - - #Initialize member data: - $$self{objOutputter} = $objOutputter; - $$self{filename} = "(none)"; - $$self{line_num} = 0; - - $$self{level} = 0; - $$self{class} = ""; - $$self{c_class} = ""; - $$self{in_class} = 0; - $$self{first_namespace} = 1; - $$self{namespace} = []; - $$self{in_namespace} = []; - - $$self{defsdir} = "."; - - $$self{module} = ""; #e.g. "gtkmm" - - $$self{type} = "GTKOBJECT"; # or "BOXEDTYPE", or "GOBJECT" - wrapped differently. - - return $self; -} - -# void parse_and_build_output() -sub parse_and_build_output($) -{ - my ($self) = @_; - - my $objOutputter = $$self{objOutputter}; - - # Parse the tokens. - my $token; - while ( scalar(@tokens) ) - { - $token = $self->extract_token(); - my $bAppend = 1; - - # we need to monitor the depth of braces - if ($token eq '{') { $self->on_open_brace(); } - if ($token eq '}') { $self->on_close_brace(); $bAppend = 0;} - - # protect `' from the source file from m4 - if ($token eq "`") { $objOutputter->append("`'__BT__`'"); next; } - if ($token eq "'") { $objOutputter->append("`'__FT__`'"); next; } - - if ($token eq '"') { $objOutputter->append($self->on_string_literal()); next; } - if ($token eq '//') { $objOutputter->append($self->on_comment_cpp()); next; } - if ($token eq '/*') { $objOutputter->append($self->on_comment_c()); next; } - - # handle #m4begin ... #m4end - if ($token eq "#m4begin") { $objOutputter->append($self->on_m4_section()); next;} - - # handle #m4 ... \n - if ($token eq "#m4") { $objOutputter->append($self->on_m4_line()); next;} - - if ($token eq "_DEFS") { $self->on_defs(); next;} #Read the defs file. - if ($token eq "_IGNORE") { $self->on_ignore(); next;} #Ignore a function. - if ($token eq "_IGNORE_SIGNAL") { $self->on_ignore_signal(); next;} #Ignore a signal. - if ($token eq "_WRAP_METHOD") { $self->on_wrap_method(); next;} - if ($token eq "_WRAP_METHOD_DOCS_ONLY") { $self->on_wrap_method_docs_only(); next;} - if ($token eq "_WRAP_CORBA_METHOD") { $self->on_wrap_corba_method(); next;} #Used in libbonobo*mm. - if ($token eq "_WRAP_SIGNAL") { $self->on_wrap_signal(); next;} - if ($token eq "_WRAP_PROPERTY") { $self->on_wrap_property(); next;} - if ($token eq "_WRAP_VFUNC") { $self->on_wrap_vfunc(); next;} - if ($token eq "_WRAP_CTOR") { $self->on_wrap_ctor(); next;} - if ($token eq "_WRAP_CREATE") { $self->on_wrap_create(); next;} - - if ($token eq "_WRAP_ENUM") { $self->on_wrap_enum(); next;} - if ($token eq "_WRAP_GERROR") { $self->on_wrap_gerror(); next;} - if ($token eq "_IMPLEMENTS_INTERFACE") { $self->on_implements_interface(); next;} - - my $prefix_class = "_CLASS_"; # e.g. _CLASS_GTKOBJECT - my $token_prefix = substr($token, 0, length($prefix_class)); - if ($token_prefix eq $prefix_class) - { - $self->on_class($token); - next; - - # e.g.: - # _CLASS_GENERIC - # _CLASS_GOBJECT - # _CLASS_GTKOBJECT - # _CLASS_BOXEDTYPE - # _CLASS_BOXEDTYPE_STATIC - # _CLASS_INTERFACE - # _CLASS_OPAQUE_COPYABLE - # _CLASS_OPAQUE_REFCOUNTED - } - - if ($token eq "namespace") { $self->on_namespace() }; - - # After all token manipulations - if($bAppend) - { - $objOutputter->append($token); - } - } -} - -sub error($$) -{ - my ($self, $format) = @_; - - $format = "$$self{filename}:$$self{line_num}: $format"; - printf STDERR $format,@_; -} - -###################################################################### -##### 1.1 parser subroutines - -######################################## -### returns the next token, ignoring some stuff. -# $string extract_token() -sub extract_token($) -{ - my ($self) = @_; - - while ( scalar(@tokens) ) - { - $_ = shift @tokens; - - # skip empty tokens - next if ( !defined($_) or $_ eq "" ); - - # eat line statements. TODO: e.g.? - if ( /^#l (\S+)\n/) - { - $$self{line_num} = $1; - next; - } - - # eat file statements. TODO: e.g.? - if ( /^#f (\S+)\n/) - { - $$self{filename} = $1; - next; - } - - return $_; - } - - return ""; -} - -# bool tokens_remaining() -sub tokens_remaining($) -{ - my ($self) = @_; - return scalar(@tokens)!=0; -} - - -######################################## -### we pass strings literally with quote substitution -# void on_string_literal() -sub on_string_literal($) -{ - my ($self) = @_; - - my @out; - push (@out, '"'); - while ( scalar(@tokens) ) - { - $_ = $self->extract_token(); - if ($_ eq "`") { push(@out, "`'__BT__`'"); next; } - if ($_ eq "'") { push(@out, "`'__FT__`'"); next; } - push (@out, $_); - - return join("",@out) if ($_ eq '"'); - } - - my $line_num = $$self{line_num}; - my $filename = $$self{filename}; - print STDERR "$filename:$line_num: Hit eof while in string\n"; -} - - -######################################## -### we pass comments literally with quote substitution -# void on_comment_cpp() -sub on_comment_cpp($) -{ - my ($self) = @_; - - my @out; - push (@out,"//\`"); - while ( scalar(@tokens) ) - { - $_ = $self->extract_token(); - if ($_ eq "`") { push(@out,"\'__BT__\`"); next; } - if ($_ eq "'") { push(@out,"\'__FT__\`"); next; } - if ($_ eq "\n") - { - push (@out,"\'\n"); - return join("",@out) - } - - if ($_ =~ /^_[A-Z]+$/) {$_="_$_";} # wipe out potential macros - - push (@out,$_); - } -} - - -######################################## -### we pass C comments literally with quote substitution -# void on_comment_c() -sub on_comment_c($) -{ - my ($self) = @_; - - my @out; - push (@out,"/*\`"); - while ( scalar(@tokens) ) - { - $_ = $self->extract_token(); - if ($_ eq "`") { push(@out,"\'__BT__\`"); next; } - if ($_ eq "'") { push(@out,"\'__FT__\`"); next; } - if ($_ eq "*/") - { - push (@out,"\'*/"); - return join("",@out) - } - - push (@out,$_); - } -} - - -######################################## -### handle #m4begin ... #m4end -# we don't substitute ` or ' in #m4begin -# void on_m4_section() -sub on_m4_section($) -{ - my ($self) = @_; - - my @value; - my $token; - - while ( scalar(@tokens) ) - { - $token = $self->extract_token(); - return join("", @value) if ($token eq "#m4end"); - push(@value, $token); - } - - my $line_num = $$self{line_num}; - my $filename = $$self{filename}; - print STDERR "$filename:$line_num: Hit eof looking for #m4end\n"; - next; -} - - -######################################## -### handle #m4 ... /n -# we don't substitute ` or ' in #m4 -# void on_m4_line() -sub on_m4_line ($) -{ - my ($self) = @_; - - my @value; - my $token; - while ( scalar(@tokens) ) - { - $token = $self->extract_token(); - push(@value,$token); # push first, so we don't eat the newline - return join("",@value) if ($token eq "\n"); - } -} - - -######################################## -# m4 needs to know when we entered a namespace -# void on_namespace() -sub on_namespace($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - my $number = 0; - my $token; - my $arg; - - # we need to peek ahead to figure out what type of namespace - # declaration this is. - while ( $number < scalar(@tokens) ) - { - $token = $tokens[$number]; - $number++; - next if (!defined($token) or $token eq ""); -# print "> $token\n"; - - if ($token eq '{') - { - $arg = string_trim($arg); - - if ($$self{first_namespace}) - { - $objOutputter->append("_SECTION(SECTION_HEADER2)\n"); - $$self{first_namespace} = 0; - } - - $objOutputter->append("_NAMESPACE($arg)"); - unshift(@{$$self{namespace}}, $arg); - unshift(@{$$self{in_namespace}}, $$self{level}+1); - return; - } - - next if ( $token =~ /^#[lf] \S+\n/); - return if ($token eq ';'); - - $arg .= $token; #concatenate - } -} - - -######################################## -### we don't want to report every petty function as unwrapped -# void on_ignore($) -sub on_ignore($) -{ - my ($self) = @_; - my $str = $self->extract_bracketed_text(); - my @args = split(/\s+|,/,$str); - foreach (@args) - { - next if ($_ eq ""); - GtkDefs::lookup_function($_); #Pretend that we've used it. - } -} - -sub on_ignore_signal($) -{ - my ($self) = @_; - my $str = $self->extract_bracketed_text(); - $str = string_trim($str); - $str = string_unquote($str); - my @args = split(/\s+|,/,$str); - foreach (@args) - { - next if ($_ eq ""); - GtkDefs::lookup_signal($$self{c_class}, $_); #Pretend that we've used it. - } -} - -######################################## -### we have certain macros we need to insert at end of statements -# void on_class($, $strClassCommand) -sub on_class($$) -{ - my ($self, $class_command) = @_; - - my $objOutputter = $$self{objOutputter}; - - $$self{in_class} = $$self{level}; - - #Remember the type of wrapper required, so that we can append the correct _END_CLASS_* macro later. - { - my $str = $class_command; - $str =~ s/^_CLASS_//; - $$self{type} = $str; - } - - my $str = $self->extract_bracketed_text(); - my ($class, $c_class) = split(',',$str); - $class = string_trim($class); - $c_class = string_trim($c_class); - - $$self{class} = $class; - $$self{c_class} = $c_class; - - my @back; - push(@back, $class_command); - push(@back, "($str)"); - - # When we hit _CLASS, we walk backwards through the output to find "class" - my $token; - while ( scalar(@{$$objOutputter{out}}) > 0) - { - $token = pop @{$$objOutputter{out}}; - unshift(@back, $token); - if ($token eq "class") - { - $objOutputter->append("_CLASS_START()"); - - my $strBack = join("", @back); - - $objOutputter->append($strBack); - return; - } - } - - $self->error("$class_command outside of class.\n"); - exit(-1); -} - - -# order to read the defs file -# void on_defs() -sub on_defs($) -{ - my ($self) = @_; - - my $str = $self->extract_bracketed_text(); - my ($module, $defsfile) = split(/,/, $str); #e.g. _DEFS(gtkmm,gtk), where gtkmm is the module name, and gtk is the defs file name. - # $$self{section} = $section; #Save it so that we can reuse it in read_defs_included. - $$self{module} = $module; #Use it later in call to output_temp_g1(). - - GtkDefs::read_defs("$$self{defsdir}", "$defsfile.defs"); - - #Read the documentation too, so that we can merge it into the generated C++ code: - my $docs_filename = $defsfile . "_docs.xml"; - my $docs_filename_override = $defsfile . "_docs_override.xml"; - DocsParser::read_defs("$$self{defsdir}", $docs_filename, $docs_filename_override); -} - -# void on_open_brace() -sub on_open_brace($) -{ - my ($self) = @_; - - $$self{level}++; -} - -# void on_close_brace($) -sub on_close_brace($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - #push(@out, "($$self{level})"); - - $self->on_end_class() - if ($$self{in_class} && $$self{in_class} == $$self{level}); - - $objOutputter->append("}"); #We append it here instead of after we return, so that we can end the namespace after it. - - $self->on_end_namespace() - if ( (scalar(@{$$self{in_namespace}}) > 0) && (@{$$self{in_namespace}}[0] == $$self{level}) ); - - $$self{level}--; -} - - -######################################## -### denote the end of a class -# void on_end_class($) -sub on_end_class($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - # Examine $$self{type}, which was set in on_class() - # And append the _END_CLASS_* macro, which will, in turn, output the m4 code. - { - my $str = $$self{type}; - $objOutputter->append("`'_END_CLASS_$str()\n"); - } - - $$self{class} = ""; - $$self{c_class} = ""; - $$self{in_class} = 0; -} - - -######################################## -### -# void on_end_namespace($) -sub on_end_namespace($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - $objOutputter->append("`'_END_NAMESPACE()"); - shift( @{$$self{namespace}} ); - shift( @{$$self{in_namespace}} ); -} - - -###################################################################### -##### some utility subroutines - -######################################## -### takes (\S+) from the tokens (smart) -# $string extract_bracketed_text() -sub extract_bracketed_text($) -{ - my ($self) = @_; - - my $level = 1; - my $str = ""; - - # Move to the first "(": - while ( scalar(@tokens) ) - { - my $t = $self->extract_token(); - last if ($t eq "("); - } - - # Concatenate until the corresponding ")": - while ( scalar(@tokens) ) - { - my $t = $self->extract_token(); - $level++ if ($t eq "("); - $level-- if ($t eq ")"); - - return $str if (!$level); - $str .= $t; - } - - return ""; -} - - -######################################## -### breaks up a string by commas (smart) -# @strings string_split_commas($string) -sub string_split_commas($) -{ - my ($in) = @_; - - my @out; - my $level = 0; - my $str = ""; - my @in = split(/([,()])/, $in); - - while ($#in > -1) - { - my $t = shift @in; - - next if ($t eq ""); - $level++ if ($t eq "("); - $level-- if ($t eq ")"); - - # skip , inside functions Ie. void (*)(int,int) - if ( ($t eq ",") && !$level) - { - push(@out, $str); - $str=""; - next; - } - - $str .= $t; - } - - push(@out,$str); - return @out; -} - - -######################################## -### reads in the preprocessor files -# we insert line and file directives for later stages -# void read_file() -sub read_file($$$) -{ - my ($self, $srcdir, $source) = @_; - - my $line; - my @in; - - if ( ! -r "${srcdir}/${source}.hg") - { - print "Unable to find header file $srcdir/$source.hg\n"; - exit(-1); - } - - # Read header file: - open(FILE, "${srcdir}/${source}.hg"); -# push(@in, "#f ${source}.hg\n"); #TODO: What does #f do? - $line = 1; - while () - { -# push(@in, "#l $line\n"); #TODO: What does #l do? - push(@in, $_); - $line++; - } - close(FILE); - push(@in, "\n_SECTION(SECTION_SRC_CUSTOM)\n"); - - # Source file is optional. - if ( -r "${srcdir}/${source}.ccg") - { - open(FILE, "${srcdir}/${source}.ccg"); - $line = 1; -# push(@in, "#f ${source}.ccg\n"); #TODO: What does #f do? - while () - { -# push(@in, "#l $line\n"); #TODO: What does #l do? - push(@in, $_); - $line++; - } - close(FILE); - } - - my $strIn = join("", @in); - - # Break the file into tokens. Token is - # any group of #, A to z, 0 to 9, _ - # /* - # *. - # // - # any char proceeded by \ - # symbols ;{}"`'() - # newline - @tokens = split(/(\#[lf] \S+\n)|([#A-Za-z0-9_]+)|(\/\*)|(\*\/)|(\/\/)|(\\.)|([;{}"'`()])|(\n)/, - $strIn); -} - - -sub class_prefix($) -{ - my ($self) = @_; - - my $str = $$self{class}; - $str =~ s/([a-z])([A-Z])/$1_$2/g; - $str =~ tr/A-Z/a-z/; - return $str; -} - - -###################################################################### -##### 2.1 subroutines for _WRAP - -######################################## - -# $bool check_for_eof() -sub check_for_eof($) -{ - my ($self) = @_; - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - if (!(scalar(@tokens))) - { - print STDERR "$filename:$line_num:hit eof in _WRAP\n"; - return 0; #EOF - } - - return 1; # No EOF -} - -# void on_wrap_method() -sub on_wrap_method($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - my $entity_type = "method"; - - if (!$$self{in_class}) - { - print STDERR "$filename:$line_num:_WRAP macro encountered outside class\n"; - return; - } - - my $objCfunc; - my $objCppfunc; - - # handle first argument - my $argCppMethodDecl = $args[0]; - if ($argCppMethodDecl =~ /^\S+$/ ) #Checks that it's not empty and that it contains no whitespace. - { - print STDERR "$filename:$line_num:_WRAP can't handle unspecified method $argCppMethodDecl\n"; - return; - } - else - { - #Parse the method decaration and build an object that holds the details: - $objCppfunc = &Function::new($argCppMethodDecl, $self); - } - - - # handle second argument: - - my $argCFunctionName = $args[1]; - $argCFunctionName = string_trim($argCFunctionName); - - #Get the c function's details: - - #Checks that it's not empty and that it contains no whitespace. - if ($argCFunctionName =~ /^\S+$/ ) - { - #c-name. e.g. gtk_clist_set_column_title - $objCfunc = GtkDefs::lookup_function($argCFunctionName); - - if(!$objCfunc) #If the lookup failed: - { - $objOutputter->output_wrap_failed($argCFunctionName, "method defs lookup failed (1)"); - return; - } - } - - # Extra stuff needed? - $$objCfunc{deprecated} = ""; - my $deprecation_docs = ""; - my $ifdef; - while(scalar(@args) > 2) # If the optional ref/err/deprecated arguments are there. - { - my $argRef = string_trim(pop @args); - #print "debug arg=$argRef\n"; - if($argRef eq "refreturn") - { - $$objCfunc{rettype_needs_ref} = 1; - } - elsif($argRef eq "errthrow") - { - $$objCfunc{throw_any_errors} = 1; - } - elsif($argRef eq "constversion") - { - $$objCfunc{constversion} = 1; - } - elsif($argRef =~ /^deprecated(.*)/) #If deprecated is at the start. - { - $$objCfunc{deprecated} = "deprecated"; - - if($1 ne "") - { - $deprecation_docs = string_unquote(string_trim($1)); - } - } - elsif($argRef =~ /^ifdef(.*)/) #If ifdef is at the start. - { - $ifdef = $1; - } - } - - my $commentblock = ""; - $commentblock = DocsParser::lookup_documentation($argCFunctionName, $deprecation_docs); - - $objOutputter->output_wrap_meth($filename, $line_num, $objCppfunc, $objCfunc, $argCppMethodDecl, $commentblock, $ifdef); -} - -# void on_wrap_method_docs_only() -sub on_wrap_method_docs_only($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - my $entity_type = "method"; - - if (!$$self{in_class}) - { - print STDERR "$filename:$line_num:_WRAP macro encountered outside class\n"; - return; - } - - my $objCfunc; - - # handle first argument - my $argCFunctionName = $args[0]; - $argCFunctionName = string_trim($argCFunctionName); - - #Get the c function's details: - - #Checks that it's not empty and that it contains no whitespace. - if ($argCFunctionName =~ /^\S+$/ ) - { - #c-name. e.g. gtk_clist_set_column_title - $objCfunc = GtkDefs::lookup_function($argCFunctionName); - - if(!$objCfunc) #If the lookup failed: - { - $objOutputter->output_wrap_failed($argCFunctionName, "method defs lookup failed (1)"); - return; - } - } - - # Extra ref needed? - while(scalar(@args) > 1) # If the optional ref/err arguments are there. - { - my $argRef = string_trim(pop @args); - if($argRef eq "errthrow") - { - $$objCfunc{throw_any_errors} = 1; - } - } - - my $commentblock = ""; - $commentblock = DocsParser::lookup_documentation($argCFunctionName, ""); - - $objOutputter->output_wrap_meth_docs_only($filename, $line_num, $commentblock); -} - -sub on_wrap_ctor($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - my $entity_type = "method"; - - if (!$$self{in_class}) - { - print STDERR "$filename:$line_num:_WRAP_CTOR macro encountered outside class\n"; - return; - } - - my $objCfunc; - my $objCppfunc; - - # handle first argument - my $argCppMethodDecl = $args[0]; - if ($argCppMethodDecl =~ /^\S+$/ ) #Checks that it's not empty and that it contains no whitespace. - { - print STDERR "$filename:$line_num:_WRAP_CTOR can't handle unspecified method $argCppMethodDecl\n"; - return; - } - else - { - #Parse the method decaration and build an object that holds the details: - $objCppfunc = &Function::new_ctor($argCppMethodDecl, $self); - } - - - # handle second argument: - - my $argCFunctionName = $args[1]; - $argCFunctionName = string_trim($argCFunctionName); - - #Get the c function's details: - if ($argCFunctionName =~ /^\S+$/ ) #Checks that it's not empty and that it contains no whitespace. - { - $objCfunc = GtkDefs::lookup_function($argCFunctionName); #c-name. e.g. gtk_clist_set_column_title - if(!$objCfunc) #If the lookup failed: - { - $objOutputter->output_wrap_failed($argCFunctionName, "ctor defs lookup failed (2)"); - return; - } - } - - $objOutputter->output_wrap_ctor($filename, $line_num, $objCppfunc, $objCfunc, $argCppMethodDecl); -} - -sub on_implements_interface($$) -{ - my ($self) = @_; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - # handle first argument - my $interface = $args[0]; - - # Extra stuff needed? - my $ifdef; - while(scalar(@args) > 1) # If the optional ref/err/deprecated arguments are there. - { - my $argRef = string_trim(pop @args); - if($argRef =~ /^ifdef(.*)/) #If ifdef is at the start. - { - $ifdef = $1; - } - } - my $objOutputter = $$self{objOutputter}; - $objOutputter->output_implements_interface($interface, $ifdef); -} - -sub on_wrap_create($) -{ - my ($self) = @_; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $str = $self->extract_bracketed_text(); - - my $objOutputter = $$self{objOutputter}; - $objOutputter->output_wrap_create($str, $self); -} - -sub on_wrap_signal($) -{ - my ($self) = @_; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - #Get the arguments: - my $argCppDecl = $args[0]; - my $argCName = $args[1]; - $argCName = string_trim($argCName); - $argCName = string_unquote($argCName); - - my $bCustomDefaultHandler = 0; - my $bNoDefaultHandler = 0; - my $bCustomCCallback = 0; - my $bRefreturn = 0; - my $ifdef; - - while(scalar(@args) > 2) # If optional arguments are there. - { - my $argRef = string_trim(pop @args); - if($argRef eq "custom_default_handler") - { - $bCustomDefaultHandler = 1; - } - - if($argRef eq "no_default_handler") - { - $bNoDefaultHandler = 1; - } - - if($argRef eq "custom_c_callback") - { - $bCustomCCallback = 1; - } - - if($argRef eq "refreturn") - { - $bRefreturn = 1; - } - - elsif($argRef =~ /^ifdef(.*)/) #If ifdef is at the start. - { - $ifdef = $1; - } - } - - - $self->output_wrap_signal( $argCppDecl, $argCName, $$self{filename}, $$self{line_num}, $bCustomDefaultHandler, $bNoDefaultHandler, $bCustomCCallback, $bRefreturn, $ifdef); -} - -# void on_wrap_vfunc() -sub on_wrap_vfunc($) -{ - my ($self) = @_; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - #Get the arguments: - my $argCppDecl = $args[0]; - my $argCName = $args[1]; - $argCName = string_trim($argCName); - $argCName = string_unquote($argCName); - - my $refreturn = 0; - my $refreturn_ctype = 0; - my $ifdef = ""; - - # Extra ref needed? - while(scalar(@args) > 2) # If the optional ref/err arguments are there. - { - my $argRef = string_trim(pop @args); - - if($argRef eq "refreturn") - { $refreturn = 1; } - elsif($argRef eq "refreturn_ctype") - { $refreturn_ctype = 1; } - elsif($argRef =~ /^ifdef(.*)/) #If ifdef is at the start. - { - $ifdef = $1; - } - } - - $self->output_wrap_vfunc($argCppDecl, $argCName, $refreturn, $refreturn_ctype, - $$self{filename}, $$self{line_num}, $ifdef); -} - -sub on_wrap_enum($) -{ - my ($self) = @_; - - return if(!$self->check_for_eof()); - - my $outputter = $$self{objOutputter}; - my $out = \@{$$outputter{out}}; - - # Look back for a Doxygen comment for this _WRAP_ENUM. If there is one, - # remove it from the output and pass it to the m4 _ENUM macro instead. - my $comment = ""; - - if(scalar(@$out) >= 2) - { - # steal the last two tokens - my @back = splice(@$out, -2); - local $_ = $back[0]; - - # Check for /*[*!] ... */ or //[/!] comments. The closing */ _must_ - # be the last token of the previous line. Apart from this restriction, - # anything else should work, including multi-line comments. - - if($back[1] eq "\n" && (m#^/\*`[*!](.+)'\*/#s || m#^//`[/!](.+)'$#)) - { - $comment = $1; - $comment =~ s/\s+$//; - } - else - { - # restore stolen tokens - push(@$out, @back); - } - } - - # get the arguments - my @args = string_split_commas($self->extract_bracketed_text()); - - my $cpp_type = string_trim(shift(@args)); - my $c_type = string_trim(shift(@args)); - - # The remaining elements in @args could be flags or s#^FOO_## substitutions. - - $outputter->output_wrap_enum( - $$self{filename}, $$self{line_num}, $cpp_type, $c_type, $comment, @args); -} - -sub on_wrap_gerror($) -{ - my ($self) = @_; - - return if(!$self->check_for_eof()); - - # get the arguments - my @args = string_split_commas($self->extract_bracketed_text()); - - my $cpp_type = string_trim(shift(@args)); - my $c_enum = string_trim(shift(@args)); - my $domain = string_trim(shift(@args)); - - # The remaining elements in @args could be flags or s#^FOO_## substitutions. - - $$self{objOutputter}->output_wrap_gerror( - $$self{filename}, $$self{line_num}, $cpp_type, $c_enum, $domain, @args); -} - -sub on_wrap_property($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - #Get the arguments: - my $argPropertyName = $args[0]; - $argPropertyName = string_trim($argPropertyName); - $argPropertyName = string_unquote($argPropertyName); - - #Convert the property name to a canonical form, as it is inside gobject. - #Otherwise, gobject might not recognise the name, - #and we will not recognise the property name when we get notification that the value changes. - $argPropertyName =~ s/_/-/g; #g means replace all. - - my $argCppType = $args[1]; - $argCppType = string_trim($argCppType); - $argCppType = string_unquote($argCppType); - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - $objOutputter->output_wrap_property($filename, $line_num, $argPropertyName, $argCppType, $$self{c_class}); -} - - -sub output_wrap_check($$$$$$) -{ - my ($self, $CppDecl, $signal_name, $filename, $line_num, $macro_name) = @_; - - #Some checks: - - - if (!$$self{in_class}) - { - print STDERR "$filename:$line_num: $macro_name macro encountered outside class\n"; - return; - } - - if ($CppDecl =~ /^\S+$/ ) #If it's not empty and it contains no whitespace. - { - print STDERR "$filename:$line_num:$macro_name can't handle unspecified entity $CppDecl\n"; - return; - } - - -} - -# void output_wrap($CppDecl, $signal_name, $filename, $line_num, $bCustomDefaultHandler, $bNoDefaultHandler, $bCustomCCallback, $bRefreturn) -# Also used for vfunc. -sub output_wrap_signal($$$$$$$$) -{ - my ($self, $CppDecl, $signal_name, $filename, $line_num, $bCustomDefaultHandler, $bNoDefaultHandler, $bCustomCCallback, $bRefreturn, $ifdef) = @_; - - #Some checks: - $self->output_wrap_check($CppDecl, $signal_name, $filename, $line_num, "WRAP_SIGNAL"); - - # handle first argument - - #Parse the method decaration and build an object that holds the details: - my $objCppSignal = &Function::new($CppDecl, $self); - $$objCppSignal{class} = $$self{class}; #Remember the class name for use in Outputter::output_wrap_signal(). - - - # handle second argument: - my $objCSignal = undef; - - my $objOutputter = $$self{objOutputter}; - - #Get the c function's details: - if ($signal_name ne "" ) #If it's not empty and it contains no whitespace. - { - $objCSignal = GtkDefs::lookup_signal($$self{c_class}, $signal_name); - - # Check for failed lookup. - if($objCSignal eq 0) - { - print STDERR "$signal_name\n"; - $objOutputter->output_wrap_failed($signal_name, - " signal defs lookup failed"); - return; - } - } - - $objOutputter->output_wrap_sig_decl($filename, $line_num, $objCSignal, $objCppSignal, $signal_name, $bCustomCCallback, $ifdef); - - if($bNoDefaultHandler eq 0) - { - $objOutputter->output_wrap_default_signal_handler_h($filename, $line_num, $objCppSignal, $objCSignal, $ifdef); - - my $bImplement = 1; - if($bCustomDefaultHandler) { $bImplement = 0; } - $objOutputter->output_wrap_default_signal_handler_cc($filename, $line_num, $objCppSignal, $objCSignal, $bImplement, $bCustomCCallback, $bRefreturn, $ifdef); - } -} - -# void output_wrap($CppDecl, $signal_name, $filename, $line_num) -# Also used for vfunc. -sub output_wrap_vfunc($$$$$$$$) -{ - my ($self, $CppDecl, $vfunc_name, $refreturn, $refreturn_ctype, $filename, $line_num, $ifdef) = @_; - - #Some checks: - $self->output_wrap_check($CppDecl, $vfunc_name, $filename, $line_num, "VFUNC"); - - # handle first argument - - #Parse the method decaration and build an object that holds the details: - my $objCppVfunc = &Function::new($CppDecl, $self); - - - # handle second argument: - my $objCVfunc = undef; - - my $objOutputter = $$self{objOutputter}; - - #Get the c function's details: - if ($vfunc_name =~ /^\S+$/ ) #If it's not empty and it contains no whitespace. - { - $objCVfunc = GtkDefs::lookup_signal($$self{c_class},$vfunc_name); - if(!$objCVfunc) #If the lookup failed: - { - $objOutputter->output_wrap_failed($vfunc_name, " vfunc defs lookup failed"); - return; - } - } - - # Write out the appropriate macros. - # These macros are defined in vfunc.m4: - - $$objCppVfunc{rettype_needs_ref} = $refreturn; - $$objCppVfunc{name} .= "_vfunc"; #All vfuncs should have the "_vfunc" prefix, and a separate easily-named invoker method. - - $$objCVfunc{rettype_needs_ref} = $refreturn_ctype; - - $objOutputter->output_wrap_vfunc_h($filename, $line_num, $objCppVfunc, $objCVfunc,$ifdef); - $objOutputter->output_wrap_vfunc_cc($filename, $line_num, $objCppVfunc, $objCVfunc, $ifdef); -} - -# give some sort of weights to sorting attibutes -sub byattrib() -{ - my %attrib_value = ( - "virtual_impl" ,1, - "virtual_decl" ,2, - # "sig_impl" ,3, - "sig_decl" ,4, - "meth" ,5 - ); - - # $a and $b are hidden parameters to a sorting function - return $attrib_value{$b} <=> $attrib_value{$a}; -} - - -# void on_wrap_corba_method() -sub on_wrap_corba_method($) -{ - my ($self) = @_; - my $objOutputter = $$self{objOutputter}; - - if( !($self->check_for_eof()) ) - { - return; - } - - my $filename = $$self{filename}; - my $line_num = $$self{line_num}; - - my $str = $self->extract_bracketed_text(); - my @args = string_split_commas($str); - - my $entity_type = "method"; - - if (!$$self{in_class}) - { - print STDERR "$filename:$line_num:_WRAP macro encountered outside class\n"; - return; - } - - my $objCfunc; - my $objCppfunc; - - # handle first argument - my $argCppMethodDecl = $args[0]; - if ($argCppMethodDecl =~ /^\S+$/ ) #Checks that it's not empty and that it contains no whitespace. - { - print STDERR "$filename:$line_num:_WRAP can't handle unspecified method $argCppMethodDecl\n"; - return; - } - else - { - #Parse the method decaration and build an object that holds the details: - $objCppfunc = &Function::new($argCppMethodDecl, $self); - } - - $objOutputter->output_wrap_corba_method($filename, $line_num, $objCppfunc); -} - - -1; # return package loaded okay. diff --git a/libs/gtkmm2/ChangeLog b/libs/gtkmm2/ChangeLog index 264762a992..53abb1ca9c 100644 --- a/libs/gtkmm2/ChangeLog +++ b/libs/gtkmm2/ChangeLog @@ -1,3 +1,855 @@ +2007-11-06 Jonathon Jongsma + + * docs/reference/doxygen_to_devhelp.xsl: minor clean-up of the xsl file to + extract common stuff out to separate templates so we don't have so much + duplication in the 'as-func' and 'as-sub' templates + +2007-11-05 Jonathon Jongsma + + * docs/reference/doxygen_to_devhelp.xsl: Fully-qualify functions in the + devhelp file so it's easy to see which class they belong to in the search + results (Bug #493999) + +2007-11-05 Jonathon Jongsma + + * docs/reference/Makefile.am: clean up the makefile rules for building the + devhelp files a bit so that it gets rebuilt if the xsl stylesheet changes, + etc. + * docs/reference/doxygen_to_devhelp.xsl: Fix the devhelp XSL stylesheet so + that the functions link correctly (fixes Bug #488261) + +2007-11-05 Yevgen Muntyan + + * tools/extra_defs_gen/generate_defs_gtk.cc: Added ifdefs around the + unix-specific printer objects, to fix the build on Windows. + +2.12.2: + +2007-11-05 Murray Cumming + + * gtk/src/linkbutton.ccg: + * gtk/src/linkbutton.hg: Partially hand-code one of the + constructors, so it can pass the uri for the label too, + as in gtk_link_button_new(). Bug #492200 (Marko Anastasov). + +2007-11-04 Murray Cumming + + * gtk/src/widget.hg: Change a Style to Gtk::Style in + a signal, to fix the build on MacOS X. Bug #493057. + (Alberto Ruiz) + * tools/m4/convert_gtk.m4: + * gtk/src/style.hg: Moved some signal-specific conversions to + the .hg file, to avoid their misuse. + +2007-10-25 Murray Cumming + + * gtk/src/iconview.hg: set_cursor(): Actually implement this. + +This is the gtkmm-2-12 branch. See the svn trunk branch for gtkmm 2.13/14. + +2007-10-14 Marko Anastasov + + * gdk/src/pixbuf.hg: Fixed build by correcting a typo for create() + from previous commit. Bug #486257 (Craig Keogh). + +2007-10-12 Armin Burgmeier + + * gdk/gdkmmconfig.h.in: + * gtk/gtkmmconfig.h.in: + * configure.in: Added G{D,T}KMM_DISABLE_DEPRECATED defines to + g{d,t}kmmconfig.h so other code can check whether deprecated API is + available or not. + + * gdk/src/pixbuf.hg: + * gdk/src/pixbuf.ccg: Fixed build with deprecated API disabled. + + * gtk/src/tooltips.hg: + * gtk/src/combo.hg: + * gtk/src/textview.hg: + * gtk/src/optionmenu.hg: + * gtk/src/toolbar.hg: + * gtk/src/inputdialog.hg: + * gtk/src/treeview.hg: + * gtk/src/style.hg: + * gtk/src/toolitem.hg: + * gtk/src/textbuffer.hg: + * gtk/src/treepath.hg: + * gtk/src/treesortable.hg: + * gtk/src/progress.hg: + * gtk/src/treeviewcolumn.hg: + * gtk/src/fileselection.hg: + * gdk/src/colormap.hg: + * gdk/src/color.hg: Use the new _CONFIGINCLUDE m4 macro in glibmm to + include gtkmmconfig.h before the #ifdef GTKMM_DISABLE_DEPRECATED at + the top of the file so that the define is actually present when other + code includes one of these files directly. Note this requires glibmm + from SVN to generate the source files (though building the sources + should still work with 2.14.1). + +2.12.1: + +2007-10-04 Murray Cumming + + * gtk/src/printoperation.hg: Add a custom conversion for the + signals that use PrintContext, to fix a reference-counting + problem that caused crashes when printing or showing a + print preview. + Note that this was removed mistakenly on 2007-07-14 + (appearing in 2.11.4) so gtkmm 2.10 does not have this problem. + + * tools/m4/convert_atk.m4: + * tools/m4/convert_gdk.m4: + * tools/m4/convert_gtk.m4: + * atk/src/hypertext.hg: + * atk/src/table.hg: + * gdk/src/displaymanager.hg: + * gtk/src/inputdialog.hg: + * gtk/src/style.hg: + * gtk/src/textbuffer.hg: + * gtk/src/widget.hg: Move all signal-specific conversions to + the .hg files where they are used, to make this clearer. + +2.12.0: + +2007-09-10 Murray Cumming + + * gdk/src/gdk_docs_override.xml: + * gdk/src/window.hg: + * gtk/src/builder.hg: + * gtk/src/celllayout.hg: + * gtk/src/filechooser.hg: + * gtk/src/iconinfo.ccg: + * gtk/src/pagesetup.hg: + * gtk/src/printsettings.hg: + * gtk/src/recentchooser.hg: Dealt with some simple TODO: + mostly documentation. + +2007-09-10 Murray Cumming + + * gtk/src/recentaction.ccg: + * gtk/src/recentaction.hg: Make the constructors use the same + parameter order as the other action classes. Remove the comment + about the default constructor, now that the GTK+ C documentation + is clearer in bug #450032. + * gtk/src/action.hg: + * gtk/src/radioaction.hg: + * gtk/src/toggleaction.hg: Deprecate the default constructors, + because they cannot work. We could maybe remove them, but maybe + they are used in the build of some applications, but never used + at runtime. + Added default values for the StockID parameters, now that we + know that we know that this is OK - see bug #450032. + +2.11.8: + +2007-08-31 Murray Cumming + + * docs/tutorial/gtkmm-tut.xml: DrawingArea: Corrected a mention of + PixBuf to Pixbuf. Bug #465961 (Jonathan Jongsma). + +2007-08-29 Jonathon Jongsma + + * gdk/gdkmm/general.cc, gdk/gdkmm/general.h: deprecate cairo helper + functions and added new overloaded functions that take *const* + RefPtr& parameters. + Also renamed the new rectangle() and region() functions per the TODO in the + source file. The new names are add_rectangle_to_path() and + add_region_to_path() + +2.11.7: + +2007-08-16 Jonathon Jongsma + + * docs/reference/gtkmm_footer.html_fragment, + docs/reference/gtkmm_header.html_fragment: add
to make it easier to + incoporate the documentation into library.gnome.org, per a request by + Frederic Peters + +2007-08-13 Daniel Elstner + + * gtk/src/iconview.hg: Remove stray semicolon. + * gtk/src/printer.hg: Likewise. + * gtk/src/tooltip.ccg: Remove /* inside comment. + + * gtk/src/builder.ccg (get_type_from_name_vfunc_callback): + Remove unused argument names to avoid compiler warnings. + * examples/book/printing/advanced/previewdialog.cc: ditto, + * examples/book/tooltips/examplewindow.cc: ditto. + +2.11.6: + +2007-07-30 Marko Anastasov + + * .cvsignore: Updated, along with all other, and added some + where missing. + +2007-07-29 Marko Anastasov + + * gtk/src/treeview.[ccg|hg]: + * gtk/src/iconview.[ccg|hg]: Modified get_tooltip_context_iter() + and get_tooltip_context_path() implementations to use local + structs/objects to pass to the C function instead of + unguaranteed pointers. Added doxygen documentation for these + functions in both classes. + +2007-07-29 Marko Anastasov + + * gtk/src/treeview.[ccg|hg]: + * gtk/src/iconview.[ccg|hg]: Added get_tooltip_context_path() + and get_tooltip_context_iter(). They are wrappers for + gtk_tree/icon_view_get_tooltip_context(). + +2007-07-29 Murray Cumming + + * gtk/src/gtk_docs_override.xml: Corrected the documentation for + gtk_toolbar_set_icon_size() and gtk_toolbar_unset_icon_size() to + use the correct Since:. + * gtk/src/papersize.ccg: + * gtk/src/papersize.hg: save_to_key_file(): Removed the default + group_name parameter value and added an overload instead. + * gtk/src/printer.hg: Added some documentation. + * gtk/src/printjob.hg: Added a const version of get_surface() + and added documentation for send(). + * gtk/src/printsettings.ccg: + * gtk/src/printsettings.hg: Corrected the typedef for SlotForeach - + the ustring&s should be const. I do not believe that anybody could + have been using this, so I think it is OK to change it. + * gtk/src/textmark.hg: Added documentation for constructors and + create() methods. + * gtk/src/volumebutton.hg: Added documentation for the constructor. + + * pango/src/fontface.hg: Added documentation for list_sizes(). + * pango/src/renderer.hg: Added class documentation. + +2007-07-29 Murray Cumming + + * gdk/src/pixbuf.hg: Document the old + create() methods as deprecated. Added documentation for + the new create() methods. + * gdk/src/screen.hg: Correct the const version for + get_font_options(). + * gtk/src/builder.hg: Added documentation for the + create methods. + * gtk/src/gtk_docs_override.xml: Corrected the + documentation for gtk_icon_theme_lookup_icon(). + * gtk/src/linkbutton.hg: + * gtk/src/linkbutton.ccg: Added set_uri_hook() + and unset_uri_hook(). + * gtk/src/papersize.hg: + * gtk/src/papersize.ccg: Added operator bool() so + that return values can be checked. + +2007-07-29 Marko Anastasov + + * gtk/src/tooltip.hg: Added class documentation based on GTK+ docs. + +2007-07-29 Marko Anastasov + + * configure.in: + * examples/book/Makefile.am: + * examples/book/tooltips/Makefile.am: + * examples/book/tooltips/examplewindow.[cc|h]: + * examples/book/tooltips/main.cc: Added an example for the new + tooltips API. + +2007-07-29 Marko Anastasov + + * gtk/src/gtk_docs_override.xml: Corrected mismatched tag + for PageSetup::save_to_file(). + +2007-07-28 Murray Cumming + + * gtk/src/gtk_docs_override.xml: Corrected the + documentation for + AboutDialog::get_program_name(), get_website_label(), + CellLayout::get_cells(), + EntryCompletion::get_completion_prefix(), + IconTheme::choose_icon(), list_contexts(), + IconView::set_tooltip_cell(), set_tooltip_item(), + PageSetup::save_to_file(), + PrinterSettings::save_to_file(), request_details(), + Widget::error_bell(), get_tooltip_markup(), + get_tooltip_text(), + * gtk/src/iconview.hg: Added a set_tooltip_cell() method + overload without the cell parameter. + * gtk/src/settings.hg: Added new properties: + gtk-modules, gtk-cursor-theme-name, + gtk-cursor-theme-size, gtk-alternative-button-order, + gtk-alternative-sort-arrows, gtk-show-input-method-menu, + gtk-show-unicode-menu, gtk-timeout-initial, + gtk-timeout-repeat, gtk-timeout-expand, + gtk-color-scheme, gtk-enable-animations, + gtk-touchscreen-mode, gtk-tooltip-timeout, + gtk-tooltip-browse-timeout, gtk-tooltip-browse-mode-timeout, + gtk-keynav-cursor-only, gtk-keynav-wrap-around, + gtk-error-bell, gtk-color-hash, + gtk-file-chooser-backend, gtk-print-backends, + gtk-print-preview-command, gtk-enable-mnemonics, + gtk-enable-accels, gtk-recent-files-limit. + +2007-07-28 Murray Cumming + + * gtk/src/builder.hg: Removed get_type_from_name() because it + seems only useful when implementing GTK+ widgets. + * gtk/src/gtk_docs_override.xml: Corrected the + gtk_page_setup_to_key_file() and gtk_print_settings_to_key_file() + documentation. + * gtk/src/pagesetup.ccg: + * gtk/src/pagesetup.hg: Added a save_to_key_file() method + overload without the group parameter. + * gtk/src/printsettings.ccg: + * gtk/src/printsettings.hg: Renamed to_key_file() to save_to_key_file() + and to_file() to save_to_file(). Added a save_to_key_file() method + overload without the group parameter. + * gtk/src/scalebutton.hg: Use IconSize instead of GtkIconSize + for the constructor parameter. + * gtk/src/widget.hg: Added a @see unset_cursor() to the + documentation. + Thanks to Jonathan Jongsma for the API review. + +2007-07-22 Murray Cumming + + * tools/extra_defs_gen/generate_defs_gtk.cc: + * gtk/src/gtk_signals.defs: Added GtkScaleButton, GtkVolumeButton + and GtkRecentAction. + * gtk/src/gtk_methods.defs: Regenerated with h2defs.py. + + * gdk/src/pixbuf.ccg: + * gdk/src/pixbuf.hg: Added constructors that do not take dest_x + and dest_y (which are ignored in this case), and deprecated those old + constructors. Added constructors that do not take a colormap, because + that is optional. + get_formats(): Corrected the reference counting. + * gdk/src/screen.hg: + * tools/m4/convert_gtk.m4: + * gtk/src/iconview.hg: set_tooltip_item(), set_tooltip_cell(): + Use Tooltip only via a RefPtr. + * gtk/src/menushell.hg: Added move_selected signal. + + * gtk/src/textview.hg: + * gtk/src/scalebutton.hg: Ignore key-bindings signals. + + * gtk/src/tooltip.hg: Added set_tip_area(). + * gtk/src/treeview.hg: Added convert_widget_to_tree_coords(), + convert_tree_to_widget_coords(), convert_widget_to_bin_window_coords(), + convert_bin_window_to_widget_coords(), convert_tree_to_bin_window_coords(), + convert_bin_window_to_tree_coords(), + set_tooltip_row(), set_tooltip_cell(), set_tooltip_column(), + get_tooltip_column(). + * gtk/src/widget.hg: Added keynav_failed(), error_bell(), + modify_cursor(), unset_cursor(), + set_has_tooltip(), get_has_tooltip(). + +2.11.5: + +2007-07-21 Murray Cumming + + * gdk/src/gdk_docs.xml: + * pango/src/pango_docs.xml: + * gtk/src/gtk_docs.xml: Regenerated with docextract_to_xml.py. + * pango/src/pango_methods.defs: Regenerated with h2defs.py. + + * pango/src/color.hg: Added to_string(). + * pango/src/cairofontmap.hg: Added get_font_type(). + * gdk/src/screen.hg: Added is_composited(), set_font_options(), + get_font_options(), set_resolution(), get_resolution(), + get_active_window() + + * gtk/src/combobox.hg: + * gtk/src/filechooserbutton.hg: + * gtk/src/notebook.hg: Ignored some new key-binding signals. + + * gtk/src/iconview.hg: Added set_tooltip_item() and + set_tooltip_cell(). + * tools/m4/convert_gtk.m4: Added necessary new conversions. + + * gtk/src/textbuffer.hg: Commented out the copy-target-list + and paste-target-list properties for now, with a TODO, because I fear + that the reference-counting might not be correct. + +2007-07-20 Marko Anastasov + + * gtk/src/textbuffer.hg: Wrapped cursor-position, copy-target-list + and paste-target-list properties from GTK+ 2.10. + +2007-07-14 Murray Cumming + + * tools/extra_defs_gen/generate_defs_gtk.cc: Mention the GtkPrint* + classes so that signal/property .defs are generated for these. + * gdk/src/Makefile.am: + * gdk/src/gdk_pixbuf_enums.defs: Added this instead of pasting it + into gdk_enums.defs. + * gdk/src/gdk.defs: + * gdk/src/gdk_enums.defs: + * gdk/src/gdk_methods.defs: + * gtk/src/gtk_enums.defs: + * gtk/src/gtk_methods.defs: + * gtk/src/gtk_signals.defs: Regenerated, with h2defs.py, enums.pl, + and generate_extra_defs. + * gtk/src/gtk_others.defs: Move the hand-written GtkPrintOperationPreview + signal defs to here instead of having them in gtk_signals.defs where they + will be overwritten when it's regenerated. + * gtk/src/iconview.hg: Added convert_widget_to_bin_window_coords(). + * gtk/src/papersize.hg: Commented out get_paper_sizes() until I + figure out the build break. + * gtk/src/statusicon.hg: Added set_screen() and get_screen(). + + * pango/src/pango_enums.defs: + * pango/src/pango_methods.defs: Regenerated. + * tools/m4/convert_pango.m4: New conversions. + * pango/src/context.hg: Added GravityHint enum. + Added set_base_gravity(), get_base_gravity(), get_gravity(), + set_gravity_hint(), get_gravity_hint(). + * pango/src/fontdescription.hg: Added Gravity enum. + Added set_gravity() and get_gravity(). + * pango/src/fontface.hg: Added is_synthesized(). + * pango/src/glyphstring.hg: Added get_width(). + * pango/src/layout.hg: Added is_wrapped(), is_ellipsized() and + get_unknown_glyphs_count(). + Reimplemented the const get_line() and get_lines() methods with + the (faster) *_read_only() C functions. + +2007-07-13 Murray Cumming + + * gtk/src/tooltips.hg: Deprecated in favour of the various + set_tooltip_text() and set_tooltip_markup() methods, and the new + Gtl::Tooltip class. + * gtk/src/menutoolbutton.hg: Added set_arrow_tooltip_text() and + set_arrow_tooltip_markup(). Deprecated set_arrow_tooltip(). + * gtk/src/toolitem.ccg: + * gtk/src/toolitem.hg: Deprecated signal_set_tooltip. + * examples/book/eventbox/examplewindow.cc: + * examples/book/eventbox/examplewindow.h: + * examples/book/toolbar/examplewindow.cc: + Replace use, or mention, of the deprecated Gtk::Tooltips class. + +2007-07-12 Murray Cumming + + * gtk/src/toolbar.ccg: + * gtk/src/toolbar.hg: get_tooltips_object(): Reimplement + to fix the build because GTK+ broke the API of GtkTooltips::tooltips + (renaming it to GtkTooltips::_tooltips). I think I read that they + will change it back before a stable release. + Deprecated get_tooltips_object(). + +2007-07-03 Johannes Schmid + + * gtk/src/uimanager.hg: + Added class documentation based on GTK+ + +2007-07-03 Murray Cumming + + * gtk/src/treeview.hg: Added is_rubber_banding_active(). + +2007-07-02 Murray Cumming + + * docs/reference/Doxyfile.in: Correct the ALIASES for newin2p*. + * gtk/src/builder.hg: + * gtk/src/cellrendererprogress.hg: + * gtk/src/cellrendererspin.hg: + * gtk/src/recentaction.hg: + * gtk/src/scalebutton.hg: + * gtk/src/volumebutton.hg: Use newin2p12. + +2.11.4: + +2007-06-30 Johannes Schmid + + * gtk/src/action.hg: + * gtk/src/assistant.hg: + * gtk/src/builder.hg: + * gtk/src/cellrendereraccel.hg: + * gtk/src/cellrendererspin.hg: + * gtk/src/entrycompletion.hg: + * gtk/src/filefilter.hg: + * gtk/src/linkbutton.hg: + * gtk/src/radioaction.hg: + * gtk/src/recentaction.hg: + * gtk/src/scalebutton.hg: + * gtk/src/settings.hg: + * gtk/src/toggleaction.hg: + * gtk/src/volumebutton.hg: + * gtk/src/window.hg: + + Fixed class documentation + +2007-06-30 Marko Anastasov + + * gtk/src/tooltip.[hg|ccg]: + * gtk/src/widget.[hg|ccg]: New files and functions, properties and signal + of the new tooltips API. + * gtk/gtkmm.h: Include tooltip.h. + * gtk/src/gtk_signals.defs: Added query_tooltip signal for Widget. + * gtk/src/Makefile_list_of_hg.am_fragment: Include tooltip.hg in build. + * tools/m4/convert_gtk.m4: Added conversions between GtkTooltip* + and Glib::RefPtr. + * tools/extra_defs_gen/generate_defs_gtk.cc: Generate defs for Tooltip. + +2007-06-26 Murray Cumming + + * examples/book/builder/basic/basic.ui: + * examples/book/builder/basic/main.cc: + * examples/book/builder/derived/basic.ui: + * examples/book/builder/derived/main.cc: + Convert the libglade .glade files to GtkBuilder .ui files, + with gtk-builder-convert script from GTK+. + * gtk/src/builder.ccg: + * gtk/src/builder.hg: Addded create_from_file() and create_from_string(), + as conveniences. Changed the add_from_file() parameter to a std::string, + as all filenames should be, because their encoding is unknown. + Added a add_from_string() version that accepts a simple std::string. + +2007-06-24 Murray Cumming + + * gtk/src/gtk_enums.defs: Regenerated with enums.pl + * gtk/src/gtk_methods.defs: Regenerated with h2defs.py. + + * gtk/src/Makefile_list_of_hg.am_fragment: + * gtk/src/builder.ccg: + * gtk/src/builder.hg: Added wrapper for GtkBuilder, taking code from + libglademm so that it instantiates derived GTypes by using the vfunc, + and has templated get_widget() and get_widet_derived() methods. + * gtk/gtkmm.h: Added builder.h + + * configure.in: + * examples/book/builder/basic/ + * examples/book/builder/derived/ + Added GtkBuilder versions of the libgladem examples. These will not + work until I find the script to conver the glade files to GtkBuilder + files, or find a UI editor that creates GtkBuilder files. + +2007-06-22 Murray Cumming + + * gtk/src/recentaction.hg: Constuctor and create(): + Added default values for the tooltips and stock_id paramters, + though I think none of these should need to specified. + See bug #450032. + * gtk/gtkmm.h: Added recentaction.h + * examples/book/recent_files/examplewindow.cc: Used the RecentAction to + create a sub-menu. + +2007-06-22 Murray Cumming + + * examples/book/treeview/editable_cells/examplewindow.cc: + * examples/book/treeview/editable_cells/examplewindow.h: + Added comments about using CellRendererSpin or CellRendererProgress here. + I tested the new CellRendererSpin here and it works. + +2.11.3: + +2007-06-10 Kalle Vahlman + + * tests/property_notification/main.cc: #ifdef out the use of the regular property API + if properties are disabled. + +2007-02-10 Murray Cumming + + * gdk/src/types.hg: Add ListHandle_AtomString intermediate container + type. + * gdk/src/dragcontext.ccg: + * gdk/src/dragcontext.hg: get_targets(), + * gtk/src/selectiondata.hg: + * gtk/src/selectiondata.ccg: get_targets(): Use ListHandle_AtomString with appropriate + ownership instead of the current faulty code. This changes the return type, and + therefore changes the API and ABI of this method, but it is not possible that + anyone was using these functions until now, due to the brokenness. + Bug #399403 (Yannick Guesnet) + +2007-06-10 Murray Cumming + + * gtk/src/action.ccg: + * gtk/src/action.hg: Added create_menu(). + * gtk/src/printer.hg: Added list_papers(). + + * docs/tutorial/gtkmm-tut.xml: In the gmmproc chapter, mention the optional text + for the _WRAP_METHOD() deprecated parameter. + +2007-06-10 Murray Cumming + + * gtk/gtkmm/treemodelcolumn.h: Added a comment about the difficulty of using + a static instance. + * gtk/src/notebook.hg: Added const versions of get_n_pages() and page_num(), + deprecating the non-const methods. Bug #442284 (Tomasz Ostrowski). + * gtk/src/scalebutton.hg: Use refresult instead of refreturn. Maybe gmmproc + should not ignore unknown options. + +2007-06-10 Murray Cumming + + * gtk/src/scalebutton.hg: Added the constructor now that + gtk_scale_button_new() has been fixed in GTK+. + +2007-06-09 Murray Cumming + + * gtk/src/cellrendererprogress.hg: Added pulse, text-xalign, and + text-yalign properties. + * gtk/src/entrycompletion.hg: + * gtk/src/entrycompletion.ccg: Added set_inline_selection(), + and get_inline_selection(). + Added cursor_on_match signal, though without a default signal + handlers, to preserve ABI. + Added inline-selection property. + * gtk/src/range.hg: Added set_show_fill_level(), get_show_fill_level(), + set_restrict_to_fill_level(), get_restrict_to_fill_level(), + set_fill_level(), get_fill_level(). + Added show-fill-level, restrict-to-fill-level, and + fill-level properties. + * gtk/src/texttag.hg: Added paragraph-background, + paragraph-background-gdk, paragraph-background-set, + accumulative-margin properties. + * gtk/src/treeview.hg: Added set_show_expanders(), get_show_expanders(), + set_level_indentation(), get_level_indentation(). + +2007-06-09 Murray Cumming + + * gtk/src/Makefile_list_of_hg.am_fragment: + * gtk/src/recentaction.ccg: + * gtk/src/recentaction.hg: Added RecentAction. + * gtk/src/scalebutton.ccg: + * gtk/src/scalebutton.hg: Added ScaleButton. + * gtk/src/volumebutton.ccg: + * gtk/src/volumebutton.hg: Added VolumeButton. + +2007-06-09 Murray Cumming + + * gtk/gtkmm/stock.cc: + * gtk/gtkmm/stock.h: Added DISCARD, ORIENTATION_PORTRAIT, + ORIENTATION_LANDSCAPE, ORIENTATION_REVERSE_LANDSCAPE, + ORIENTATION_REVERSE_PORTRAIT, SELECT_ALL + +2007-06-06 Jonathon Jongsma + + * docs/tutorial/gtkmm-tut.xml: updated the internationalization section + slightly, prompted by some discussion / criticism on gtkmm-list. There's + probably more that could be done here still. I mostly worked on the wording + to make it flow a bit better and added a bit more explanatory text. + +2.11.2: + +2007-06-04 Murray Cumming + + * docs/tutorial/gtkmm-tut.xml: gmmproc appendix: Added documentation + on constructors, create() methods, _CONSTRUCT(), and some hints about + wrapping GList* and GSList* parameters. + Bug #350870. (Paul Davis and Johannes Schmid) + + * docs/reference/Doxyfile.in: Added newin2p12 tag, for marking API + as new since 2.12. + + * gdk/src/gdk_methods.defs: + * gtk/src/gtk_methods.defs: Regenerated with h2defs.py + + * gdk/src/display.hg: Added supports_shapes(), supports_input_shapes(), + supports_composite(). + * gdk/src/window.hg: Added set_composited(), input_shape_combine_mask(), + input_shape_combine_region(), set_child_input_shapes(), + merge_child_input_shapes(), get_type_hint(), set_startup_id(), beep(), + set_opacity(). + * gtk/src/aboutdialog.hg: Added set/get_program_name() and deprecated + set/get_name(). + * gtk/src/celllayout.hg: Added get_cells(). + * gtk/src/entry.hg: Added set_cursor_hadjustment(), get_cursor_hadjustment(). + * gtk/src/icontheme.hg: Added choose_icon(), list_contexts(). + * gtk/src/notebook.hg: Added set/get_group() and deprecated set/get_group_id(). + * gtk/src/pagesetup.hg: Added to_file(), to_key_file(). + * gtk/src/papersize.hg: Added get_paper_sizes(). + * gtk/src/printer.hg: Added has_details(), request_details(), + get_capabilities(). + * gtk/src/printsettings.hg: Added to_file(), to_key_file(). + * gtk/src/textbuffer.hg: Added add_mark(). + * gtk/src/textmark.ccg: + * gtk/src/textmark.hg: Added constructor and create() method, though these + are usually created via TextBuffer. + * gtk/src/toolbar.hg: Added set_icon_size(), unset_icon_size(). + * gtk/src/window.hg: Added set_opacity(), get_opacity(). + Added transient_for, and opacity properties. + +2007-05-26 Jonathon Jongsma + + * gtk/src/gtk_docs_override.xml: update documentation for some FileChooser + methods which incorrectly stated that the returned list of strings needs to + be freed with Glib::free() + +2.11.1: + +2007-05-23 Jonathon Jongsma + + * docs/tutorial/gtkmm-tut.xml: renamed the gmmproc appendix to "Wrapping C + Libraries with gmmproc" so that it shows up better in google searches for + 'gmmproc' + +2007-05-09 Jonathon Jongsma + + * docs/tutorial/gtkmm-tut.xml: Another big set of changes to improve pdf + output. I shortened a lot of the code in the docbook + document so that things will fit on a printed page / pdf document. In + addition, a lot of little changes were made to reduce a lot of unnecessary + whitespace in the generated PDF (e.g. don't wrap or + elements in empty tags, etc). This has the advantage + of streamlining the markup as well. I didn't make it all of the way through + the document, will clean up more in the future. + * examples/book/drag_and_drop/dndwindow.h: shorten another long line in this + example so that when it's included into the tutorial it fits on a page + +2007-05-09 Jonathon Jongsma + + * examples/book/comboboxentry/complex/examplewindow.cc: accidentally broke + the build on this example when reducing the line length + +2007-05-08 Jonathon Jongsma + + * docs/tutorial/Makefile.am: add a 'pdf' target so that we can build a pdf + version of the tutorial more easily. Also fixed the command for the + 'validate' targets and a couple other minor cleanups. + +2007-05-08 Jonathon Jongsma + + * examples/book/*: modified all of the book examples to make all lines 80 + characters long or less. This makes it so that the examples have a chance + of fitting on the page of a printed pdf version of the tutorial book + +2007-05-08 Jonathon Jongsma + + * docs/tutorial/gtkmm-tut.xml: LOTS of changes to the tutorial to get it to + validate against the docbook DTD. This was necessary because if the xml + wasn't valid then we couldn't use tools such as docbook2pdf to generate a + pdf version of the tutorial. Most of the changes involved things such as + adding elements inside of and elements (since these + elements can't old raw character data, but can). Also defined some + entities such as ü in ways that xml validators find acceptable, and a + few other things. I have not yet created a makefile rule to build a pdf + automatically (or at least more easily), but I will do that soon. + +2007-05-07 Jonathon Jongsma + + * examples/book/custom/custom_widget/mywidget.cc,h: Update the custom widget + example to use cairo-based drawing instead of the old GDK drawing functions. + +2007-05-03 Murray Cumming + + * docs/tutorial/gtkmm-tut.xml: Basics: Split part of the example section into + a Headers and Linking section, with slightly fuller information. + libglademm section: Describe what you need to include and link for libglademm, + and link back to the basics section that I just created. + +2007-05-01 Johannes Schmid + + * gtk/src/style.hg: + Wrap gtk_style_attach() and gtk_style_detach(). + Bug #351336 + +2007-05-01 Johannes Schmid + + * gtk/src/window.hg: Added static set_default_icon_name() method, + wrapping gtk_window_set_default_icon_name(). + Bug #364395 (Yuriy Syrota) + +2007-05-01 Johannes Schmid + + * gtk/src/calendar.hg + * gtk/src/calendar.ccg + Bug #350584 – Calendar::get_date() method using Glib::Date + +2007-05-01 Murray Cumming + + * gtk/src/gtk_signals.defs: Adjust the GtkStatusIcon::popup_menu signal + definition, because the GType parameter system can not distinguish between + guint and guint32 (There is no G_TYPE_UINT32). + * gtk/src/statusicon.hg: Add signals for the GtkStatusIcon activate and + popup_menu signals. See the comment in the code about these not being + public API, but we are adding them anyway because they seem necessary, + and we cannot get an answer out of the GTK+ maintainers. + Bug # + +2007-05-01 Murray Cumming + + * gtk/src/statusicon.ccg: + * gtk/src/statusicon.hg: Added popup_menu_at_position(), as an equivalent for + the gtk_status_icon_position_menu() helper callback. + Bug #392948 (Jan Niklas Hasse) + +2007-05-01 Murray Cumming + + * gtk/src/window.hg: Added set_accept_focus(), get_accept_focus(), + set_focus_on_map() and get_focus_on_map(). + Bug #421936 + +This is the trunk branch for gtkmm 2.11/12. + +2.10.10: + +2007-04-30 Johannes Schmid + + * gtk/src/combo.hg: + * gtk/src/fileselection.hg: + * gtk/src/optionmenu.hg: + * gtk/src/progress.hg: + + Use _IS_DEPRECATED instead of _DEPRECATED to sync with + glibmm HEAD. + +2007-04-24 Yselkowitz + + * scripts/macros.m4: Check for both m4 and M4 in the GNU m4 output, + to fix the build on some platforms. + Bug #423990 + +2007-04-18 Armin Burgmeier + + * gtk/src/recentmanager.hg: + * gtk/src/recentmanager.ccg: Made a std::vector out of + the StringArrayHandle in Gtk::RecentManager::Data because the latter + is not instantiable and only meant to be used as an intermediate type. + + Also hand-code RecentManager::add_item(const Glib::ustring&, const + Data&) because we cannot do an easy conversion. We have to fill in a C + struct instead. + Bug #388086 (Grant Patterson) + +2007-04-12 Armin Burgmeier + + * tools/m4/convert_gtk.m4: Removed GtkRadioAction* -> + Glib::RefPtr conversion. + + * gtk/src/radioaction.hg: Added a custom conversion from + GtkRadioAction* to Glib::RefPtr that increases the + reference count for the radio action object. The only place where this + conversion actually is required is the changed signal of the radio + action, and we need an additional reference there. + Bug #350734 (Johnathon Jongsma, "pjdavis" Paul Davis) + +2007-04-12 Johannes Schmid + + * gtk/src/widget.ccg: + Added a special case for Gtk::Menu in + Widget_Class::dispose_vfunc_callback to fix a crash in menu + destruction. + Bug #339791 ("pjdavis" Paul Davis, Andrew E. Makeev) + +2007-04-14 Marko Anastasov + + * docs/FAQ/gtkmm-faq.xml: Emphasised that the use libglademm is + preferred over glademm. Bug #429043. + Removed the old libglademm URL entity. + +2.10.9: + +2007-03-30 Murray Cumming + + * examples/book/notebook/examplewindow.cc: + * examples/book/notebook/examplewindow.h: Connect to the switch-page signal, + as a demonstration. + +2007-03-12 Andrew E. Makeev + + * gtk/src/treeview.ccg: fix memory leak in get_cursor() function. + Bug #417539 + +2007-03-09 Jonathon Jongsma + + * gtk/src/gtk_docs_override.xml: fix documentation of + IconTheme::get_example_icon_name() so that it doesn't imply that the + returned ustring needs to be freed. + 2.10.8: 2007-03-03 Alan Ott diff --git a/libs/gtkmm2/INSTALL b/libs/gtkmm2/INSTALL new file mode 100644 index 0000000000..5458714e1e --- /dev/null +++ b/libs/gtkmm2/INSTALL @@ -0,0 +1,234 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/libs/gtkmm2/MSVC_Net2003/Makefile.am b/libs/gtkmm2/MSVC_Net2003/Makefile.am new file mode 100644 index 0000000000..d4d986703a --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = gendef atkmm pangomm gdkmm gtkmm demos examples + +EXTRA_DIST = blank.cpp gtkmm.sln README diff --git a/libs/gtkmm2/MSVC_Net2003/Makefile.in b/libs/gtkmm2/MSVC_Net2003/Makefile.in new file mode 100644 index 0000000000..9fa7e7e519 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/Makefile.in @@ -0,0 +1,516 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003 +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = gendef atkmm pangomm gdkmm gtkmm demos examples +EXTRA_DIST = blank.cpp gtkmm.sln README +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/README b/libs/gtkmm2/MSVC_Net2003/README new file mode 100644 index 0000000000..0140c835b5 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/README @@ -0,0 +1,13 @@ +Building gtkmm-2.4 with Visual Studio .NET 2003 + +* You will need Visual Studio .NET 2003 (MSVC 7.1). Earlier versions of the compiler, including 6.0 and 7.0 will not work. +* Install the latest Win32 GTK+ Development Environment from the Glade for Windows project, http://gladewin32.sourceforge.net. +* Build libsigc++ 2.0.6 or later + glibmm 2.4.7 or later from source. +* Add GTK+, libsigc++ and glibmm to the include and lib paths in Visual Studio. +* Load the gtkmm/MSVC_Net2003/gtkmm.sln solution. +* Build the entire solution. +* Run the tests. + +Timothy M. Shead & Cedric Gustin +11/04/2004 + diff --git a/libs/gtkmm2/MSVC_Net2003/atkmm/Makefile.am b/libs/gtkmm2/MSVC_Net2003/atkmm/Makefile.am new file mode 100644 index 0000000000..1cb1dcf5ac --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/atkmm/Makefile.am @@ -0,0 +1,3 @@ +BUILT_SOURCES = atkmm.rc + +EXTRA_DIST = atkmm.vcproj atkmm.rc diff --git a/libs/glibmm2/docs/internal/Makefile.in b/libs/gtkmm2/MSVC_Net2003/atkmm/Makefile.in similarity index 70% rename from libs/glibmm2/docs/internal/Makefile.in rename to libs/gtkmm2/MSVC_Net2003/atkmm/Makefile.in index 243fc54581..8d251dd7f5 100644 --- a/libs/glibmm2/docs/internal/Makefile.in +++ b/libs/gtkmm2/MSVC_Net2003/atkmm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,31 +31,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = docs/internal -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +subdir = MSVC_Net2003/atkmm +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/atkmm.rc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = atkmm.rc SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -75,37 +69,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -113,43 +114,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -161,32 +152,43 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = gtk_entry.dia \ - documentation_generation.txt gmmproc_internals.txt using_gmmproc.txt - -all: all-am +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +BUILT_SOURCES = atkmm.rc +EXTRA_DIST = atkmm.vcproj atkmm.rc +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -198,9 +200,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/internal/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/atkmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu docs/internal/Makefile + $(AUTOMAKE) --gnu MSVC_Net2003/atkmm/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -218,16 +220,14 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +atkmm.rc: $(top_builddir)/config.status $(srcdir)/atkmm.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -236,22 +236,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -263,10 +262,12 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile installdirs: -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -290,13 +291,14 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -310,12 +312,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -334,24 +344,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - -post-html: - -doc-clean: - -.PHONY: post-html doc-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.rc b/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.rc new file mode 100644 index 0000000000..a6395612dc --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.rc @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,12,3,1 + PRODUCTVERSION 2,12,3,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for atk" + VALUE "FileVersion", "2.12.3" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "atkmm-1.6" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "2.12.3" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.rc.in b/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.rc.in similarity index 74% rename from libs/glibmm2/MSVC_Net2003/glibmm/glibmm.rc.in rename to libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.rc.in index d2d7773f22..f4b81e7173 100755 --- a/libs/glibmm2/MSVC_Net2003/glibmm/glibmm.rc.in +++ b/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.rc.in @@ -34,8 +34,8 @@ END #endif // APSTUDIO_INVOKED VS_VERSION_INFO VERSIONINFO - FILEVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1 - PRODUCTVERSION @GLIBMM_MAJOR_VERSION@,@GLIBMM_MINOR_VERSION@,@GLIBMM_MICRO_VERSION@,1 + FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -50,12 +50,12 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The glibmm development team (see AUTHORS)" - VALUE "FileDescription", "The official C++ wrapper for glib" + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for atk" VALUE "FileVersion", "@VERSION@" VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" - VALUE "OriginalFilename", "glibmm-2.4" - VALUE "ProductName", "glibmm" + VALUE "OriginalFilename", "atkmm-1.6" + VALUE "ProductName", "gtkmm" VALUE "ProductVersion", "@VERSION@" END END diff --git a/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.vcproj b/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.vcproj new file mode 100755 index 0000000000..e602bbe1e9 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/atkmm/atkmm.vcproj @@ -0,0 +1,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/blank.cpp b/libs/gtkmm2/MSVC_Net2003/blank.cpp new file mode 100755 index 0000000000..a75b9f2bb9 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/blank.cpp @@ -0,0 +1,11 @@ +// This file may very well be the most annoying workaround of all time. +// It is included here to simplify working with gtkmm using the +// MSVC IDE. +// +// This file is included in all of the MSVC projects to force the +// IDE to display the C/C++ property pages for editing. Apparently, +// the MSVC IDE does not recognize .cc files as C++ source code, even +// though the compiler does! +// +// Tim Shead, tshead@k-3d.com +// 10/12/2004 diff --git a/libs/gtkmm2/MSVC_Net2003/demos/Makefile.am b/libs/gtkmm2/MSVC_Net2003/demos/Makefile.am new file mode 100644 index 0000000000..94157fa48b --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/demos/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = gtk-demo diff --git a/libs/gtkmm2/MSVC_Net2003/demos/Makefile.in b/libs/gtkmm2/MSVC_Net2003/demos/Makefile.in new file mode 100644 index 0000000000..a3a85c57c7 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/demos/Makefile.in @@ -0,0 +1,515 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/demos +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = gtk-demo +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/demos/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/demos/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/Makefile.am b/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/Makefile.am new file mode 100644 index 0000000000..49b2b8d96b --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = gtk-demo.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/Makefile.in b/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/Makefile.in new file mode 100644 index 0000000000..e918fbb2bf --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/demos/gtk-demo +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = gtk-demo.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/demos/gtk-demo/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/demos/gtk-demo/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/gtk-demo.vcproj b/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/gtk-demo.vcproj new file mode 100755 index 0000000000..ac22dd6e79 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/demos/gtk-demo/gtk-demo.vcproj @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/Makefile.am new file mode 100644 index 0000000000..f24f36dfa3 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = arrow calendar cellrenderercustom_popup cellrenderercustom_toggle \ + direction dnd exception gdk printing rulers statusbar stock tictactoe \ + treemodelcustom window diff --git a/libs/glibmm2/MSVC_Net2003/examples/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/Makefile.in similarity index 77% rename from libs/glibmm2/MSVC_Net2003/examples/Makefile.in rename to libs/gtkmm2/MSVC_Net2003/examples/Makefile.in index d7da4d7ad3..4b055f3da4 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/Makefile.in +++ b/libs/gtkmm2/MSVC_Net2003/examples/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -38,37 +34,37 @@ host_triplet = @host@ subdir = MSVC_Net2003/examples DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -84,37 +80,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -122,43 +125,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -170,29 +163,43 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = dispatcher dispatcher2 markup options thread thread_pool +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = arrow calendar cellrenderercustom_popup cellrenderercustom_toggle \ + direction dnd exception gdk printing rulers statusbar stock tictactoe \ + treemodelcustom window + all: all-recursive .SUFFIXES: @@ -232,10 +239,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -267,8 +270,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -369,22 +371,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -398,7 +399,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -406,6 +407,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -445,8 +448,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -460,12 +462,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -484,22 +494,24 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libs/gtkmm2/MSVC_Net2003/examples/arrow/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/arrow/Makefile.am new file mode 100644 index 0000000000..ca461f1081 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/arrow/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = arrow.vcproj diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/arrow/Makefile.in similarity index 73% rename from libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile.in rename to libs/gtkmm2/MSVC_Net2003/examples/arrow/Makefile.in index ddd33f8de7..bb2336b0f0 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher/Makefile.in +++ b/libs/gtkmm2/MSVC_Net2003/examples/arrow/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,31 +31,28 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/examples/dispatcher +subdir = MSVC_Net2003/examples/arrow DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -75,37 +68,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -113,43 +113,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -161,29 +151,40 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = dispatcher.vcproj +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = arrow.vcproj all: all-am .SUFFIXES: @@ -196,9 +197,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/arrow/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher/Makefile + $(AUTOMAKE) --gnu MSVC_Net2003/examples/arrow/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -222,10 +223,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -234,22 +231,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -294,7 +290,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -308,12 +304,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -332,17 +336,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/arrow/arrow.vcproj similarity index 77% rename from libs/glibmm2/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj rename to libs/gtkmm2/MSVC_Net2003/examples/arrow/arrow.vcproj index ebac10b619..79b9365414 100755 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/dispatcher2.vcproj +++ b/libs/gtkmm2/MSVC_Net2003/examples/arrow/arrow.vcproj @@ -2,8 +2,8 @@ @@ -39,8 +39,9 @@ /> @@ -121,7 +122,8 @@ /> diff --git a/libs/gtkmm2/MSVC_Net2003/examples/calendar/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/calendar/Makefile.am new file mode 100644 index 0000000000..e79b221993 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/calendar/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = calendar.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/calendar/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/calendar/Makefile.in new file mode 100644 index 0000000000..6d09bfff0f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/calendar/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/calendar +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = calendar.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/calendar/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/calendar/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/calendar/calendar.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/calendar/calendar.vcproj new file mode 100755 index 0000000000..3f0d91f245 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/calendar/calendar.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.am new file mode 100644 index 0000000000..eee5a4f3f7 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = cellrenderercustom_popup.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in new file mode 100644 index 0000000000..b80fd3d18f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/cellrenderercustom_popup +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = cellrenderercustom_popup.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/cellrenderercustom_popup/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/cellrenderercustom_popup/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/cellrenderercustom_popup.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/cellrenderercustom_popup.vcproj new file mode 100755 index 0000000000..f97c2bfeaa --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_popup/cellrenderercustom_popup.vcproj @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.am new file mode 100644 index 0000000000..91efc8c5a2 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = cellrenderercustom_toggle.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in new file mode 100644 index 0000000000..96ce7dd717 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/cellrenderercustom_toggle +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = cellrenderercustom_toggle.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/cellrenderercustom_toggle.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/cellrenderercustom_toggle.vcproj new file mode 100755 index 0000000000..94de60d99f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/cellrenderercustom_toggle/cellrenderercustom_toggle.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/direction/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/direction/Makefile.am new file mode 100644 index 0000000000..6141980b62 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/direction/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = direction.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/direction/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/direction/Makefile.in new file mode 100644 index 0000000000..57132d7024 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/direction/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/direction +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = direction.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/direction/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/direction/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/direction/direction.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/direction/direction.vcproj new file mode 100755 index 0000000000..a9b23fd594 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/direction/direction.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/dnd/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/dnd/Makefile.am new file mode 100644 index 0000000000..b0f4dd2bd3 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/dnd/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = dnd.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/dnd/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/dnd/Makefile.in new file mode 100644 index 0000000000..15293bffbd --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/dnd/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/dnd +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = dnd.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/dnd/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/dnd/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/dnd/dnd.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/dnd/dnd.vcproj new file mode 100755 index 0000000000..5d0c676296 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/dnd/dnd.vcproj @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/exception/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/exception/Makefile.am new file mode 100644 index 0000000000..c93378ba16 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/exception/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = exception.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/exception/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/exception/Makefile.in new file mode 100644 index 0000000000..644f2fdd66 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/exception/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/exception +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = exception.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/exception/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/exception/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/exception/exception.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/exception/exception.vcproj new file mode 100755 index 0000000000..97bdb6cde4 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/exception/exception.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/gdk/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/gdk/Makefile.am new file mode 100644 index 0000000000..f3444197b9 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/gdk/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = gdk.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/gdk/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/gdk/Makefile.in new file mode 100644 index 0000000000..f0f72cdf38 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/gdk/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/gdk +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = gdk.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/gdk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/gdk/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/gdk/gdk.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/gdk/gdk.vcproj new file mode 100755 index 0000000000..f8b094954e --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/gdk/gdk.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/printing/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/printing/Makefile.am new file mode 100644 index 0000000000..6dc1f92c9d --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/printing/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = printing.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/printing/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/printing/Makefile.in new file mode 100644 index 0000000000..ea8bcd1dd1 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/printing/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/printing +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = printing.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/printing/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/printing/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/printing/printing.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/printing/printing.vcproj new file mode 100755 index 0000000000..fe032a4da8 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/printing/printing.vcproj @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/rulers/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/rulers/Makefile.am new file mode 100644 index 0000000000..c75f770868 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/rulers/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = rulers.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/rulers/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/rulers/Makefile.in new file mode 100644 index 0000000000..f78a416d1d --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/rulers/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/rulers +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = rulers.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/rulers/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/rulers/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/rulers/rulers.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/rulers/rulers.vcproj new file mode 100755 index 0000000000..3acc89d42b --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/rulers/rulers.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/statusbar/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/statusbar/Makefile.am new file mode 100644 index 0000000000..eb9aa352f7 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/statusbar/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = statusbar.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/statusbar/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/statusbar/Makefile.in new file mode 100644 index 0000000000..947e696ee8 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/statusbar/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/statusbar +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = statusbar.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/statusbar/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/statusbar/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/statusbar/statusbar.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/statusbar/statusbar.vcproj new file mode 100755 index 0000000000..291dd9f391 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/statusbar/statusbar.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/stock/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/stock/Makefile.am new file mode 100644 index 0000000000..fda5a0971f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/stock/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = stock.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/stock/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/stock/Makefile.in new file mode 100644 index 0000000000..1d77fcef51 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/stock/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/stock +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = stock.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/stock/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/stock/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/stock/stock.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/stock/stock.vcproj new file mode 100755 index 0000000000..a6506b1a9c --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/stock/stock.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/Makefile.am new file mode 100644 index 0000000000..42f1f2211b --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = tictactoe.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/Makefile.in new file mode 100644 index 0000000000..545076452b --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/tictactoe +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = tictactoe.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/tictactoe/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/tictactoe/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/glibmm_value.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/tictactoe.vcproj similarity index 74% rename from libs/glibmm2/MSVC_Net2003/tests/glibmm_value/glibmm_value.vcproj rename to libs/gtkmm2/MSVC_Net2003/examples/tictactoe/tictactoe.vcproj index 24be953b88..dfe5f59696 100755 --- a/libs/glibmm2/MSVC_Net2003/tests/glibmm_value/glibmm_value.vcproj +++ b/libs/gtkmm2/MSVC_Net2003/examples/tictactoe/tictactoe.vcproj @@ -2,9 +2,8 @@ @@ -40,8 +39,9 @@ /> @@ -121,7 +122,8 @@ /> @@ -202,6 +205,10 @@ Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/examples/window/Makefile.am b/libs/gtkmm2/MSVC_Net2003/examples/window/Makefile.am new file mode 100644 index 0000000000..713dc2636f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/window/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = window.vcproj diff --git a/libs/gtkmm2/MSVC_Net2003/examples/window/Makefile.in b/libs/gtkmm2/MSVC_Net2003/examples/window/Makefile.in new file mode 100644 index 0000000000..e974da689f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/window/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/examples/window +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = window.vcproj +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/window/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/examples/window/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/examples/window/window.vcproj b/libs/gtkmm2/MSVC_Net2003/examples/window/window.vcproj new file mode 100755 index 0000000000..e36b83287d --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/examples/window/window.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/Makefile.am b/libs/gtkmm2/MSVC_Net2003/gdkmm/Makefile.am similarity index 50% rename from libs/glibmm2/MSVC_Net2003/glibmm/Makefile.am rename to libs/gtkmm2/MSVC_Net2003/gdkmm/Makefile.am index a0f8c4167c..78037ef220 100644 --- a/libs/glibmm2/MSVC_Net2003/glibmm/Makefile.am +++ b/libs/gtkmm2/MSVC_Net2003/gdkmm/Makefile.am @@ -1,12 +1,13 @@ -BUILT_SOURCES = glibmmconfig.h glibmm.rc +BUILT_SOURCES = gdkmmconfig.h gdkmm.rc MAINTAINERCLEANFILES = $(built_sources) +DISTCLEANFILES = gdkmmconfig.h -EXTRA_DIST = glibmmconfig.h glibmm.vcproj glibmm.rc +EXTRA_DIST = gdkmmconfig.h gdkmm.vcproj gdkmm.rc -# Copy config file generated by the configure script. Dependency is +# Copy config file generated by the configure script. Dependency is # wht respect to the .h.in file, to prevent an error with 'make distcheck'. # See http://sources.redhat.com/automake/automake.html#distcleancheck -glibmmconfig.h: $(top_srcdir)/glib/glibmmconfig.h.in $(top_srcdir)/configure.in - cp -f $(top_builddir)/glib/glibmmconfig.h $@ +gdkmmconfig.h: $(top_srcdir)/gdk/gdkmmconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/gdk/gdkmmconfig.h $@ diff --git a/libs/glibmm2/MSVC_Net2003/glibmm/Makefile.in b/libs/gtkmm2/MSVC_Net2003/gdkmm/Makefile.in similarity index 72% rename from libs/glibmm2/MSVC_Net2003/glibmm/Makefile.in rename to libs/gtkmm2/MSVC_Net2003/gdkmm/Makefile.in index 209eb3b18b..5ff630725e 100644 --- a/libs/glibmm2/MSVC_Net2003/glibmm/Makefile.in +++ b/libs/gtkmm2/MSVC_Net2003/gdkmm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,32 +31,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/glibmm +subdir = MSVC_Net2003/gdkmm DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/glibmm.rc.in + $(srcdir)/gdkmm.rc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = glibmm.rc + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = gdkmm.rc SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -76,37 +69,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -114,43 +114,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -162,31 +152,43 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -BUILT_SOURCES = glibmmconfig.h glibmm.rc +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +BUILT_SOURCES = gdkmmconfig.h gdkmm.rc MAINTAINERCLEANFILES = $(built_sources) -EXTRA_DIST = glibmmconfig.h glibmm.vcproj glibmm.rc +DISTCLEANFILES = gdkmmconfig.h +EXTRA_DIST = gdkmmconfig.h gdkmm.vcproj gdkmm.rc all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -200,9 +202,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/glibmm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/gdkmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/glibmm/Makefile + $(AUTOMAKE) --gnu MSVC_Net2003/gdkmm/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -220,7 +222,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -glibmm.rc: $(top_builddir)/config.status $(srcdir)/glibmm.rc.in +gdkmm.rc: $(top_builddir)/config.status $(srcdir)/gdkmm.rc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: @@ -228,10 +230,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -240,22 +238,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -292,6 +289,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -304,7 +302,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -318,12 +316,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -342,25 +348,28 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am -# Copy config file generated by the configure script. Dependency is +# Copy config file generated by the configure script. Dependency is # wht respect to the .h.in file, to prevent an error with 'make distcheck'. # See http://sources.redhat.com/automake/automake.html#distcleancheck -glibmmconfig.h: $(top_srcdir)/glib/glibmmconfig.h.in $(top_srcdir)/configure.in - cp -f $(top_builddir)/glib/glibmmconfig.h $@ +gdkmmconfig.h: $(top_srcdir)/gdk/gdkmmconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/gdk/gdkmmconfig.h $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.rc b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.rc new file mode 100644 index 0000000000..ea3fcd5d00 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.rc @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,12,3,1 + PRODUCTVERSION 2,12,3,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for gdk" + VALUE "FileVersion", "2.12.3" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "gdkmm-2.4" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "2.12.3" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.rc.in b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.rc.in new file mode 100755 index 0000000000..5eacfea85e --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.rc.in @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for gdk" + VALUE "FileVersion", "@VERSION@" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "gdkmm-2.4" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.vcproj b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.vcproj new file mode 100755 index 0000000000..276ad87a71 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmm.vcproj @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/gdk/gdkmmconfig.h b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmmconfig.h similarity index 82% rename from libs/gtkmm2/gdk/gdkmmconfig.h rename to libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmmconfig.h index 26f39b4b3d..e7b015600d 100644 --- a/libs/gtkmm2/gdk/gdkmmconfig.h +++ b/libs/gtkmm2/MSVC_Net2003/gdkmm/gdkmmconfig.h @@ -4,5 +4,7 @@ #include +/* #undef GDKMM_DISABLE_DEPRECATED */ + #endif /* _GDKMM_CONFIG_H */ diff --git a/libs/gtkmm2/MSVC_Net2003/gendef/Makefile.am b/libs/gtkmm2/MSVC_Net2003/gendef/Makefile.am new file mode 100644 index 0000000000..3a435c34a2 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gendef/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = gendef.vcproj gendef.cc + diff --git a/libs/gtkmm2/MSVC_Net2003/gendef/Makefile.in b/libs/gtkmm2/MSVC_Net2003/gendef/Makefile.in new file mode 100644 index 0000000000..46e586ee78 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gendef/Makefile.in @@ -0,0 +1,356 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = MSVC_Net2003/gendef +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = gendef.vcproj gendef.cc +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/gendef/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu MSVC_Net2003/gendef/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/gendef/gendef.cc b/libs/gtkmm2/MSVC_Net2003/gendef/gendef.cc new file mode 100755 index 0000000000..cf665604ae --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gendef/gendef.cc @@ -0,0 +1,94 @@ +/* + * MICO --- an Open Source CORBA implementation + * Copyright (c) 2003 Harald Böhme + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * For more information, visit the MICO Home Page at + * http://www.mico.org/ + */ + +/* Modified by Cedric Gustin on 2006/01/13 : + * Redirect the output of dumpbin to dumpbin.out instead of reading the + * output stream of popen, as it fails with Visual Studio 2005 in + * pre-link build events. + */ + +#include +#include +#include + +using namespace std; + +int main(int argc,char** argv) +{ + if (argc < 4) { + cerr << "Usage: " << argv[0] << " ...." << endl; + return 2; + } + + // CG : Explicitly redirect stdout to dumpbin.out. + string dumpbin = "dumpbin /SYMBOLS /OUT:dumpbin.out"; + int i = 3; + + for(;i fct + def_file << " " << (s+1) << endl; + else + if(strchr(s,'?')!=0 && strncmp(s,"??_G",4)!=0 && strncmp(s,"??_E",4)!=0) { + def_file << " " << s << endl; + } + } + } + } + + // CG : Close dumpbin.out and delete it. + fclose(dump); + remove("dumpbin.out"); + + cout << dumpbin.c_str() << endl; +} diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj b/libs/gtkmm2/MSVC_Net2003/gendef/gendef.vcproj similarity index 79% rename from libs/glibmm2/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj rename to libs/gtkmm2/MSVC_Net2003/gendef/gendef.vcproj index bff1cd5286..bcd3f78cf9 100755 --- a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/thread_pool.vcproj +++ b/libs/gtkmm2/MSVC_Net2003/gendef/gendef.vcproj @@ -1,212 +1,204 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/MSVC_Net2003/gtkmm.sln b/libs/gtkmm2/MSVC_Net2003/gtkmm.sln new file mode 100755 index 0000000000..94cb298a4c --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm.sln @@ -0,0 +1,251 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-2.4", "gdkmm\gdkmm.vcproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}" + ProjectSection(ProjectDependencies) = postProject + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-2.4", "gtkmm\gtkmm.vcproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atkmm-1.6", "atkmm\atkmm.vcproj", "{9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}" + ProjectSection(ProjectDependencies) = postProject + {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangomm-1.4", "pangomm\pangomm.vcproj", "{6EF7CB5B-9781-4CC0-979B-A067E0A088BB}" + ProjectSection(ProjectDependencies) = postProject + {07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demos_gtk-demo", "demos\gtk-demo\gtk-demo.vcproj", "{5A8BBE25-E8D8-487B-AD2D-690438F09FA1}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_arrow", "examples\arrow\arrow.vcproj", "{9FE8A8EC-8254-4ACC-B611-A3EE50DA4233}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_direction", "examples\direction\direction.vcproj", "{3DD95190-066E-42A6-89C6-CA6A54321C87}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_calendar", "examples\calendar\calendar.vcproj", "{A5DE0D48-0A8F-4BF3-A816-F2D81E7CB43B}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_cellrenderercustom_toggle", "examples\cellrenderercustom_toggle\cellrenderercustom_toggle.vcproj", "{7015D351-A17B-4C60-951E-F7067925DADA}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_cellrenderercustom_popup", "examples\cellrenderercustom_popup\cellrenderercustom_popup.vcproj", "{DF428E3D-31F2-4F50-9187-0176351CFD42}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_dnd", "examples\dnd\dnd.vcproj", "{0BB91EA6-923E-4181-8A8C-480BD1D60B18}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_window", "examples\window\window.vcproj", "{C4F1EA94-465A-416C-B7AA-160BBF2552C1}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_treemodelcustom", "examples\treemodelcustom\treemodelcustom.vcproj", "{40691C26-671D-4485-AB13-A7E596E5E9AC}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_tictactoe", "examples\tictactoe\tictactoe.vcproj", "{CA7153FA-AEEB-4719-9B51-729954F8003D}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_stock", "examples\stock\stock.vcproj", "{3B1B452B-FB4B-449F-9F38-67226CA174DE}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_statusbar", "examples\statusbar\statusbar.vcproj", "{942BE422-98AE-4C07-958A-6C6B67EB6F83}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_rulers", "examples\rulers\rulers.vcproj", "{196D9F62-D2A5-4F6E-A72D-91D11311F96E}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_gdk", "examples\gdk\gdk.vcproj", "{15E36DAE-0AD8-4021-B1A1-1FEE037734D7}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_exception", "examples\exception\exception.vcproj", "{74A636AB-D7EB-46F9-9AE1-84D6E9808C7C}" + ProjectSection(ProjectDependencies) = postProject + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "examples_printing", "examples\printing\printing.vcproj", "{7EF918D4-969B-45B0-9143-0C95D37FDEAE}" + ProjectSection(ProjectDependencies) = postProject + {907B8D15-7E12-4136-A7E6-B6ED5E055D39} = {907B8D15-7E12-4136-A7E6-B6ED5E055D39} + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} = {6EF7CB5B-9781-4CC0-979B-A067E0A088BB} + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} = {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}.Debug|Win32.ActiveCfg = Debug|Win32 + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}.Debug|Win32.Build.0 = Debug|Win32 + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}.Release|Win32.ActiveCfg = Release|Win32 + {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}.Release|Win32.Build.0 = Release|Win32 + {907B8D15-7E12-4136-A7E6-B6ED5E055D39}.Debug|Win32.ActiveCfg = Debug|Win32 + {907B8D15-7E12-4136-A7E6-B6ED5E055D39}.Debug|Win32.Build.0 = Debug|Win32 + {907B8D15-7E12-4136-A7E6-B6ED5E055D39}.Release|Win32.ActiveCfg = Release|Win32 + {907B8D15-7E12-4136-A7E6-B6ED5E055D39}.Release|Win32.Build.0 = Release|Win32 + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}.Debug|Win32.Build.0 = Debug|Win32 + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}.Release|Win32.ActiveCfg = Release|Win32 + {9FE0D5A6-458C-45C7-B954-2C3C1E6196C2}.Release|Win32.Build.0 = Release|Win32 + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB}.Debug|Win32.ActiveCfg = Debug|Win32 + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB}.Debug|Win32.Build.0 = Debug|Win32 + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB}.Release|Win32.ActiveCfg = Release|Win32 + {6EF7CB5B-9781-4CC0-979B-A067E0A088BB}.Release|Win32.Build.0 = Release|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.ActiveCfg = Debug|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Debug|Win32.Build.0 = Debug|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.ActiveCfg = Release|Win32 + {07324745-C9BE-4D65-B08A-9C88188C0C28}.Release|Win32.Build.0 = Release|Win32 + {5A8BBE25-E8D8-487B-AD2D-690438F09FA1}.Debug|Win32.ActiveCfg = Debug|Win32 + {5A8BBE25-E8D8-487B-AD2D-690438F09FA1}.Debug|Win32.Build.0 = Debug|Win32 + {5A8BBE25-E8D8-487B-AD2D-690438F09FA1}.Release|Win32.ActiveCfg = Release|Win32 + {5A8BBE25-E8D8-487B-AD2D-690438F09FA1}.Release|Win32.Build.0 = Release|Win32 + {9FE8A8EC-8254-4ACC-B611-A3EE50DA4233}.Debug|Win32.ActiveCfg = Debug|Win32 + {9FE8A8EC-8254-4ACC-B611-A3EE50DA4233}.Debug|Win32.Build.0 = Debug|Win32 + {9FE8A8EC-8254-4ACC-B611-A3EE50DA4233}.Release|Win32.ActiveCfg = Release|Win32 + {9FE8A8EC-8254-4ACC-B611-A3EE50DA4233}.Release|Win32.Build.0 = Release|Win32 + {3DD95190-066E-42A6-89C6-CA6A54321C87}.Debug|Win32.ActiveCfg = Debug|Win32 + {3DD95190-066E-42A6-89C6-CA6A54321C87}.Debug|Win32.Build.0 = Debug|Win32 + {3DD95190-066E-42A6-89C6-CA6A54321C87}.Release|Win32.ActiveCfg = Release|Win32 + {3DD95190-066E-42A6-89C6-CA6A54321C87}.Release|Win32.Build.0 = Release|Win32 + {A5DE0D48-0A8F-4BF3-A816-F2D81E7CB43B}.Debug|Win32.ActiveCfg = Debug|Win32 + {A5DE0D48-0A8F-4BF3-A816-F2D81E7CB43B}.Debug|Win32.Build.0 = Debug|Win32 + {A5DE0D48-0A8F-4BF3-A816-F2D81E7CB43B}.Release|Win32.ActiveCfg = Release|Win32 + {A5DE0D48-0A8F-4BF3-A816-F2D81E7CB43B}.Release|Win32.Build.0 = Release|Win32 + {7015D351-A17B-4C60-951E-F7067925DADA}.Debug|Win32.ActiveCfg = Debug|Win32 + {7015D351-A17B-4C60-951E-F7067925DADA}.Debug|Win32.Build.0 = Debug|Win32 + {7015D351-A17B-4C60-951E-F7067925DADA}.Release|Win32.ActiveCfg = Release|Win32 + {7015D351-A17B-4C60-951E-F7067925DADA}.Release|Win32.Build.0 = Release|Win32 + {DF428E3D-31F2-4F50-9187-0176351CFD42}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF428E3D-31F2-4F50-9187-0176351CFD42}.Debug|Win32.Build.0 = Debug|Win32 + {DF428E3D-31F2-4F50-9187-0176351CFD42}.Release|Win32.ActiveCfg = Release|Win32 + {DF428E3D-31F2-4F50-9187-0176351CFD42}.Release|Win32.Build.0 = Release|Win32 + {0BB91EA6-923E-4181-8A8C-480BD1D60B18}.Debug|Win32.ActiveCfg = Debug|Win32 + {0BB91EA6-923E-4181-8A8C-480BD1D60B18}.Debug|Win32.Build.0 = Debug|Win32 + {0BB91EA6-923E-4181-8A8C-480BD1D60B18}.Release|Win32.ActiveCfg = Release|Win32 + {0BB91EA6-923E-4181-8A8C-480BD1D60B18}.Release|Win32.Build.0 = Release|Win32 + {C4F1EA94-465A-416C-B7AA-160BBF2552C1}.Debug|Win32.ActiveCfg = Debug|Win32 + {C4F1EA94-465A-416C-B7AA-160BBF2552C1}.Debug|Win32.Build.0 = Debug|Win32 + {C4F1EA94-465A-416C-B7AA-160BBF2552C1}.Release|Win32.ActiveCfg = Release|Win32 + {C4F1EA94-465A-416C-B7AA-160BBF2552C1}.Release|Win32.Build.0 = Release|Win32 + {40691C26-671D-4485-AB13-A7E596E5E9AC}.Debug|Win32.ActiveCfg = Debug|Win32 + {40691C26-671D-4485-AB13-A7E596E5E9AC}.Debug|Win32.Build.0 = Debug|Win32 + {40691C26-671D-4485-AB13-A7E596E5E9AC}.Release|Win32.ActiveCfg = Release|Win32 + {40691C26-671D-4485-AB13-A7E596E5E9AC}.Release|Win32.Build.0 = Release|Win32 + {CA7153FA-AEEB-4719-9B51-729954F8003D}.Debug|Win32.ActiveCfg = Debug|Win32 + {CA7153FA-AEEB-4719-9B51-729954F8003D}.Debug|Win32.Build.0 = Debug|Win32 + {CA7153FA-AEEB-4719-9B51-729954F8003D}.Release|Win32.ActiveCfg = Release|Win32 + {CA7153FA-AEEB-4719-9B51-729954F8003D}.Release|Win32.Build.0 = Release|Win32 + {3B1B452B-FB4B-449F-9F38-67226CA174DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B1B452B-FB4B-449F-9F38-67226CA174DE}.Debug|Win32.Build.0 = Debug|Win32 + {3B1B452B-FB4B-449F-9F38-67226CA174DE}.Release|Win32.ActiveCfg = Release|Win32 + {3B1B452B-FB4B-449F-9F38-67226CA174DE}.Release|Win32.Build.0 = Release|Win32 + {942BE422-98AE-4C07-958A-6C6B67EB6F83}.Debug|Win32.ActiveCfg = Debug|Win32 + {942BE422-98AE-4C07-958A-6C6B67EB6F83}.Debug|Win32.Build.0 = Debug|Win32 + {942BE422-98AE-4C07-958A-6C6B67EB6F83}.Release|Win32.ActiveCfg = Release|Win32 + {942BE422-98AE-4C07-958A-6C6B67EB6F83}.Release|Win32.Build.0 = Release|Win32 + {196D9F62-D2A5-4F6E-A72D-91D11311F96E}.Debug|Win32.ActiveCfg = Debug|Win32 + {196D9F62-D2A5-4F6E-A72D-91D11311F96E}.Debug|Win32.Build.0 = Debug|Win32 + {196D9F62-D2A5-4F6E-A72D-91D11311F96E}.Release|Win32.ActiveCfg = Release|Win32 + {196D9F62-D2A5-4F6E-A72D-91D11311F96E}.Release|Win32.Build.0 = Release|Win32 + {15E36DAE-0AD8-4021-B1A1-1FEE037734D7}.Debug|Win32.ActiveCfg = Debug|Win32 + {15E36DAE-0AD8-4021-B1A1-1FEE037734D7}.Debug|Win32.Build.0 = Debug|Win32 + {15E36DAE-0AD8-4021-B1A1-1FEE037734D7}.Release|Win32.ActiveCfg = Release|Win32 + {15E36DAE-0AD8-4021-B1A1-1FEE037734D7}.Release|Win32.Build.0 = Release|Win32 + {74A636AB-D7EB-46F9-9AE1-84D6E9808C7C}.Debug|Win32.ActiveCfg = Debug|Win32 + {74A636AB-D7EB-46F9-9AE1-84D6E9808C7C}.Debug|Win32.Build.0 = Debug|Win32 + {74A636AB-D7EB-46F9-9AE1-84D6E9808C7C}.Release|Win32.ActiveCfg = Release|Win32 + {74A636AB-D7EB-46F9-9AE1-84D6E9808C7C}.Release|Win32.Build.0 = Release|Win32 + {7EF918D4-969B-45B0-9143-0C95D37FDEAE}.Debug|Win32.ActiveCfg = Debug|Win32 + {7EF918D4-969B-45B0-9143-0C95D37FDEAE}.Debug|Win32.Build.0 = Debug|Win32 + {7EF918D4-969B-45B0-9143-0C95D37FDEAE}.Release|Win32.ActiveCfg = Release|Win32 + {7EF918D4-969B-45B0-9143-0C95D37FDEAE}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/libs/gtkmm2/MSVC_Net2003/gtkmm/Makefile.am b/libs/gtkmm2/MSVC_Net2003/gtkmm/Makefile.am new file mode 100644 index 0000000000..399c7dfed8 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm/Makefile.am @@ -0,0 +1,13 @@ +BUILT_SOURCES = gtkmmconfig.h gtkmm.rc + +MAINTAINERCLEANFILES = $(built_sources) +DISTCLEANFILES = gtkmmconfig.h + +EXTRA_DIST = gtkmmconfig.h gtkmm.vcproj gtkmm.rc + +# Copy config file generated by the configure script. Dependency is +# wht respect to the .h.in file, to prevent an error with 'make distcheck'. +# See http://sources.redhat.com/automake/automake.html#distcleancheck + +gtkmmconfig.h: $(top_srcdir)/gtk/gtkmmconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/gtk/gtkmmconfig.h $@ diff --git a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile.in b/libs/gtkmm2/MSVC_Net2003/gtkmm/Makefile.in similarity index 66% rename from libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile.in rename to libs/gtkmm2/MSVC_Net2003/gtkmm/Makefile.in index 2abeacdce7..09ab0253f2 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/dispatcher2/Makefile.in +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,31 +31,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/examples/dispatcher2 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +subdir = MSVC_Net2003/gtkmm +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/gtkmm.rc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = gtkmm.rc SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -75,37 +69,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -113,43 +114,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -161,30 +152,45 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = dispatcher2.vcproj -all: all-am +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +BUILT_SOURCES = gtkmmconfig.h gtkmm.rc +MAINTAINERCLEANFILES = $(built_sources) +DISTCLEANFILES = gtkmmconfig.h +EXTRA_DIST = gtkmmconfig.h gtkmm.vcproj gtkmm.rc +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -196,9 +202,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher2/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/gtkmm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/dispatcher2/Makefile + $(AUTOMAKE) --gnu MSVC_Net2003/gtkmm/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -216,16 +222,14 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +gtkmm.rc: $(top_builddir)/config.status $(srcdir)/gtkmm.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -234,22 +238,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -261,10 +264,12 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile installdirs: -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -284,17 +289,20 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -308,12 +316,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -332,18 +348,28 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + +# Copy config file generated by the configure script. Dependency is +# wht respect to the .h.in file, to prevent an error with 'make distcheck'. +# See http://sources.redhat.com/automake/automake.html#distcleancheck + +gtkmmconfig.h: $(top_srcdir)/gtk/gtkmmconfig.h.in $(top_srcdir)/configure.in + cp -f $(top_builddir)/gtk/gtkmmconfig.h $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.rc b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.rc new file mode 100644 index 0000000000..152ac15531 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.rc @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,12,3,1 + PRODUCTVERSION 2,12,3,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for gtk+" + VALUE "FileVersion", "2.12.3" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "gtkmm-2.4" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "2.12.3" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.rc.in b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.rc.in new file mode 100755 index 0000000000..0a4193d376 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.rc.in @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for gtk+" + VALUE "FileVersion", "@VERSION@" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "gtkmm-2.4" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.vcproj b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.vcproj new file mode 100755 index 0000000000..dbb09fa927 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmm.vcproj @@ -0,0 +1,1561 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/gtk/gtkmmconfig.h b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmmconfig.h similarity index 92% rename from libs/gtkmm2/gtk/gtkmmconfig.h rename to libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmmconfig.h index 939e7fddbf..5b2eed88fe 100644 --- a/libs/gtkmm2/gtk/gtkmmconfig.h +++ b/libs/gtkmm2/MSVC_Net2003/gtkmm/gtkmmconfig.h @@ -6,8 +6,8 @@ /* version numbers */ #define GTKMM_MAJOR_VERSION 2 -#define GTKMM_MINOR_VERSION 10 -#define GTKMM_MICRO_VERSION 8 +#define GTKMM_MINOR_VERSION 12 +#define GTKMM_MICRO_VERSION 3 #define GTKMM_ATKMM_ENABLED 1 /* #undef GTKMM_MAEMO_EXTENSIONS_ENABLED */ @@ -44,5 +44,7 @@ #define GTKMM_API #endif /* GLIBMM_DLL */ +/* #undef GTKMM_DISABLE_DEPRECATED */ + #endif /* _GTKMM_CONFIG_H */ diff --git a/libs/gtkmm2/MSVC_Net2003/pangomm/Makefile.am b/libs/gtkmm2/MSVC_Net2003/pangomm/Makefile.am new file mode 100644 index 0000000000..815ddd42b4 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/pangomm/Makefile.am @@ -0,0 +1,3 @@ +BUILT_SOURCES = pangomm.rc + +EXTRA_DIST = pangomm.vcproj pangomm.rc diff --git a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile.in b/libs/gtkmm2/MSVC_Net2003/pangomm/Makefile.in similarity index 70% rename from libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile.in rename to libs/gtkmm2/MSVC_Net2003/pangomm/Makefile.in index fe09c81b02..42a4d6bfc2 100644 --- a/libs/glibmm2/MSVC_Net2003/examples/thread_pool/Makefile.in +++ b/libs/gtkmm2/MSVC_Net2003/pangomm/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -35,31 +31,29 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = MSVC_Net2003/examples/thread_pool -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +subdir = MSVC_Net2003/pangomm +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/pangomm.rc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = pangomm.rc SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -75,37 +69,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -113,43 +114,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -161,30 +152,43 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -EXTRA_DIST = thread_pool.vcproj -all: all-am +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +BUILT_SOURCES = pangomm.rc +EXTRA_DIST = pangomm.vcproj pangomm.rc +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -196,9 +200,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread_pool/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu MSVC_Net2003/pangomm/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu MSVC_Net2003/examples/thread_pool/Makefile + $(AUTOMAKE) --gnu MSVC_Net2003/pangomm/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -216,16 +220,14 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +pangomm.rc: $(top_builddir)/config.status $(srcdir)/pangomm.rc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -234,22 +236,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -261,10 +262,12 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile installdirs: -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -288,13 +291,14 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -308,12 +312,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -332,17 +344,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.rc b/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.rc new file mode 100644 index 0000000000..bab197802f --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.rc @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,12,3,1 + PRODUCTVERSION 2,12,3,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for pango" + VALUE "FileVersion", "2.12.3" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "pangomm-1.4" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "2.12.3" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.rc.in b/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.rc.in new file mode 100755 index 0000000000..20093b9ca4 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.rc.in @@ -0,0 +1,72 @@ +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +#include "afxres.h" + +#undef APSTUDIO_READONLY_SYMBOLS + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + PRODUCTVERSION @GTKMM_MAJOR_VERSION@,@GTKMM_MINOR_VERSION@,@GTKMM_MICRO_VERSION@,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The gtkmm development team (see AUTHORS)" + VALUE "FileDescription", "The official C++ wrapper for pango" + VALUE "FileVersion", "@VERSION@" + VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)" + VALUE "OriginalFilename", "pangomm-1.4" + VALUE "ProductName", "gtkmm" + VALUE "ProductVersion", "@VERSION@" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // English (U.S.) resources + +#ifndef APSTUDIO_INVOKED + +#endif // not APSTUDIO_INVOKED diff --git a/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.vcproj b/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.vcproj new file mode 100755 index 0000000000..dd532b9fb0 --- /dev/null +++ b/libs/gtkmm2/MSVC_Net2003/pangomm/pangomm.vcproj @@ -0,0 +1,430 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/gtkmm2/Makefile.am b/libs/gtkmm2/Makefile.am new file mode 100644 index 0000000000..601f939d1a --- /dev/null +++ b/libs/gtkmm2/Makefile.am @@ -0,0 +1,69 @@ +if GTKMM_ATKMM_ENABLED + ATK_SUBDIR=atk +else + ATK_SUBDIR= +endif + +SUBDIRS = tools $(ATK_SUBDIR) pango gdk gtk @EXAMPLE_SUBDIR@ @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2003 +DIST_SUBDIRS = $(SUBDIRS) scripts + +EXTRA_DIST = build_shared/Makefile_build.am_fragment \ + build_shared/Makefile_build_gensrc.am_fragment \ + build_shared/Makefile_gensrc.am_fragment \ + build_shared/Makefile_conditional.am_fragment \ + CHANGES README.win32 README.SUN PORTING \ + autogen.sh + + +all-local: + @echo "*** Everything completed ***" + +dist-hook: + @echo; echo; \ + echo "**********************************************************"; \ + echo "* IMPORTANT NOTICE: *"; \ + echo "* *"; \ + echo "* Be sure you have done a complete build before running *"; \ + echo "* 'make dist' or 'make distcheck', because otherwise *"; \ + echo "* the tarball will _not_ contain the dependency rules *"; \ + echo "* generated by the compiler. *"; \ + echo "**********************************************************"; \ + echo; echo + + +include $(top_srcdir)/docs/Makefile_web.am_fragment + +doc_tarball_files = \ + docs/index.html docs/FAQ/html docs/images/*.gif \ + docs/reference/html \ + docs/tutorial/figures/*.png docs/tutorial/html + +# This doesn't work very well in a $(srcdir) != $(builddir) setup, +# but this target is for maintainer use only anyway. + +gtkmm-2-4-docs.tar.gz: + find examples -name '*.cc' -o -name '*.h' -o -name '*.xpm' -o -name '*.xml' | \ + tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@ + +# Upload documentation and examples: + +post-html-recursive: + list='docs examples'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \ + done + +post-html-local: gtkmm-2-4-docs.tar.gz + rsync $(rsync_args) gtkmm-2-4-docs.tar.gz $$USER@$(web_host):$(web_path_gtkmm) + +post-html: post-html-recursive post-html-local + +doc-clean-recursive: + (cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-clean) + +doc-clean: doc-clean-recursive + +doc-rebuild: + (cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-rebuild) + +.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild + diff --git a/libs/gtkmm2/Makefile.in b/libs/gtkmm2/Makefile.in new file mode 100644 index 0000000000..20c556f792 --- /dev/null +++ b/libs/gtkmm2/Makefile.in @@ -0,0 +1,736 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure \ + $(top_srcdir)/docs/Makefile_web.am_fragment AUTHORS COPYING \ + ChangeLog INSTALL NEWS +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@GTKMM_ATKMM_ENABLED_FALSE@ATK_SUBDIR = +@GTKMM_ATKMM_ENABLED_TRUE@ATK_SUBDIR = atk +SUBDIRS = tools $(ATK_SUBDIR) pango gdk gtk @EXAMPLE_SUBDIR@ @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2003 +DIST_SUBDIRS = $(SUBDIRS) scripts +EXTRA_DIST = build_shared/Makefile_build.am_fragment \ + build_shared/Makefile_build_gensrc.am_fragment \ + build_shared/Makefile_gensrc.am_fragment \ + build_shared/Makefile_conditional.am_fragment \ + CHANGES README.win32 README.SUN PORTING \ + autogen.sh + +web_host = gtkmm.org +web_path_gtkmm = /home/murrayc/gtkmm.org/docs/gtkmm-2.4/ +#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/gtkmm-2.4/ +web_path_docs = $(web_path_gtkmm)docs/ + +#--delete and --delete-after are causing +# " +# Invalid file index: 1768710413 (count=0) [receiver] +# rsync error: protocol incompatibility (code 2) at sender.c(156) +# " +# with sourceforge recently (May 2005). murrayc. +# +#rsync_args = -vz --rsh ssh --delete --delete-after +rsync_args = -vz --rsh ssh +gtkmm_docdir = $(datadir)/doc/gtkmm-2.4/docs +doc_tarball_files = \ + docs/index.html docs/FAQ/html docs/images/*.gif \ + docs/reference/html \ + docs/tutorial/figures/*.png docs/tutorial/html + +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/docs/Makefile_web.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile config.h all-local +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local am--refresh check check-am clean \ + clean-generic clean-libtool ctags ctags-recursive dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-shar dist-tarZ \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am + + +all-local: + @echo "*** Everything completed ***" + +dist-hook: + @echo; echo; \ + echo "**********************************************************"; \ + echo "* IMPORTANT NOTICE: *"; \ + echo "* *"; \ + echo "* Be sure you have done a complete build before running *"; \ + echo "* 'make dist' or 'make distcheck', because otherwise *"; \ + echo "* the tarball will _not_ contain the dependency rules *"; \ + echo "* generated by the compiler. *"; \ + echo "**********************************************************"; \ + echo; echo + +# This doesn't work very well in a $(srcdir) != $(builddir) setup, +# but this target is for maintainer use only anyway. + +gtkmm-2-4-docs.tar.gz: + find examples -name '*.cc' -o -name '*.h' -o -name '*.xpm' -o -name '*.xml' | \ + tar cf - --files-from - $(doc_tarball_files) | gzip -c --best >$@ + +# Upload documentation and examples: + +post-html-recursive: + list='docs examples'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \ + done + +post-html-local: gtkmm-2-4-docs.tar.gz + rsync $(rsync_args) gtkmm-2-4-docs.tar.gz $$USER@$(web_host):$(web_path_gtkmm) + +post-html: post-html-recursive post-html-local + +doc-clean-recursive: + (cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-clean) + +doc-clean: doc-clean-recursive + +doc-rebuild: + (cd docs && $(MAKE) $(AM_MAKEFLAGS) doc-rebuild) + +.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/NEWS b/libs/gtkmm2/NEWS new file mode 100644 index 0000000000..bf60461e53 --- /dev/null +++ b/libs/gtkmm2/NEWS @@ -0,0 +1,2530 @@ +2.12.3: + +* Documentation: Improved the devhelp file to + - show the full method name, including the class name. + - really jump to the method's anchor on the page. + (Jonathon Jongsma) Bug #488261 +* Build: Fix the win32 build. + (Yevgen Muntyan) + +2.12.2: + +* IconView: set_cursor(): Actually implement this. + (Murray Cumming) +* LinkButton: Correct the implementation of the + constructor that takes just the URI. Bug #492200 + (Marko Anastasov) +* Build: Fix the build on MacOS X. Bug #493057. + (Alberto Ruiz) + +2.12.1: + +* PrintOperation: Corrected a reference-counting problem that caused + crashes. + +2.12: + +Changes since gtkmm 2.10: + +Gtk: +* New classes: Builder, RecentAction, Tooltip, VolumeButton. +* Deprecated the Tooltips class. +* AboutDialog: Added set/get_program_name() and deprecated + set/get_name(). +* Action: Action: Added create_menu(). +* Calendar: Added a get_date() method using Glib::Date. +* CellLayout: Added get_cells(). +* CellRendererProgress: Added pulse, text-xalign, and + text-yalign properties. +* Entry: Added set_cursor_hadjustment(), get_cursor_hadjustment(). +* EntryCompletion: Added set_inline_selection() and + get_inline_selection(), and Added cursor_on_match signal. +* IconTheme: Added choose_icon(), list_contexts(). +* IconView: Added set_tooltip_item(), set_tooltip_cell(), + get_tooltip_context_path() and get_tooltip_context_iter(), + convert_widget_to_bin_window_coords() +* LinkButton: Added set_uri_hook() and unset_uri_hook(). +* MenuToolButton: Added set_arrow_tooltip_text() and + set_arrow_tooltip_markup(). +* Notebook: Added set/get_group() and deprecated set/get_group_id(). +* PageSetup: Added to_file(), to_key_file(). +* PaperSize: Added get_paper_sizes(), get_capabilities(). +* Printer: Added list_papers(). +* PrintSettings: Added to_file(), to_key_file(). +* Range: Added set_show_fill_level(), get_show_fill_level(), + set_restrict_to_fill_level(), get_restrict_to_fill_level(), + set_fill_level(), get_fill_level(). +* RecentAction: Added class. +* ScaleButton: Added class. +* StatusIcon: Added set_screen() and get_screen() and + popup_menu_at_position(). + Added popup and activate signals. +* Stock IDs: Added DISCARD, ORIENTATION_PORTRAIT, + ORIENTATION_LANDSCAPE, ORIENTATION_REVERSE_LANDSCAPE, + ORIENTATION_REVERSE_PORTRAIT, SELECT_ALL +* Style: Added attach() detach(). +* TextBuffer: Addded add_mark(), and cursor-position property. +* TextMark: Added constructor and create() method, though these + are usually created via TextBuffer. +* Toolbar: Added set_icon_size(), unset_icon_size(). +* TreeView: Added is_rubber_banding_active(), + convert_widget_to_tree_coords(), + convert_tree_to_widget_coords(), convert_widget_to_bin_window_coords(), + convert_bin_window_to_widget_coords(), convert_tree_to_bin_window_coords(), + convert_bin_window_to_tree_coords(), + set_tooltip_row(), set_tooltip_cell(), set_tooltip_column(), + get_tooltip_column(), get_tooltip_context_path() and + get_tooltip_context_iter(). +* Widget: Added keynav_failed(), error_bell(), + modify_cursor(), unset_cursor(), + set_has_tooltip(), get_has_tooltip(). +* Window: Added set_opacity(), get_opacity(), + set_default_icon_name(), set_accept_focus(), + get_accept_focus(), set_focus_on_map() and get_focus_on_map(). + +Gdk: +* Display: Added supports_shapes(), supports_input_shapes(), + supports_composite(). +* Pixbuf: + - Added constructors that do not take dest_x + and dest_y (which are ignored in this case). +* Screen: Added is_composited(), set_font_options(), + get_font_options(), set_resolution(), get_resolution(), + get_active_window(). +* Window: Added set_composited(), input_shape_combine_mask(), + input_shape_combine_region(), set_child_input_shapes(), + merge_child_input_shapes(), get_type_hint(), set_startup_id(), beep(), + set_opacity(). + +Pango: +* Color: Added to_string(). +* Context: Added set_base_gravity(), get_base_gravity(), + get_gravity(), set_gravity_hint(), get_gravity_hint(). +* FontDescription: Added set_gravity() and get_gravity(). +* FontFace: Added is_synthesized(). +* GlyphString: Added get_width(). +* Layout: Added is_wrapped(), is_ellipsized() and + get_unknown_glyphs_count(). + +Thanks to Marko Anastasov, Murray Cumming, Daniel Elstner, +Jonathon Jongsma, Johannes Schmid, and Kalle Vahlman. + +2.12.0: + +* RecentAction: Rearrange the constructor parameters, to match the other Action classes. + Added more default parameters. + +2.11.8: + +* Gdk::Cairo::set_source_color(), set_source_pixbuf(), set_source_pixmap(): + Deprecated the existing versions of these methods and added overloads that + take a const RefPtr& instead. + (Jonathan Jongsma) +* Deprecated Gdk::Cairo::rectangle(), replacing it with add_rectangle_to_path(). + and deprecated Gdk::Cairo::region(), replacing it with add_region_to_path(), + because these names are clearer. + (Jonathan Jongsma) +* Documentation: Tutorial: DrawingArea: Corrected a mention of + PixBuf to Pixbuf. Bug #465961 (Jonathan Jongsma) + +2.11.7: + +* Some build fixes for some compilers/setups. + (Daniel Elstner) +* Documentation markup change for future appearance + in library.gnome.org. (Jonathon Jongsma) + +2.11.6: + +Gdk: +* Pixbuf: + - Added constructors that do not take dest_x + and dest_y (which are ignored in this case). + - get_formats(): Corrected the reference counting. + +Pango: +* Color: Added to_string(). +* Context: Added set_base_gravity(), get_base_gravity(), + get_gravity(), set_gravity_hint(), get_gravity_hint(). +* FontDescription: Added set_gravity() and get_gravity(). +* FontFace: Added is_synthesized(). +* GlyphString: Added get_width(). +* Layout: Added is_wrapped(), is_ellipsized() and + get_unknown_glyphs_count(). + +Gtk: +* Builder: Removed get_type_from_name(). +* IconView: + - set_tooltip_item(), set_tooltip_cell(): + Use Tooltip only via a RefPtr. + (Murray Cumming) + - Added get_tooltip_context_path() + and get_tooltip_context_iter(). + (Marko Anastasov) +* LinkButton: Added set_uri_hook() and unset_uri_hook(). +* PrintJob: Added a const version of get_surface() +* PrintSettings: Corrected the typedef for SlotForeach - + the ustring&s should be const. I do not believe that anybody could + have been using this, so I think it is OK to change it. +* Tooltip: Added set_tip_area(). +* TreeView: + - Added convert_widget_to_tree_coords(), + convert_tree_to_widget_coords(), convert_widget_to_bin_window_coords(), + convert_bin_window_to_widget_coords(), convert_tree_to_bin_window_coords(), + convert_bin_window_to_tree_coords(), + set_tooltip_row(), set_tooltip_cell(), set_tooltip_column(), + get_tooltip_column(). + (Murray Cumming) + - Added get_tooltip_context_path() and get_tooltip_context_iter(). + (Marko Anastasov) +* Widget: Added keynav_failed(), error_bell(), + modify_cursor(), unset_cursor(), + set_has_tooltip(), get_has_tooltip(). + (Murray Cumming) +* Documentation: + - Corrected lots of API reference documentation. + (Murray Cumming, Marko Anastasov, Jonathan Jongsma) + - Added a Tooltip example. (Marko Anastasov) + +2.11.5: + +Pango: +* Color: Added to_string(). +* Context: Added set_base_gravity(), get_base_gravity(), + get_gravity(), set_gravity_hint(), get_gravity_hint(). +* FontDescription: Added set_gravity() and get_gravity(). +* FontFace: Added is_synthesized(). +* GlyphString: Added get_width(). +* Layout: Added is_wrapped(), is_ellipsized() and + get_unknown_glyphs_count(). + + +Gdk: +* Screen: Added is_composited(), set_font_options(), + get_font_options(), set_resolution(), get_resolution(), + get_active_window(). + +Gtk: +* IconView: + Added set_tooltip_item(), set_tooltip_cell(), + convert_widget_to_bin_window_coords(). +* MenuToolButton.hg: Added set_arrow_tooltip_text() and + set_arrow_tooltip_markup(). +* StatusIcon: Added set_screen() and get_screen(). + (Murray Cumming) +* TextBuffer: Addded cursor-position property. + (Marko Anastasov) +* TreeVIew: Added is_rubber_banding_active() + (Murray Cumming) + +2.11.4: + +Gtk: + * Added Builder, which will eventually replace use of libglade. + (Murray Cumming) + * Added Tooltip, which replaces the deprecated Tooltips class. + (Marko Anastasov) + * RecentAction: Added constructor and create() method and an example. + (Murray Cumming) + * Documentation: Added lots of class overview documentation. + (Johannes Schimd) + +2.11.3: + +Gtk: +* Action: Added create_menu(). +* CellRendererProgress: Added pulse, text-xalign, and + text-yalign properties. + (Murray Cumming) +* DragContext::get_targets(), SelectionData::get_targets(): + Use the correct intermediate return type, to correct memory + management problems. This technically breaks ABI of these two + functions, but we believe that it was impossible to use them before, + so no applications should be broken by this improvement. + (Murray Cummng, Daniel Elstner) Bug #399403 (Yannick Guesnet) +* EntryCompletion: Added set_inline_selection() and + get_inline_selection(). + Added cursor_on_match signal, though without a default signal + handlers, to preserve ABI. + Added inline-selection property. +* Notebook: Added const versions of get_n_pages() and page_num(), + deprecating the non-const methods. Bug #442284 (Tomasz Ostrowski). +* Printer: Added list_papers(). +* Range: Added set_show_fill_level(), get_show_fill_level(), + set_restrict_to_fill_level(), get_restrict_to_fill_level(), + set_fill_level(), get_fill_level(). + Added show-fill-level, restrict-to-fill-level, and + fill-level properties. +* RecentAction: Added class. +* ScaleButton: Added class. +* VolumeButton: Added class. +* Stock IDs: Added DISCARD, ORIENTATION_PORTRAIT, + ORIENTATION_LANDSCAPE, ORIENTATION_REVERSE_LANDSCAPE, + ORIENTATION_REVERSE_PORTRAIT, SELECT_ALL + (Murray Cumming) + +* Build fix when disabling properties. + (Kalle Vahlman) +* Documentation: + - Improved gmmproc chapter. + (Murray Cumming) + - Improved internationalization chapter. + (Jonathan Jongsma) + +2.11.2: + +Gdk: +* Display: Added supports_shapes(), supports_input_shapes(), + supports_composite(). +* Window: Added set_composited(), input_shape_combine_mask(), + input_shape_combine_region(), set_child_input_shapes(), + merge_child_input_shapes(), get_type_hint(), set_startup_id(), beep(), + set_opacity(). + +Gtk: +* AboutDialog: Added set/get_program_name() and deprecated + set/get_name(). + (Murray Cumming) +* CellLayout: Added get_cells(). +* Entry: Added set_cursor_hadjustment(), get_cursor_hadjustment(). +* IconTheme: Added choose_icon(), list_contexts(). +* Notebook: Added set/get_group() and deprecated set/get_group_id(). +* PageSetup: Added to_file(), to_key_file(). +* PaperSize: Added get_paper_sizes(). + get_capabilities(). +* PrintSettings: Added to_file(), to_key_file(). + (Murray Cumming) +* TextBuffer: Added add_mark(). +* TextMark.ccg: Added constructor and create() method, though these + are usually created via TextBuffer. +* Toolbar: Added set_icon_size(), unset_icon_size(). +* Window: + - Added set_opacity(), get_opacity(). + - Added transient_for, and opacity properties. + (Murray Cumming) + +Documentation: +* Fixed some wrong mentions of g_free(). + (Jonathon Jongsma) + +2.11.1: + +Gtk: +* Calendar: Added a get_date() method using Glib::Date. + (Johannes Schmid) Bug #350584 +* StatusIcon: + - Added popup and activate signals + (without default signal handlers, to preserve ABI) though we + still cannot get any answer from the GTK+ maintainers about whether + these are public API. + - Added popup_menu_at_position(). + (Murray Cumming) +* Style: Added attach() detach(). + (Jonathan Jongsma) Bug #351336 +* Window: + - Added set_default_icon_name() + (Johannes Schmid) Bug #364395 (Yuriy Syrota) + - Added set_accept_focus(), get_accept_focus(), + set_focus_on_map() and get_focus_on_map(). + (Murray Cumming) Bug #421936 + +* Documentation: + - Book: Improvements to allow easier pdf generation. + (Jonathan Jongsma) + - Book: More help with headers and linking, also for libglademm. + (Murray Cumming) + - Examples: custom/custom_widget/: Now uses cairo instead of the + GDK drawing functions. + (Jonathan Jongsma) + +2.10.10: + +* RadioAction: Correct a reference-counting error in the "changed" signal. + (Armin Burgmeier, Openismus) + Bug #350734 (Johnathon Jongsma, "pjdavis" Paul Davis) +* RecentManager: Allow Gtk::RecentManager::Data to be instantiated, for use with + the full version of add_item(). (Armin Burgmeier, Openismus) + Bug #388086 (Grant Patterson) +* Menu: Fix memory problems during destruction by handling attached widgets as + we already handle child widgets. (Johannes Schmid, Openismus) + Bug #339791 ("pjdavis" Paul Davis, Andrew E. Makeev) +* Correctly ifdef-out initialization of deprecated classes. + (Johannes Schmid, Openismus) +* Build: Cope with newer m4 versions. (Yselkowitz) +* Documentation: + FAQ: Emphasize that libglademm is preferred to glademm. (Marko Anastasov) + Bug #429043. + +2.10.9: + +* Depend on glibmm 2.10.9, which has some slight performance optimization for + default signal handlers and vfuncs. + (Murray Cumming, openismus) +* TreeView: Fix memory leak in get_cursor(). + Bug #417539 (Andrew E. Makeev) +* IconTheme::get_example_icon_name() documentation fix. + (Jonathon Jongsma) + +2.10.8: + +* ActionGroup::add(): Avoid a problem on 64-bit systems due to 0/NULL confusion. + (Daniel Elstner) +* Documentation: + - Updated the Internationalization chapter. (Marko Anastasov) + - Added appendix about Visual Studio 2005. (Alan Ott, bug #409102) + +2.10.7: + +* Main: Cleanup data structures in the destructor, preventing leaks, and allowing + a second instantiation. (Bug #383340 from Christopher Raine). +* Build: Fix build with SUN Workshop 11 + (Marko Anastasov, Bug #395572 from Tim Mooney) +* Documentation: + - glade/libglade tutorial section: Clarification. + (Martin Nordholts, Bug #387708) + - Added SizeGroup documentation. + (Murray Cumming) + +2.10.6: + +* Gdk::Drawable::create_cairo_context(), + Gtk::PrintContext::get_cairo_context(), + Gtk::PrintJob::get_surface(): Fix memory leak caused by doing + an extra reference. + Bug #362181 from austinf. + +2.10.5: + +* UIManager: Fix crash when built without exceptions support. + (Johannes Schmid) +* Style: lookup_icon_set(): Memory-management correction. + Bug #374094 (patch from Nate Nielsen) +* Build: + - Windows: Do not check for gtk+-unix-print-2.0 on as it is not + always included in GTK installers and/or binary archives (like in Tor's binaries). + Bug #371882 from Alexis Wilke. + (Cedric Gustin) + +2.10.4: + +* Build: + - Omit the atkmm dependency from the gtkmm pkg-config .pc file + when atkmm was optionally disabled. (Rémi Cardona) + Bug #366930 from John N. Laliberte. + - Added --enable-api-maemo-extensions configure option, + to optionally provide C++ wrappers for the additional GtkTextBuffer + functions in the Maemo version of GTK+. + (Johannes Schmid, Murray Cumming) + +* Documentation: + - Drawable: Add comment paragraph about using cairo. + (Ralf Stephan) + +2.10.3: + +* Adjustment: Preventing the value from being ignored. + Bug #369335 from Daniel Holbach, via Vincent Levesque, + with help from Paul Davis. +* Build: + - ListViewText: + Fix an odd build problem with gcc 3.3.6. + Bug #352226. (Thomas Zajic) +* Documentation: + - Explain the optional (at build-time) API for + reduced resources environments. + - Correct the links to the Memory Management and libglademm chapters. + - Drawable::get_image(), Container::remove(), Widget::add_mnemonic_label: + avoid mentioning a functions that do not exist in gtkmm. + Bug #358268 from Evgeny Rippi, and Nickolai Dobrynin. + +2.10.2: + +* Added --enable-atk=no option, to disable the build and use + of the atkmm API, for use in embedded environments. + (Johannes Schimd, Murray Cuming, Openismus) +* Documentation: + - Book: Added Plug and Socket chapter to book, with example. + (Jonathon Jongsma) + +2.10.1: + +* Button: fix typo in get_image_position() +* Added MSVC support for 2.10 + +2.10.0: + +Changes since 2.8: + +gtkmm now depends on cairomm. + +* AccelMap: Added lookup_entry() (Paul Davis) +* Button: Added get/set_image_position(). +* Added CellRendererAccel (Murray Cumming) +* Added CellRendererSpin (Marko Anastasov) +* CellRendererToggle: Added "indicator-size" property. +* Clipboard: Added request_rich_text(), wait_for_rich_text(), + and wait_rich_text_is_available(). +* Entry: + - Added get/set_inner_border(). + - Added xalign and truncate-multiline properties. +* FileChooserButton: Added set/get_focus_on_click() +* MessageDialog: Added properties. +* Menu: Add attach_to_widget() overload without a destroy callback. +* Label: Added get/set_line_wrap_mode() and property. +* Added LinkButton. +* Added ListViewText very simple text-based convenience class for TextView. + (J. Baltasar García Perez-Schofield) +* MenuShell: Added get/set_take_focus() and property. +* MessageDialog: Added set_image() and property. +* Notebook: + - Added page_reordered, page_removed, and + page_added signals. + - Added set_group_id(), get_group_id(), + get_tab_reorderable(), set_tab_reorderable(), + get_tab_detachable(), set_tab_detachable(). +* Added Printing support, via PrintOperation, PrintContext, PrintJob, PrintSettings, + Printer, PageSetup. (Marko Anastasov, Murray Cumming) +* Added Recent Files support, via RecentChooser, RecentChooserWidget, RecentChooserMenu, + RecentChooserDialog, RecentInfo, RecentManager + (Armin Burgmeier, Marko Anastasov, Jonathon Jongsma) +* RadioAction: Added set_current_value(). +* Range: Added get/set_lower_stepper_sensitivity(), + get/set_upper_stepper_sensitivity() and properties. +* SectionData: Added Added targets_include_uri. +* SizeGroup: Added get_widgets(). +* Style: + - Added overload set_bg_pixmap() that takes const Pixmap. + (Michael Hofmann) + - Added Added lookup_color(). +* SelectionData: Added targets_include_rich_text(). +* SizeGroup: Added get/set_ignore_hidden(). +* SpinButton: Added "wrapped" signal, without a default signal handler, to + preserve ABI. (Murray Cumming) +* ToggleButton: Added constructor that takes a stock item. +* TreeView: + - Added get/set_rubber_banding(), + get/set_grid_lines(), get/set_enable_tree_lines(), + get_search_entry(), set_search_position_func(), + get_headers_clickable(). + - Added properties for show-expanders, level-indentation, + rubber-banding, enable-grid-lines, and enable-tree-lines. + (Murray Cumming) +* Widget: + - Added composited_changed signal. (Murray Cumming) + - Added input_shape_combine_mask(). (Marko Anastasov) + - Added is_composited(), input_shape_combine_mask(), + unset_input_shape_combine_mask(), and the "composited_changed" signal. + (Jonathon Jongsma) + - Added get_action(). + - Made map() public, because custom containers sometimes + (e.g. GtkNotebook) need to call it on their child widgets, + though we are not sure when. +* Window: Added get_group(), and get/set_deletable(), + set_urgency_hint() + (Murray Cumming) + +Pango: +* AttrList: Added operator bool. +* Context: Added get_matrix(), update_from_cairo_context(), + set_cairo_font_options(), set_cairo_font_options(), get_font_options(), + set_resolution(), get_resolution(). +* Font: Added describe_with_absolute_size(), get_font_map(). +* FontDescription: Added set_absolute_size(), get_size_is_absolute(). +* Layout: Added get_font_description(), index_to_line_x(), + create(Cairo::Context), update_from_cairo_context(), + add_to_cairo_context(). +* LayoutLine: Added show_in_cairo_context(), add_to_cairo_context(). + (Murray Cumming) +* Renderer: Added get_matrix(). +(Murray Cumming) + +Gdk: +* GC: Added set_clip_rectangle() overload that takes const argument. + (Michael J M Thompson) +* Added static functions for using Cairo, in general.h. + (Murray Cumming) + +Documentation: +* Stylesheet improvements, to improve the appearance. (Jonathon Jongsma) +* Printing Chapter, with example (Marko Anastasov) +* Recent Files chapter, with example (Armin Burgmeier, Jonathon Jongsma) +* "Wrapping C libraries" appendix (Murray Cumming) +* DrawingArea chapter updated for Cairo. (Jonathan Jongsma) +* Added ComboBox chapter and removed Combo section. (Murray Cumming) +* Improved RadioButton example. (Pierre Thierry) +* Added an example that uses events_pending() + to update the UI (Gareth Foster, Murray Cumming) +* Added IconView example. (R. Douglas Barbieri) + +Win32 build: Plug and Socket added. (Cedric Gustin) + +Other bug fixes from Paul Davis, Gezim Hoxha. + + +2.9.10: + +Gtk: +* FontButton: Fix the constructor that takes a font_name. +(Armin Burgmeier) +* PrintOperationPreview: Fix some reference-counting issues to +fix a crash. (Marko Anastasov) +* RecentManager: Fix get_items() memory management. + +Documentation: +* Recent Files chapter: Started this chapter, with a screenshot. + (Jonathon Jongsma) + +Examples: +* printing/advanced: Various bugfixing, though it might + still have problems on amd64. Do test. See bug #347857. + (Marko Anastasov, Murray Cumming) +* recent files: Actually show a dialog, and add _mnemonics to + menu items. + (Jonathon Jongsma) + +2.9.9: + +Gtk: +* PrintOperation: get_print_settings(): Ref the return to avoid a crash. + (Marko Anastasov) +* RecentManager: Change add_fullI to add_item(), overloading according to the + parameters. (Jonathon Jongsma) +* SpinButton: Added "wrapped" signal, without a default signal handler, to + preserve ABI. (Murray Cumming) +* Widget: + - Correct the new composited_changed signal to avoid breaking ABI. + (Murray Cumming) + Bug #348241 from Daniel Holbach. + - Fixed a typo so that input_shape_combine_mask() is really wrapped. + (Marko Anastasov) +* Build: Build with the new glibmm --enable-api-default-signal-handlers=no + option for reduced-resources embedded devices. (Murray Cumming) + +Documentation: +* Printing examples: Use the new gdkmm cairo methods instead of the + C functions. (Marko Anastasov) + +2.9.8: + +Gtk: +* Printing API mostly finished. (Marko Anastasov) +* TextBuffer: Added register_serialize_tagset(), unregister_serialize_format(), + unregister_deserialize_format(), set_can_create_tags(), get_can_create_tags(), + get_serialize_formats(), get_deserialize_formats(). There's more to do. + (Murray Cumming) +* ToggleButton: Added constructor that takes a stock item. +* Widget: Added is_composited(), input_shape_combine_mask(), + unset_input_shape_combine_mask(), and the "composited_changed" signal. + (Jonathon Jongsma) + +Documentation: +* Added Printing chapter and printing example. (Marko Anastasov) +* Added "Wrapping C libraries" appendix. (Murray Cumming) +* Style updated to match the new website. (Jonathon Jongsma) + +2.9.7: + +Gtk: +* Notebook: Added page_reordered, page_removed, and + page_added signals. +* PrintContext: Renamed the const get_cairo() + to get_cairo_context(), to match the original. +* PrintOperation: run(): Added a default value. + (Marko Anastasov) +* SelectionData: Added targets_include_rich_text(). +* SizeGroup: Added get/set_ignore_hidden(). +* StatusIcon: Added size_changed signal. + (Murray Cumming) + +Documentation: +* Add links to gtkmm_hello and gnomemm_hello programs. +* Fixed the sentence explaining disconnect() in the Timeouts chapter. +* Typo correction in the Clipboard chapter + (Gezim Hoxha) + +2.9.6: + +Gtk: +* Label: Added get/set_line_wrap_mode() and property. +* MenuShell: Added get/set_take_focus() and property. +* MessageDialog: Added set_image() and property. +* StatusIcon: Added get_geometry(). +* TreeView: Added get/set_rubber_banding(), + get/set_grid_lines(), get/set_enable_tree_lines(). + Added properties for show-expanders, level-indentation, + rubber-banding, enable-grid-lines, and enable-tree-lines. + (Murray Cumming) +* PrintJob: send_job(): No longer throws an exception. +* PrintUnixDialog: Added add_custom_tab() overload that takes a ustring. +* Printer: Added get_job_count(), and enumerate_printers(), and others. +* Printsettings: + - Put the standard settings in a member class so they can be + used as Gtk::PrintSettings::Keys::SOMETHING. + - Remove get/set_print_to_file(). +* PrintOperation: Added a version of run() without the Window parameter. +* PrintOperationPreview: New class. + (Most printing stuff: Marko Anastasov) + +2.9.5: + +Gtk: +* Assistant: Added update_buttons_state(). +* Button: Added get/set_image_position(). +* Clipboard: Added request_rich_text(), wait_for_rich_text(), + and wait_rich_text_is_available(). +* Entry: Added get/set_inner_border(). +* Notebook: Added set_group_id(), get_group_id(), + get_tab_reorderable(), set_tab_reorderable(), + get_tab_detachable(), set_tab_detachable(). + +* PrintContext: Added set_cairo_context(). +* Printoperation: + - run(): Added PrintOperationAction parameter. + - Removed set_show_dialog(), set_pdf_target(), + set_track_print_status(), run_async(). + - Added set_export_filename(), set_track_print_status(), + set_show_progress(), set_allow_async(), set_custom_tab_label(). +* Fixed warnings (Elijah Newren, Jonathon Jongsma) + +Pango: +* Context: Added get_matrix(). +* Font: Added describe_with_absolute_size(), get_font_map(). +* FontDescription: Added set_absolute_size(), get_size_is_absolute(). +* Layout: Added get_font_description(), index_to_line_x(). +* Renderer: Added get_matrix(). + + +2.9.4: + +Gtk: +* PrintContext: + - Added set_track_print_status() and cancel(), paginate signal. + (Marko Anastasov) + - get_cairo() renamed to get_cairo_context(), + - get_fontmap() renamed to get_pango_fontmap(), + - create_context() renamed to create_pango_context(), + - create_layout() renamed to create_pango_layout(). + (Murray Cumming) +* PrintJob: + - Added set/get_track_print_status(). + (Marko Anastasov) + +Pango: +* Added CairoFontMap. (Might be removed later) +* Context: Added update_from_cairo_context(), + set_cairo_font_options(), set_cairo_font_options(), get_font_options(), + set_resolution(), get_resolution(). +* Layout: Added create(Cairo::Context), update_from_cairo_context(), + add_to_cairo_context(). +* LayoutLine: Added show_in_cairo_context(), add_to_cairo_context(). + (Murray Cumming) + +2.9.3: + +* Fixed regressions from 2.9.1 and 2.8.6: + - Regenerated with latest glibmm to fix several empty methods. + - ActionGroup:add(): Fix crash in alternate property get. + - Gdk::PixbufLoader: Correct the vfunc sequence to avoid the ABI break. + (Murray Cumming) +* Added Printer, PrintJob, PageSetupUnixDialog, PrintUnixDialog + (Marko Anastasov) +* Table: Fix crash in Table_Helpers::TableList.erase(). Bug #341962 + (Paul Davis) +* Documentation: + - Fix stylesheet installation. + - Fix some links + (Jonathon Jongsma) + +2.9.2: + +* Fixed a typo to fix the build when not disabling exceptions. + +2.9.1: + +Gtk: +* Depends on cairomm. +* gtkmm.h: Include menutoolbutton.h and tearoffmenuitem.h. + (Michael J M Thomson) +* Added ListViewText very simple text-based convenience class for TextView. + (J. Baltasar García Perez-Schofield) +* New classes: + - Assistant, CellRendererAccel, LinkButton, StatusIcon. + (Murray Cumming, Armin Burgmeier) + - CellRendererSpin (Marko Anastasov) + - PageSetup, PaperSize, PrintContext, PrintOperation, PrintSettings + (Marko Anastasov) + - RecentChooser, RecentChooserWidget, RecentChooserMenu, + RecentChooserDialog. (Armin Burgmeier) + - RecentInfo, RecentManager (Marko Anastasov) +* AccelMap: Added lookup_entry() (Paul Davis) +* CellRendererToggle: Added "indicator-size" property. +* Entry: Added xalign and truncate-multiline properties. +* FileChooserButton: Added set/get_focus_on_click() +* MessageDialog: Added properties. +* Menu: Add attach_to_widget() overload without a destroy callback. +* RadioAction: Added set_current_value(). +* Range: Added get/set_lower_stepper_sensitivity(), + get/set_upper_stepper_sensitivity() and properties. +* SectionData: Added Added targets_include_uri. +* SizeGroup: Added get_widgets(). +* Style: Added overload set_bg_pixmap() that takes const Pixmap. + (Michael Hofmann) +* TextBuffer: Added get_has_selection() and + property. Added text property. +* TextBuffer: Added const overloads of get_text() and get_slice(). +* TreeModel: Added rows_reordered() overload without the iter. +* TreeView: get_search_entry(), set_search_position_func(), + get_headers_clickable(). +* Style: Added Added lookup_color(). +* Widget: + - Added get_action(). + - Made map() public, because custom containers sometimes + (e.g. GtkNotebook) need to call it on their child widgets, + though we are not sure when. +* Window: Added get_group(), and get/set_deletable(), + set_urgency_hint() + (Murray Cumming) +* Win32 build: Plug and Socket added. (Cedric Gustin) +* Fix the build when using --enable-api-properties, --enable-api-vfuncs, or + --enable-api-exceptions when configuring glibmm. + When using these, the API, and any API generated by gmmproc, will be + changed. This allows users of embedded platforms to reduce the code size of *mm + libraries and *mm-using applications, at the small cost of losing some rarely-used + API. Alternatives exist for that API, as show in the examples. + +Gdk: +* GC: Added set_clip_rectangle() overload that takes const argument. + (Michael J M Thompson) +* Added static functions for using Cairo, in general.h. + (Murray Cumming) + +Pango: +* AttrList: Added operator bool. + +Documentation: +* Book: + - DrawingArea: Updated for Cairo. + - HTML appearance greatly improved. + - Updated screenshots. + (Jonathan Jongsma) + - Added ComboBox chapter and removed + Combo section. (Murray Cumming) + - Improved RadioButton example. (Pierre Thierry) +* Reference: + - Added RadioButton::get/set/reset_group() + documentation. + - Add documentation for manage(). + (Murray Cumming) + - Improved Box documentation. (Pierre Thierry) +* Examples: + - Added an example that uses events_pending() + to update the UI (Gareth Foster, Murray Cumming) + - Added IconView example. (R. Douglas Barbieri) + +2.8.1: + +* Build: Check for GTK+ 2.8. +* ScrolledWindow: get_*scrollbar_visible(): + get_hscrollbar_visible() returned + vscrollbar_visible() and vice-versa. Fixed. + Bug #317309 (Bartek Kostrzewa) +* UIManager: get_action_groups(): + Memory management fix. + Bug #31865 (Colin Law) +* Fix SUN Solaris Forte build problem. + Bug #314283 (Felipe Zipitria) +* Documentation corrections. + Bug #311176 (Marco Scholten) + +2.8.0: + +API additions since 2.6: + +Gtk: +* AboutDialog: Added set/get_wrap_license() and property. +* CellRenderer: Added "sensitive" property. +* ComboBoxText, ComboBoxEntryText: + - Deprecated clear() in favour of new clear_items() method, + because clear() exists in the base CellLayout class and is + very different. + - Added remove_text() to remove items one at a time. +* Dialog: Added get_response_for_widget(). +* EntryCompletion: Added properties, get/set_popup_set_width(), + get/set_popup_single_width(). +* FileChooser: Added get/set_do_overwrite_confirmation( +* Iconview: Added get_item_at_pos(), get_visible_range(), get/set_cursor(), + scroll_to_path(). +* TreeRowReference: Added get_model(). +* TreeView: + - Added unset_model(). + - Added const versions of get_path_at_pos(), + get_cell_area(), get_background_area(), get_visible_rect(), + widget_to_tree_coords(), tree_to_widget_coords(). + - Added get_visible_range(). +* TreeView::Column: Added queue_resize(). +* Sizegroup: Added ignore_hidden property. +* Stock: Added FULLSCREEN, LEAVE_FULLSCREEN, and INFO stock items. +* Widget: Added drag_source_set_icon(const Glib::ustring& icon_name). +* Window: + - Added urgency_hint property, and get/set_urgency_hint(). + Added present(timestamp) overload. + +Gdk: +* Colormap: Deprecated alloc_colors() and free_colors(). + Add free_color() for use with alloc_color(). +* Cursor: Added get_image() and a Cursor(name) constructor. +* DragContext:Added set_icon(const Glib::ustring& name). +* Pixbuf: Added a save_to_buffer() overload without the options + parameters. +* Window: Added move_region(). + +(Murray Cumming, Jonathon (Jongsma), Ishmal, Daniel Glöckner, Alexander Nedotsukov, Philip Langdale, The Written Word) + +2.7.4: + +Gtk: +* Generated properties accessors. + (Murray Cumming) +* Settings::get_default(): Do not generate + a second wrapper. (Regis Duchesne) +* TreeView: Added unset_model(). +* SUN Forte and Tru64 build fixes. + (The Written Word.) +* Documentation fixes. (Jonathon Jongsma) + +2.7.3: + +Gtk: +* FileChooser: Added get/set_do_overwrite_confirmation(). +* TreeRowReference: Added get_model(). +* TreeView: Added const versions of get_path_at_pos(), + get_cell_area(), get_background_area(), get_visible_rect(), + widget_to_tree_coords(), tree_to_widget_coords(). + Added get_visible_range(). +* TreeView::Column: Added queue_resize(). +Gdk: +* PixbufLoader:create_with_type(): Really return the + created GdkPixbufLoader. +Win32 build: +* Provide an extra hint to work around a DLL export/import bug + with MSVC++ and TreeViewColumn (Ishmal) + + +2.7.2: + +Build fix: Removed an extra; that caused a warning. + +Gdk: +* Pixbuf: Added a save_to_buffer() overload without the options + parameters. + +2.7.1: + +Gdk: +* Colormap: Deprecated alloc_colors() and free_colors(). + Add free_color() for use with alloc_color(). +* Cursor: Added get_image() and a Cursor(name) constructor. +* DragContext:Added set_icon(const Glib::ustring& name). +* Window: Added move_region(). + +Gtk: +* AboutDialog: Added set/get_wrap_license() and property. +* CellRenderer: Added "sensitive" property. +* ComboBoxText, ComboBoxEntryText: + - Deprecated clear() in favour of new clear_items() method, + because clear() exists in the base CellLayout class and is + very different. + - Added remove_text() to remove items one at a time. +* Dialog: Added get_response_for_widget(). +* EntryCompletion: Added properties, get/set_popup_set_width(), + get/set_popup_single_width(). +* Iconview: Added get_item_at_pos(), get_visible_range(), get/set_cursor(), + scroll_to_path(). +* Sizegroup: Added ignore_hidden property. +* Stock: Added FULLSCREEN, LEAVE_FULLSCREEN, and INFO stock items. +* Widget: Added drag_source_set_icon(const Glib::ustring& icon_name). +* Window: Added urgency_hint property, and get/set_urgency_hint(). + Added present(timestamp) overload. + + +gtkmm 2.7 wraps new API in GTK+ 2.7, and is API/ABI-compatibile with gtkmm 2.4 and 2.6. +The new API is unstable, until this become the API/ABI-stable gtkmm 2.8 when +GTK+ 2.7 becomes the API-stable GTK+ 2.8. + +2.6.1: + +* CellRenderer: Prevent an infinite loop. + (Murray Cumming) +* MSVC++ .Net 2003 build fixes. (Cedric Gustin) +* Documentation: + - Hide deprecated widgets from the list of widgets. + (Murray Cumming) + - Correct the description of the IO input example. + (Claudio Saavedra) + + +2.6.0: + +gtkmm 2.6 wraps new API in GTK+ 2.6, and is API/ABI-compatibile with gtkmm 2.4. + +Changes compared to gtkmm 2.4.x: + +Gtk: +* New widgets: AboutDialog, CellRendererCombo, + CellRendererProgress, CellView, FileChooserButton, IconView, + MenuToolButton +* Action: Added get_accel_path(), set_visible(). +* ActionGroup: Added translate_string(). +* Button: Added set/get_image(). +* CellRenderer: + - Added editing_started signal. + - Added stop_editing() which replaces the + now-deprecated editing_cancelled() +* CellRendererText: Added language, ellipsize, and + ellipsize-set properties. +* Clipboard: +* - Added set_image(), wait_is_image_available(), + wait_for_image(), request_image(), wait_is_target_available(), + set_can_store(), and store(). +* ComboBox: + - Added get_wrap_width(), get_row_span_column(), + get_column_span_column(), get_add_tearoffs(), set_add_tearoffs(), + get_focus_on_click(), set_focus_on_click(), + get_popup_accessible(), unset_row_separator_func(). +* ComboBoxEntry: Added get_entry(). +* ComboBoxText: Added set_active_text(), clear(). +* Dialog: + - Added set_secondary_text() for HIG-compliant dialogs. + - Added set_alternative_button_order(). +* Entry: Added layout_index_to_text_index() and + text_index_to_layout_index(). +* EntryCompletion: Added insert_prefix(), set_inline_completion(), + get_inline_completion(), set_popup_completion(), + get_popup_completion(), get_text_column() +* FileChooser: + - Added FileChooserError exception class. + - Added get/set_show_hidden(). +* FileChooserButton: Added get/set_width_chars(). +* FileFilter: Added add_pixbuf_formats(). +* IconTheme: + - Added get_icon_sizes(). + - Added IconThemeError exception class. +* Image: Added set_from_icon_name(), get/set_pixel_size(), + get_icon_name(). +* Label: Added get/set_max_chars_width(), set/get_single_line_mode(), + get/set_width_chars(), get/set_ellipsize(). +* Main: Added Main constructor that takes a Glib:: OptionContext, + and add_gtk_option_group(option_context). +* MessageDialog: Added set_secondary_text(). +* PixbufLoader: Added size_prepared signal. +* Plug: Added default constructor. +* ProgressBar: Added set/get_ellipsize(). +* SelectionData: Added targets_include_image(), get/set_pixbuf(), + and get/set_uris(). +* Scale: Now works with libglademm. +* Style: Added create() method. +* TextView: Added get_iter_at_position(). +* TreeSortable: Added DEFAULT_UNSORTED_COLUMN_ID constant. +* TreeView: Added get/set_fixed_height_mode(), get/set_hover_selection(), + get/set_hover_expand(), +* TreeModel::itereator: Add forward_search() and backward_search() + overloads without the limit argument. +* IconInfo: Added operator bool(), needed to check + the result of IconTheme::lookup_icon(). +* Label: Added get/set_angle(). +* TreeView: Added append_column_numeric(), and + append_column_numeric_editable(). +* Widget: Made set_parent(), and unparent() public instead + of protected. Added a size_request() overload which is const + and returns a value. +* Window: Added drag_dest_add_text_targets(), + drag_dest_add_uri_targets(), drag_dest_add_image_targets(), + drag_source_add_text_targets(), drag_source_add_uri_targets(), + and drag_source_add_image_targets(). +* New Stock items. +* Documentation: + - Extra reference documentation. + - Properties are now documented. + +Gdk: +* Display: Added supports_selection_notification(), + request_selection_notification(), supports_clipboard_persistance(), + store_clipboard(). +* Pixbuf: + - Added rotate_simple(), flip(), save_to_buffer(). + - Added create_from_file() overload that takes + height and width. +* PixbufFormat: Added is_scalable(), is_disabled(), + set_disabled(), get_license(). +* Window: Added enable_synchronized_configure(), + configure_finished(), set_focus_on_map(). + +Pango: +* New classes: Renderer +* Color: Added operator bool(). +* Context: Added get/set_matrix(), get_font_map(). +* FontMetrics: Added get_underline_position(), + get_underline_thickness(), get_strikethrough_position(), + get_strikethrough_thickness(). +* Layout: Added get/set_ellipsize(). + +Atk: +* Relation: Added add_target(). +* RelationSet.hg: add_relation_by_type(). +* Text: Added get_range_extents(), get_bounded_ranges(). + +gtkmm 2.6 is the result of hard work from the following developers: +Murray Cumming, Bryan Forbes, and Albert Chin, Cedric Gustin, Roger Leigh, Ronald Lembcke, Gene Ruebsamen, Claudio Saavedra, Marco Scholten, Roel Vanhout, Chris Vine. + + +2.5.7: + +* Gdk::DragContext: Avoid infinite loop. (Ronald Lembcke) +* Gtk::TargetList: Fix typo to ctually define this. (Ronald Lembcke). +* Examples now build with the IRIX MipsPro, and AIX compilers. +* Check for the correct atk version in configure. + (Murray Cumming) +* Documentation: + - Properties are now documented, using the text from the + GTK+ documentation. + - Added MessageDialog documentation. + - Added CellRendererText::edited() documentation. (Antonio Coralles) + - examples: book/treeview/editable_cells/: + Demonstrated data-entry validation. + (Murray Cumming) + - +2.5.6: + +* Now builds with the following compilers, in addition to +the existing GNU g++, and Intel compilers: +- SUN Forte CC 5.5 +- IBM AIX xlC v7 +- Tru64 C++ V6.5-042 +- IRIX MIPSpro 7.4.2m + (Older versions of all these compilers might also work.) + (Murray Cumming, www.thewrittenword.com) +* Now builds with MSVC++ .Net 2003 (gtkmm 2.4 already did). + (Cedric Gustin) + +Gtk: +* Plug: Added default constructor. (Bryan Forbes) + +Documentation: +- examples/book/custom/custom_widget/: + Now it works. (Marco Scholten) + +2.5.5: + +Gtk: +* Remove default signal handlers for new signals in 2.6, + because adding virtual methods to existing classes would + break ABI. (Murray Cumming, Bryan Forbes) +* Stock: Wrapped several new stock items. (Bryan Forbes) +* AboutDialog: Added logo_icon_name property. (Murray Cumming) +* Clipboard: Added set_can_store() overload that takes no + arguments. (Murray Cumming) +* ComboBox: Added unset_row_separator_func(). (Murray Cumming) +* FileChooserDialog: + - Inherit from FileChooser interface. (Murray Cumming) + - Added constructors which allow specifying backend. (Bryan Forbes) +* IconView: Added the properties. (Murray Cumming) +* Main: Added Main constructor that takes a Glib::OptionContext(), + and Main::add_gtk_option_group(option_context). + (Murray Cumming, Bryan Forbes) +* TreeIter: Add forward_search() and backward_search() + overloads without the limit argument. + (Rob Page, Murray Cumming) + +Pango: +* Color: Added operator bool(). +* Renderer: Added get_color(). + ((Murray Cumming) + +Documentation: +* Added some reference documenation for the new classes, + plus several older classes. +* Corrected documentation tarball and the link to it. +* examples: + - Added book/dialogs/aboutdialog example. + - Added book/buttons/filechooserbutton example. + - Used ProgressCellRenderer in book/treeview/list example. +(Murray Cumming) + +2.5.4: + +Gtk: +* Action: Added get_accel_path(). (Murray Cumming) +* CellRendererText: Added language, ellipsize, and + ellipsize-set properties. (Bryan Forbes) +* TreeView: Added hover_expand and hover_selection + properties. + +Gdk: +* Display: Added supports_selection_notification(), + request_selection_notification(), supports_clipboard_persistance(), + store_clipboard(). +* Pixbuf: Added rotate_simple(), flip(), save_to_buffer(). +* PixbufFormat: Added is_scalable(), is_disabled(), + set_disabled(), get_license(). +* Window: Added enable_synchronized_configure(), + configure_finished(), set_focus_on_map(). + +Atk: +* Relation: Added add_target(). +* RelationSet.hg: add_relation_by_type(). +* Text: Added get_range_extents(), get_bounded_ranges(). + (Murray Cumming) + +2.5.3: + +* Builds against the final GTK+ 2.6 API. + +Gtk: +* CellRenderer.hg: Added stop_editing() which replaces the + now-deprecated editing_cancelled(). +* CellView: Inherit from CellLayout. Removed set_value(). + Added convenience constructors. +* FileChooserButton.hg: Added action parameters to constructors. +* IconView: Added get/set_columns(), get/set_item_width(), + get/set_spacing(), get/set_row_spacing(), get/set_column_spacing(), + get/set_margin(). +* Label: Added get/set_max_chars_width(), and property. +* TextView: Added get_iter_at_position(). + +Gdk: +* Pixbuf: Added create_from_file() overload that takes + height and width. (Murray Cumming) + +Documentation: +* Reference API: Re-extracted C docs, so that the new API + will be automatically documented. (Murray Cumming) +* examples: + - input: Use Glib::IOChannel. (Claudio Saavedra) + +2.5.2: + +Gtk: +* Button: Added set/get_image(). +* CellView: Removed set_cell_data(). +* Dialog: Added set_alternative_button_order(). +* FileChooserButton: + - Now inherits from HBox, not Button. + - Removed get/set_active(). +* IconInfo: Added operator bool(), needed to check + the result of IconTheme::lookup_icon(). +* Label: Added get/set_angle(). +* TreeView: Added append_column_numeric(), and append_column_numeric_editable(), + which allow more control over the formatting of numeric data than + append_column() and append_column_editable(). + (Murray Cumming) + +Pango: +* Added Renderer. +* Context: Added get/set_matrix(). +* FontMetrics.hg: Added get_underline_position(), + get_underline_thickness(), get_strikethrough_position(), + get_strikethrough_thickness(). + (Murray Cumming) + +Documentation: +* example/book/input/: This now works. (Chris Vine) +* Book: + - TreeView selection: Use selected_foreach_iter() + instead of selected_foreach(). (Teus Benschop) + - Fixed some typos. (Claudio Saavedra) + + +2.5.1: + +Gtk: +* AboutDialog: + - Added more get and set methods and properties. + - Wrapped signals. +* ActionGroup: Added translate_string(). +* Added CellRendererCombo, with example. +* Added CellRendererProgress. +* Clipboard: Added set_image(), wait_is_image_available(), + wait_for_image(), request_image(), + wait_is_target_available(), set_can_store(), and store() +* ComboBoxEntry: Added get_entry(). +* ComboBoxText: Added set_active_text(), clear(). +* Dialog: Added alternative_button_order(). +* FileChooser: Added FileChooserError exception class. +* FileChooserButton: Added get/set_width_chars(). +* FileFilter: Added add_pixbuf_formats(). +* IconTheme: + - Added get_icon_sizes(). + - Added IconThemeError exception class. +* IconView: + - Added get_selected_items(), foreach(). + - Added set_text_column(), and set_pixbuf_column() overrides + that take ModelColumns instead of ints. + - Wrapped signals. +* Image: Added set_from_icon_name(), get/set_pixel_size(), + get_icon_name(). +* Label: Added set/get_single_line_mode(), get/set_width_chars(). +* MessageDialog: Added set_secondary_text(). +* Added MenuToolButton. +* PixbufLoader: Added size_prepared signal. +* ProgressBar: Added set/get_ellipsize(). +* SelectionData: Added targets_include_image(), get/set_pixbuf(), + and get/set_uris(). +* Style: Added create() method. +* Widget: Made set_parent(), and unparent() public instead + of protected. Added a size_request() overload which is const + and returns a value. +* Window: Added drag_dest_add_text_targets(), + drag_dest_add_uri_targets(), drag_dest_add_image_targets(), + drag_source_add_text_targets(), drag_source_add_uri_targets(), + and drag_source_add_image_targets(). + +Pango: +* Context: Added get_font_map(). + +* Documentation: + - Partly-updated "input" example. Bug + - Added IconView and CellRendererCombo examples. +(Murray Cumming) + +2.5.0: + +gtkmm 2.5 wraps new API in GTK+ 2.5, and is API/ABI-compatibile with gtkmm 2.4. +The new API is unstable, until this become the API/ABI-stable gtkmm 2.6 when +GTK+ 2.5 becomes the API-stable GTK+ 2.6. + +* Pango: Layout: Added set_ellipsize(), get_ellipsize(), and + EllipsizeMode enum. +* Gtk: + - Added IconView, FileChooserButton, and CellView widgets. + - Action: Added set_visible(). + - Entry: Added layout_index_to_text_index() and + text_index_to_layout_index(). + - EntryCompletion: Added insert_prefix(), set_inline_completion(), + get_inline_completion(), set_popup_completion(), get_popup_completion(), + get_text_column() + - CellRenderer: Added editing_started signal. + - ComboBox: Added get_wrap_width(), get_row_span_column(), + get_column_span_column(), get_add_tearoffs(), set_add_tearoffs(), + get_focus_on_click(), set_focus_on_click(), get_popup_accessible(). + - Label: Added set_ellipsize(), get_ellipsize(). + - FileChooser: Added set_show_hidden(), get_show_hidden(). + - TreeSortable: Added DEFAULT_UNSORTED_COLUMN_ID constant. + - TreeView: Added set_fixed_height_mode(), get_fixed_height_mode(), + set_hover_selection(), get_hover_selection(), set_hover_expand(), + get_hover_expand(). +(Murray Cumming) + +2.4.5: + +* Gtk::Settings::get_default(): Correct reference-count error. + (Murray Cumming) +* Gtk::ActionGroup, EntryCompletion, UIManager: Make constructors + protected instead of private (Christopher Palm). +* Examples: TreeView: + - Added popup example, from gtkmm 2.2. + - drag_and_drop: Correct vfuncs. +* Documentation: + - libglademm memory management. + - Tell people to check pkg-config for 2.4, not 2.2. + - Gtk::TreeSortable: Document sort function return value. + (Murray Cumming) + +2.4.4: + +* More gcc 3.4 build fixes. (Daniel Elstner) +* Gtk::StockItem: Use the global translation domain when no other + translation domain has been specified. (Daniel Elstner) +* Gtk::Action, ToggleAction, RadioAction, IconTheme: Constructors are now + protected so that you can derive from these classes. +* Gtk::Container: Avoid warning about unimplemented GtkContainer::remove + vfunc when deriving directly from Gtk::Container. + (Murray Cumming) + +2.4.3: + +* Win32: gdkmm: Link against the correct libpangomm library. + (Cedric Gustin) +* Gtk::TreeModel::iterator: Correct the operator--() implementation, so that + it actually works. Remember, this is very slow compared to operator++(). + (Daniel Elstner) +* Gtk::ComboBoxText, Gtk::ComboBoxEntryText: Implement the constructors that + take C instances. + (Murray Cumming) + + +2.4.2: + +Gtk: +* ComboBox::get_active(): Properly initialize the iterator. + (Murray Cumming) +* ComboBoxTextEntry: Don't add the text column twice. (Teemu Tervo) +* ComboBoxText, ComboBoxEntryText::get_active_text(): Fix potential + crash. (Murray Cumming) +* TreeView::get_path_at_pos(): Correct memory mangement. + (Murray Cumming, David) +* Use GTHREAD_CFLAGS when appropriate. (Daniel Elstner) +* gtkmm.h: Add comboboxentry.h and comboboxentrytext.h. + (Daniel Elstner) + +Reference Documentation: +* FileChooser: Mention the need to convert to UTF8. (Daniel Elstner) + + +2.4.1: + +* Build fixes for gcc 3.4.0. (Murray Cumming) +* Install gdkmmconfig.h in the correct place. + (Murray Cumming) +* Install atkmm/private headers in the correct place. + (Alexander Nedotsukov) + +Changes in gtkmm 2.4: + +- Highlights: + + There are several new widgets/classes, with examples: + + * New File Chooser: + FileChooser, FileChooserWidget, FileChooserDialog, FileFilter. + + * Action-based Toolbar/Menu API: + UIManager, Action, ToggleAction, RadioAction. + + * New Combo Box: + ComboBox, ComboBoxEntry, ComboBoxText, CellLayout. + + * Auto-complete for Entry: + EntryCompletion. + + * Other new classes: + IconInfo, IconTheme TargetList. + + * New ATK, Pango, and GDK API wrapped. + +- Existing API improved: + * Use of improved libsigc++ 2 API. + * Removed useless key-binding signals. + * Alignment: Added set/get_padding(). + * Entry: Added set/get_alignment(). + * Settings: New properties. + * ListStore/TreeStores: Added insert_after(), which should be faster than insert(). + * TreeView: Added move_column_to_start() + * TreeModel: Deriving is now easier, because the virtual functions now use C++ types. + * TreeModel::iterator: Added operator--(), which is slow. + * See the NEWS file for detailed API changes. + * Various bugfixes - see ChangeLog. + +The following people made gtkmm 2.4 happen: + Bradley Bell + Murray Cumming + Bryan Forbes (lots of very significant work) + Cedric Gustin + Oli Kessler + Ole Laursen + Andrew E. Makeev + Hagen Moebius + Frank Naumann + Elijah Newren + Billy O'Connor + Gene Ruebsamen + Martin Schulze + Enrico Scholz + Sebastian Rittau + Takashi Takekawa + Matthew Walton + + + +2.3.8: + +* Gtk: + - Action: Added set_sensitive() and set_tooltip(). (Murray Cumming) + - Settings: Added some properties. (Bryan Forbes) + - TargetList: Added a create() method. (Bryan Forbes) + - TreeModel: Rename 2 of the foreach() methods, to foreach_iter() and foreach_path(), + because they are ambiguous with libsigc++ 2. (Murray Cumming) + - ListStore/TreeStore: Added insert_after(), because it is apparently faster with + many rows. (Murray Cumming) + - IconTheme: Corrected refcounting of get_default() and get_for_screen(). + (Bryan Forbes) + + +2.3.7: + +* Gtk: + - Action: + - create_tool_item(), create_menu(), and create_icon() return specific types. + (Bryan Forbes) + - Constructors: Give 0 instead of "" to GTK+ for empty strings, to make + stock items work. (Murray Cumming) + - Container: Keep managed child widgets alive when remove()ing them. + (Murray Cumming) + - IconTheme: Wrapped the changed signal. (Murray Cumming) + - FileFilter: It's a Gtk::Object, not a Glib::Object. (Murray Cumming) + - TreeView: Added move_column_to_start(). (Andrew E. Makeev) + - UIManager: Fixed typo in disconnect_proxy signal name. (Bryan Forbes) + - many: Do the extra reference for several get_*() methods. + (Bryan Forbes, Murray Cumming) + + +* Documentation: + - Reference documentation: Corrected some mention of null parameters, and g_free(), + in generated-from-C docs. (Murray Cumming) + - Book: Corrected typos and updated libsigc++ syntax. (Elijah Newren) + - FAQ: Don't mention gtkmm 1.2 so much. (Elijah Newren) + - Examples: Adde book/menus_and_toolbars, to show UIManager. (Murray Cumming) + + +2.3.6: + +* Build fixes: + - Partial Sun Forte C++ build fixes. + (Murray Cumming, Michael v.Szombathely) + - gcc 3.4 (cvs) build fixes + (Murray Cumming, Matthew Tuck) + - win32 (cygwin) build fixes: + (Cedric Gustin) + - Doxygen is, again, not required when building from tarballs. + (Murray Cumming) + +* Gtk: RadioButton, RadioMenuItem: Added group_changed signal. + (Murray Cumming) + +* Documentation: + _Lots_ of added, and improved reference documentation. + (Hagen Moebius) + +2.3.5: + +* Gtk: + - ComboBox: Added popup() and popdown(). (Murray Cumming) + - ComboBoxEntry: Added a set_text_column() overload that takes a + ModelColumnBase instead of an int. + - Added ComboBoxEntryText, like ComboBoxText. (Murray Cumming) + - Entry: Added set/get_alignment(). + - FileChooser: + - Removed set_folder_mode() and get_folder_mode(), + which are no longer in GTK+. (Bryan Forbes) + - Added set/get_preview_label(). (Murray Cumming) + - Added IconInfo, TargetList (Bryan Forbes) + - IconTheme: methods now use IconInfo. (Bryan Forbes) + - Added Gtk::Stock::DIALOG_AUTHENTICATION stock item. + (Bryan Forbes) + - Scale: Added get_layout() and get_layout_offsets(). + - Toolbar + - Added append(), prepend(), insert() overloads which take + slots, so that signal connecting requires less code. + - Removed old STL-style API, because the APIs do not + co-exist well together at the GTK+ level. + (Bryan Forbes) + - TreePath: Corrected template typo found by gcc 3.4 + (Matthew Tuck) + - Widget: Added add_mnemonic_labels(), remove_mnemonic_label(), + list_mnemonic_labels(), draw_insertion_cursor(). + (Murray Cumming) + - Window: Added "role" property. (Bryan Forbes) + + - Several const corrections. (Murray Cumming) + - Fixes to the libsigc++2 port. (Martin Schulze, Bryan Forbes) + - Added --enable-examples configure option. (Bryan Forbes) + + - Documentation: + - Added some TreeView reference documentation. + (Billy O'Connor) + +* Gdk: + - Drawable::draw_glyphs() now takes a c++ Pango::GlyphString. + (Bryan Forbes) + - Window + - get_children() now returns a C++ container instead of a GList. + (Bryan Forbes) + - get_internal_paint_info() now takes C++ parameters. + (Bryan Forbes) + - removed peek_children() because it's the same as get_children(). + (Murray Cumming) + +* Pango: + - FontFace: Added list_sizes(). + - AttrIter: Added get_attrs(). + - FontFamily: Added is_monospace(). + - FontSet: Added foreach() + - Language: Added includes_script(). + - Layout: Added set/get_auto_dir(). + +2.3.4: + +* Gtk: + - Now uses libsigc++ 2 (Murray Cumming) + - Frame: Methods use C++ Gtk::Allocation instead of C GtkAllocation. + (Bryan Forbes) + - Added IconTheme. (Bryan Forbes). + - Added TargetList. (Bryan Forbes) + - TargetEntry: Use a C++ TargetFlags enum instead of the C enum. + (Bryan Forbes) + - Widget + - drag_dest_find_target(), drag_dest_get_target_list(), drag_begin(): + Use C++ TargetList instead of C GtkTargetList. (Bryan Forbes) + - Use C++ Gtk::Allocation instead of GtkAllocation, and + Gtk::Requisition instead of GtkRequisition in methods. + (Bryan Forbes) + - Socket: Use C++ Gdk::NativeWindow type for method parametrs. + (Bryan Forbes) + +* Gdk: + - Colormap: Use C++ Gdk::Color instead of C GdkColor for method parameters + (Bryan Forbes) + - Device: Use C++ InputSource enum instead of the C GdkInputSource enum. + (Bryan Forbes) + - Display: Use ustring for target parameters instead of GdkAtom. + (Bryan Forbes) + - Added C++ NativeWindow typedef and used it instead of GdkNativeWindow + (Bryan Forbes) + +* examples: book/dialogs/filechooser: Added buttons. + (Matthew Walton) + +2.3.3: + +- CellLayout: signals take a C++ CellRenderer* instead of a C + GtkCellRenderer*. +- Widget: + - signal_drag_data_get and signal_selection_get now use the C++ + SelectionData type. + - Methods now take C++ Gdk::Region& instead of C GdkRegion*. +- SelectionData: Added set() method overload with fewer parameters. +- TreeDragSource: The drag_get_data vfunc now uses the C++ + SelectionData type. +- TreeIter (TreeModel::iterator): Added operator--(). +- Added const version of many ListHandle<> get_*() methods. + (Murray Cumming) + +2.3.2: + +* Gtk: + * AccelMap: Added lock_path() and unlock_path(). + * Button: Added get/set_alignment(). + * CellLayout: Added reorder(). + * Clipboard: Added wait_for_targets(), and a simpler request_targets(). + * MenuShell: Added cancel(). + * ListStore, TreeStore: Added set_model_columns() for use by derived + classes. + * TreeModel: vfuncs now use C++ types, and are documented. + * TreeModelFilter: Wrapped set_modify_func(). + * Window: Added get_group() and set_accept_focus(). + +* Gdk: + * Colormap: Added get_system(). + * Device: Added get_name(), get_source(), get_mode() and get_has_cursor() + * Display: Added set_double_click_distance() and get_default_group(). + * DragContext: Added get_targets(). + * Added rgb_*() methods. + +* Pango: + * LayoutLine: Added get_length(), get_start_index(), and get_layout(). + +* Atk: + * Added Document, Hyperlink, Hypertext, and StreamableContent classes. + +* Portability: + * Atk::Text build fix for Intel compiler. (Takashi Takekawa) + +* Documentation: + * devhelp file now installs correctly, with working hyperlinks. + * Documented Gtk::AccelMap methods. + * Documented Atk classes. + * TreeView, TextView, and associated classes are almost fully documented. + (Murray Cumming) + +* Also: + - build fix. (Billy O'Connor) + - spec file fix. (Eric Bourque) + + +2.3.1: + +* Gtk: + * Action, ToggleAction, RadioAction: + - Added create() method overloads without stock_id. + - ToggleAction::create() has extra bool is_active parameter. + * EntryCompletion: Wrapped match_selected signal. + * Expander: Added get/set_markup() + * Menu: Added set_monitor() + * Menu::AccelKey is now Gtk::AccelKey + * MessageDialog: Added set_markup(). + * Added FileChooser (interface), FileChooserWidget, FileChooserDialog, FileFilter, with example. + * ComboBox example + * ComboBoxText now works, with example. + * RadioToolButton: constructors properly implemented. (Murray Cumming, Billy O'Connor) + * Toolbar: Old API deprecated. New API wrapped. Expect more change here. + * TreeModel:: Add virtual iter_is_valid() method, now used by TreeModel::iterator operator bool(). + * TreeViewColumn: Added get_cell_position(). + * Widget: Wrapped get_accessible and screen_changed signals. +* Gdk: + * Pixbuf: Added get_formats() + +* Added Atk::init() and Pango::init(), to use when you don't want all of gtkmm. +* Documentation: Corrected installation and links with glibmm documentation. +* Deprecation: Define GTKMM_DISABLE_DEPRECATED to prevent use of deprecated API in your application. + (Murray Cumming) + +2.3.0: + +* Removed key-binding signals. (Murray Cumming) + +* Use of Gdk::Device and Gtk::SelectionData instead of C equivalents + (Murray Cumming) + +* New classes: + Gtk:: + Action, ActionGroup, CellLayout, ComboBox, ComboxText, ComboBoxEntry, ColorButton, EntryCompletion, + Expander, FontButton, RadioAction, RadioToolButton, ToggleAction, ToggleToolButton, ToolItem, ToolButton, + UIManager + +* New API for existing classes: + Gtk::Alignment: get/set_padding(). Useful for indenting Gtk::Frame contents. + Gtk::Button: get/set_focus_on_click() + Gtk::ButtonBox: get_child_secondary(). + Gtk::Calendar: + - display_options() is now set_display_options(). + - New properties. + Gtk::CheckMenuItem: get/set_draw_as_radio() + Gtk::Entry: get/set_completion() + Gtk::EventBox: get/set_visible_window(), get/set_above_child() + Gtk::IconSource: get/set_icon_name() + Gtk::Menu: attach() + Gtk::MessageDialog: + Constructors: Added bool use_markup paramater after message parameter. + This is an API change, and I'd leak to hear suggestions for alternatives. + Gtk::TextBuffer: select_range() + Gtk::TextIter (also known as Gtk::TextBuffer::iterator): + Added *_visible_* versions of forwards/backwards methods. + Gtk::TextView: + - get/set_overwrite(), get/set_accepts_tab() + - Added WRAP_WORD_CHAR wrap mode. + Gtk::TreeViewColumn (also known as Gtk::TreeView::Column): + Added get/set_expand(). + Gtk::Widget: + - queue_resize_no_redraw(), get/set__no_show_all() + - Added unset_fg(), unset_bg(), unset_font(), unset_text(), unset_base(). + - Added add_modal_grab(), remove_modal_grab(), get_current_modal_grab(). + (Ole Laursen) + - Added set_window() and set_allocation() for implementing new native widgets. + (Detlef Reichl) + Gtk::Window: set_default_icon(), set_keep_above(), set_keep_below() + + Gdk::Cursor: new constructor: Cursor(const Glib::RefPtr& display, const Glib::RefPtr& pixbuf, int x, int y) + Gdk::Display: flush(), supports_cursor_alpha(), supports_cursor_color(), get_default_cursor_size(), + get_maximal_cursor_size + Gdk::PixbufLoader: create() now has extra bool mime_type parameter. + Gdk::Window: set_keep_above(), set_keep_below(). + (Murray Cumming) + + +2.2.2: + + * OptionMenu: Fixed segfault when Menu remembers destroyed OptionMenu. + (Murray Cumming) + * Gtk::Image::get_pixbuf(): Fixed reference counting error. + (Enrico Costanza) + * Pango::AttrList::insert(), insert_before(), change()): Pass a copy of + the attribute parameter. (Martin Schulze) + * Menu: Fixed memory leak when removing MenuItems. + (Murray Cumming) + * Build fixage (Enrico Scholz, Cedric Gustin) + * Win32: + - Dispatcher ported to Win32, we think. + (Andrew Makeev, Cedric Gustin, Murray Cumming) + * Examples: + - Updated book/idle and book/timeout. + (Gene Ruebsamen, Murray Cumming) + * Documentation: + - Win32 installation instructions. (Gene Ruebsamen) + - Glib::Module documented (Ross Burton) + - Updated idle/timeout chapter. (Gene Ruebsamen) + - Correct all automatic-from-GTK+ documentation that mentions + _free() functions by mistake. (Murray Cumming) + - Corrected typo in gtk_window_set_default(). (Oli Kessler) + - gobj() methods documented. + - Documented Glib::ListHandle, Glib::ListHandle, Glib::SListHandle. + (Murray Cumming) + +Changes in gtkmm 2.2: + +Highlights: +- New GTK+ 2.2 API wrapped: + * Gtk::ListStore and TreeStore move(), reorder(), iter_is_valid() + methods added. + * Gdk::DisplayManager, Display, and Screen added. + +- Existing API improved: + * atkmm rewritten and usable. + * Gtk::Clipboard rewritten and now usable, with examples and documentation. + * Gtk::TreeView drag-and-drop now usable, with examples, and documentation. + * Gtk::TreeModelSort wrapped. + * Gtk::Toolbar has a non-STL-style interface, like the other containers. + * glibmm: Added string utility functions, get_appname(), file_open_tmp() + and file_open_contents(). Glib::Markup added - this is not a real XML + parser. + * Various bugfixes - see ChangeLog. + +The following people made gtkmm 2.2 happen: +Ross Burton +Murray Cumming +Daniel Elstner +Walter H. van Holst +Mark Jones +Gary Peck +Daniel Sundberg +Naofumi Yasufuku + + + +2.2.0: + +* Added Gdk::Window::pointer_grab(), pointer_ungrab(), keyboard_grab() + and keyboard_ungrab(). (Murray Cumming) + +2.1.3: + +* Changed library binary version so libtool knows that + 2.2 is API compatible with 2.0. We did this wrong in the past + so people MUST do this: + + rm -rf /lib/lib{glib,pango,atk,gdk,gtk}mm-[12].0.so.[345]* + + where is something like /usr/local or /opt/gnome2 + This will remove previous bad versions of 2.1.x. +* atkmm: Lots of new interfaces wrapped. (Daniel Elstner). +* Gtk::TextView:: Fixed bytes/length confusion in TextBuffer's + insert_text callback. (Daniel Elstner) + +Documentation: + C->C++ docs conversion improved. (Daniel Elstner) + +2.1.2: + +* Gtk::Clipboard API finished, with examples, and a book chapter: + http://www.gtkmm.org/gtkmm2/docs/tutorial/html/ch16.html + (Murray Cumming, Daniel Elstner) +* Gtk::TreeView: Some drag-and-drop API improvements, with examples. + (Murray Cumming) +* Gtk::TreeModelSort added. (Daniel Elstner) +* Glib::RefPtr: Added swap(). (Daniel Elstner) +* Gtk::ColorSelection: catch exceptions. (Daniel Elstner) +* Gdk::Pixmap: Prevent rare segfault in creation. (Daniel Elstner) +* Gtk::AccelGroup::activate(): Implemented as a wrapper of + gtk_accel_groups_activate(). (Daniel Elstner) +* Glib::file_open_tmp() and Glib::file_open_contents() implemented. + (Daniel Elstner) +* win32: Glib::Dispatcher compilation fix. (Naofumi Yasufuku) + +2.1.1: +* Gtk::Clipboard API usable, and demonstrated in examples/book/clipboard + (Murray Cumming) +* new Gtk::ListStore and TreeStore move(), reorder(), iter_is_valid() + methods added. (Daniel Elstner) +* Gtk::FileSelection: get_history_pulldown() added. (Mark Jones) +* Added Gtk::Widget::modify_bg_pixmap(). (Daniel Elstner) +* Gtk::RcStyle: Added accessors for public struct fields. (Daniel Elstner) +* Gtk::Style: Added accessors. (Daniel Elstner) +* Gtk::ColorSelection: Added palette methods. (Daniel Elstner) +* Gtk::Label::get_layout(): Corrected refcounting (Daniel Elstner) +* Prevent leak when constructors throw exceptions. (Daniel Elstner) +* Added Glib::get_application_name() and set_application_name() + (Daniel Elstner) +* spec file improved (Gary Peck) + +* Documentation updated automatically from latest C API docs. +  (Daniel Elstner) + + +2.1.0: + +* atkmm: Major API corrections. It was unusable before, so we felt free to break +  the API. (Daniel Elstner) +* Gtk::Clipboard: Now inherits from Glib::Object, so it should be used with +  Glib::RefPtr<>. This was unusable before, so we felt free to break the API. +  (Murray Cumming) +* Gtk::TreeModel::RowReference: It's now a "boxed type" so it can be copied. +  (Murray Cumming) +* Gtk::TreeView: some convenience method overloads added. (Daniel Elstner) +* gdkmm: New classes and methods added, mostly to support multi-head. +  (Murray Cumming) +* gtkmm: New methods, for multi-head and some new TreeView methods. +  (Daniel Sundberg, Murray Cumming) +* glibmm/stringutils.h: New utility functions. (Daniel Elstner) +* Gtk::Toolbar: Now has non-STL-style interface - e.g. append(). +  (Murray Cumming) +* Glib::Markup added. You probably want to use a real XML parser instead. +  (Daniel Elstner) +* Spec file for RPMs corrected. (Walter H. van Holst) + +Documentation: +* Widget-specific and Internationalization chapters completed. +* Book now has inline example code. (Murray Cumming, Daniel Elstner) +* New book/dialogs example. (Murray Cumming) +* examples: warnings fixed. (Daniel Elstner) + +Also in 2.0.2: +* Lifetime fix: rare segfault involving destruction and hide() fixed. +  (Daniel Elstner) +* TreeView::append_editable(): Now works with bool model columns. +  (Murray Cumming) +* reference-counting fixed in some vfuncs. (Daniel Elstner) + + +gtkmm-2-0 branch created. This is HEAD, for gtkmm 2.2 + +2.0.1: + +* Lifetime: Fixed segfault during destruction of non-scrollable children + in ScrolledWindow. (Murray Cumming, Daniel Elstner) +* Signals: Honor the blocked flag of the SigC::Connection. + (Daniel Elstner) +* Gtk::WindowGroup: Added missing create() method. + (Daniel Elstner) +* Win32: + - Uses -mms-bitfields option for use with GTK+ with MinGW gcc3 + - Temporarily #undef some badly named win32 macros. + (Naofumi Yasufuku) + +* Documentation: + - Built HTML is now distributed in the tarball. + (Murray Cumming, Daniel Elstner) + - Documentation is installed in /share/doc/gtkmm-2.0/ + (Daniel Elstner) + - "Programming with gtkmm": widget-specific sections updated. + (Murray Cumming) + + +2.0.0 + +* Now builds with gcc even with -Werror warnings. (Daniel Elstner) +* Various low-level cleanups/improvements. (Daniel Elstner) +* SUN-specific workarounds removed now that SUN fixed their + compiler (Michael v. Szombathely) + +API Changes: +* Gtk::Box::pack_start() and pack_end(): + removed default argument values for the bool, bool overloads, + to improve type-safety of the more useful PackOptions overload. + (Daniel Elstner) +* Gtk::Menu_Helpers::StockMenuElems can be used to create + submenus. (Christof Pettig) +* Gtk::AspectFrame: Added a constructor that uses AlignmentEnum. + (Murray Cumming) +* Some minor Pango API corrections (Daniel Elstner) +* Glib::ustring::clear(): Added. (Daniel Elstner) +* Glib::Ascii::tolower() and Glib::Ascii::toupper() added. + (Daniel Elstner) + + +Documentation: +* Book: + Updated almost all widget-specific sections. + Used links to reference docs and to example source code. + Added screenshots. +* FAQ: Updated and converted to DocBook XML. +* examples: Rewrote many examples - see examples/book/ + (Murray Cumming) +* Glib::ustring non-standard methods documented. + (Daniel Elstner) + + +2002-10-17: 1.3.26: + +* GCC 2.95 build fixed. (Daniel Elstner) + +2002-10-17: 1.3.25: + +* Now requires libsigc++ 1.2.0 +* Gtk::Entry::get_layout(): refcounting fixed. (Daniel Elstner) +* gcc 3.2 warnings fixes. (Daniel Elstner) +* Gtk::TextBuffer::iterator::operator bool() now works. + (Daniel Elstner) + +API changes: +* Gtk::TextBuffer: + * create_mark() Added overload for anonymous marks. + * iterator: Return values instead of references, for UTF8. + * insert_interactive() and erase_interactive now return a pair, + with a bool to indicate success, like std::map::insert(). + * insert_range()renamed to insert(). + * insert_range_interactive() renamed to insert_interactive(). + * delete_text() renamed to erase() + * delete_interactive_text() renamed to erase_interactive() + * delete_selection() renamed to erase_selection(). + * insert_child_anchor() now returns an iterator. + * signal_insert_text() renamed to signal_insert(). + * signal_delete_range() renamed to signal_erase(). + * assign(): New alias method for set_text(). + (Daniel Elstner) +* Gtk::TreeView: + * Added scroll_to_row() and scroll_to_column() + * Added unset_hadjustment(),unset_vadjustment(), and + unset_expander_column(). + Added set_cursor() overload taking a TreePath. + * enable_drag_model_source() now takes a Gtk::TargetEntry instead + of the C type. + (Daniel Elstner) +* Glib::IOChannel StreamIOChannel: new wrappers. + (Tassos Bassoukos, Martin Schulze, Daniel Elstner) +* Glib::IOSource: Added create() overload that takes IOChannel. + (Martin Schulze). + +* Documentation: + * Book: Some Sections on common widgets updated and rearranged, + with screenshots. Example code is now linked instead of being + inline. + * examples: + Several examples rewritten and moved into examples/book. + (Murray Cumming) + * demos: warnings in TextBuffer demo fixed. (Daniel Elstner) + +2002-10-09 1.3.24: + +* Lifetime: On-stack child widgets are not destroyed during destruction of their + containers. (Murray Cumming) +* Gtk::TextMark::get_iter(): Corrected reference counting (Mike McEwan) + +API changes: +* Glib::Source: Can now wrap existing GSource objects. + (Martin Schulze) +* Glib::TimeVal: Convenience methods added. (Stephan Puchegger) +* Glib::IConv: Added reset(). (Daniel Elstner) +* Glib::Dispatcher: new constructor accepts an arbitrary Glib::MainContext. + (Stephan Puchegger) +* Gdk: Added screen_width() and screen_height(). (Murray Cumming) + + +2002-09-13 1.3.23: + +Documentation: +* We now reuse ATK, GDK, and Pango reference documentation: + e.g: http://www.gtkmm.org/gtkmm2/reference/html/namespacePango.html + (Martin Schulze) +* README.SUN added (Michael v. Szombathely) + +API breakage: +* pangomm: New classes, and some corrections to existing classes. + (Martin Schulze) + Excuse: Pangomm isn't used very much. +* Gtk::TreeView::set_column() takes a Widget& instead of a GtkWidget*. + (Murray Cumming) + Excuse: If anybody was using it already, they would have told us. +* Gtk::TextBuffer::get_text(): Added overload that takes no iterators. + (Murray Cumming) + Excuse: It's API addition. +* Gtk::Style: Wrapped GTK+ vfuncs. + (Murray Cumming) + Excuse: It's API addition. + + +2002-08-28 1.3.22: + +* Win32: + - Don't include strings.h on Win32. + - Use -fnative-struct, as used by GTK+ DLLs. + - Install win32 import libraries. + (Naofumi Yasufuku) + - Don't try to register non-wrapped classes. (Murray Cumming) + +* Sun Forte build fixes. (Michael v. Szombathely) + +API breakage: +* pangomm: + - Added Rectangle, Language, Color, Item, Glyph, Attributes, Attr, AttrItem. + - Used these wrappers in other class methods. + - Added some wrapper methods. + (Martin Schulze) + Excuse for breakage: pangomm isn't used much directly so this shouldn't break much. +* Added Gdk::Window::set_cursor(void) to reset the cursor. (Murray Cumming) + Excuse: It's additional API so it doesn't break anything. + +2002-08-18 1.3.21: +* Lifecycle: Prevented double-destroying of GtkObjects. (Murray Cumming) +* Pango::Layout: Added constructor and create() method. (Martin Schulze) +* Gtk::Scale: set_draw_value() and get_draw_value() parameters are now bools. + (Ole Laursen) + +Documentation: +* Additions to PORTING. (Elke Meier). +* PORTING is now distributed. (Bradley Bell) +* docs/internal: Added documentation_generation.tx.t (Murray Cumming) +* More reference docs for Scale, VScale, and HScale. (Ole Laursen) + + +2002-08-14 1.3.20: +* Gtk::TreeView classes: + - TreeView::append_column_editable() Workaround for gcc 2.95.3 compilation + bug. (Martin Schulze) + - TreeModel::foreach() return value marshalled properly. (Gergo Erdi) + +* lifecyle: C++ deletion really destroys GtkObjects again. (Murray Cumming) +* Glib::Object: removed warnings when using libglademm. (Murray Cumming) +* Gtk::manage(): Now emits warnings when you try to use it on a top-level + Window. (Murray Cumming) + +* examples: + - Removed old menu and combo examples. + - Corrected use of Gtk::manage() on top-level windows. + - Added cleaner combo example in example/book/combo. + - rulers fixed. (Martin Schulze) + +* API changes: + - Gtk::Combo: Added ComboDrowDown class - it wraps the deprecated GtkList + widget that is used in the GtkCombo interface. gtkmm coders can now set + individual item strings and use widgets for Combo items. See + examples/book/combo. (Martin Schulze) + - Gdk::Drawable: draw_rectangle() and draw_arc(): Changed filled arg from + int to bool. (Michael Koziarski) + - Gdk::Color: *_p() renamed to get_*_p(). (Andreas Holzmann) + - Gtk::TextMark: Added get_iter() as a convenience. (Martin Schulze) + - Gtk::TextBuffer: delete_at_cursor() and insert_at_cursor() return the + iterator, to be consistent with the other methods. (Martin Schulze) + - Gtk::TextBuffer: paste_clipboard(), insert_child(), and + create_child_anchor() parameters are now const. (Martin Schulze) + - Gtk::Bin::add_label(): Added override, using enum. (Gergo Erdi) + - Gtk::IconFactory and Gtk::StockItem: Changed string parameters to + Gtk::StockID to allow use of Gtk::BuiltinStockID. (Murray Cumming) + + +2002-08-06 1.3.19: +* Gtk::TreeView classes: + - Added TreeModel::RowReference wrapper - it remains valid even when the + rows are sorted. + - All methods that take a Model::iterator can also take a Model::Row. + (Murray Cumming) + - Added TreeView::append_column_editable() method. It creates columns whose + cells automatically store new values in the model when they are edited. + See documentation: + http://www.gtkmm.org/gtkmm2/tutorial/html/ch10s02.html#id2837147 + - Added TreeModel::foreach() wrapper. + - Added TreeView::remove_all_columns(). + - treestore demo: Parent rows don't show toggle cells anymore. + (Daniel somebody) +* Box::pack_start() and pack_end() API: + - Restore the old (bool, bool) methods as overload, so it's easier to + port to gtkmm2. + - Changed the ORed flags to a simpler set of 3 mutually-exclusive enums. + (Michael Babcock) +* Menu API: + - Main Menu items are now accelerated automatically. + - Popup menus need to be accelerated at the appropriate time - handy + accelerate() overloads were created for this. + - AccelMap: New wrapper. + (Andreas Holzmann) + - ImageMenuElem items now show their icons automatically. + (Murray Cumming) +* Lifecycle: + - Top-level windows are now properly destroyed, and definitely can't be + manage()d. + - Added test for this (Michael v. Szthombathely) + - Prevented some double-destruction of signal connections. + - Prevented recreation of 2nd C++ instances by Glib::wrap() during + destruction of the C instances. + - Prevented calling of signal handlers of destroyed C++ instances. + (Murray Cumming, Valgrind) + - Corrected refounting of some get*() methods. (Christof Pettig) +* Sun Forte compiler fixes: + - Examples use more lengthy code when Sun's compiler can't handle the + templated TreeView methods. + - Explicit specification of templated Glib::wrap() specializations. + (Michael v. Szthombathely, Murray Cumming) +* gcc 3.1 fixes (Jarek Dukat) +* Added vast number of const get_*() const overloads. (Jarek Dukat) +* Added alignment enum, used in overloads as an alternative to 0.5, 1.0, etc. + (Murray Cumming) +* Gtk::Style: Added const overloads of get_*gc() methods. +* Documentation: + - Allow use of a local DocBook stylesheet, for people who aren't connected. + (Marcelo E. Magallo) + - Added Gtk::Main::run(window) overload reference docs. + (Moreten Brix Pedersen) + - Added RefPtr<> reference docs. (Ole Laursen) + - Prevented reuse of C docs that talk about free-ing stuff. (Murray Cumming) +* autogen fix for GTKMM_VC_PERL_VERSION problem. (Marcel E. Magallo) +* Corrected library versioning of the internal gtk_extra_defs library. + (Bradley Bell) +* FontSelection example fixed. (Morten Brix Pedersen) + + +2002-07-14 1.3.18: + +* documentation: + ( See http://www.gtkmm.org/gtkmm2/ ) + book: Added TreeView chapter. + Added custom signals section. + (Murray Cumming) + reference: Added Menus and TextView groups. + Added vast amounts of class documentation, and method + documentation reused from GTK+. + (Murray Cumming, James Henstridge, Morten Brix Pedersen) + PORTING: Additions and clarifications. (Jarek Dukat, Morten Brix Pedersen) + examples: Added menus and custom signals examples. (Murray Cumming) + Corected original menu examples. (Liam Girdwood) + internals: Corrected _DEPS description. (Marcelo Magallon) +* Gtk::TreeView classes: + - Models columns can be accessed by number, for dynamically-created models. + - Added overrides to take TreeModel::Rows as well as TreeModel::iterators. + - Row: Added operator bool(). + (Murray Cumming) +* Gtk::TextView classes + - Added TextBuffer:: typedefs for Tag, TagTable and Mark. + - TextBuffer: insert() methods now return the new iterator instead of + modifying the input iterator, to be more STL-like. + - Renamed get_start_iter() and get_end_iter() to begin() and end(). + - Made get() methods const. + (Murray Cumming) +* Gtk::Table: The STL-style list now works. It probably never worked before, + even in gtkmm 1.2. (Murray Cumming) +* Gtk::RadioButton::Group: Simplified copying/passing semantics. +* Gtk::Menu: Show stock menu item icons. (Christof Petig) +* Glib::IConv: constructor handles errors and throws appropriate exceptions. + (Jarek Dukat) +* Sun Forte compiler fixes. (Murray Cumming) +* vfunc wrapper generation simplification. (Murray Cumming) +* Gtk::Invisible: Correct constructor bug discovered by + Tony (Murray Cumming) +* gcc 3.1 fixes. (Jarek Dukat, Gergo Erdi) + + +2002-06-22 1.3.17: + +* Win32 support. (Cedric Gustin, Daniel Elstner) +* STL-style interfaces: Use of references rather than pointers as value types, + to avoid double indirection when dereferencing iterators. (Martin Schulze) +* vfunc wrappers: All overrideable vfuncs now have the "_vfunc" suffix, and + they all have separate invoker methods, which are usually wrappers of the C + invoker functions. (Daniel Elstner) +* Gtk::Box STL-style interface uses Gtk::AttachOptions instead of bools, + for consistency. (Jarek Dukat) +* Added examples/gdk, which shows gdkmm drawing code. (Alain Rouge) +* Added Gdk::RgbCMap wrapper. (Murray Cumming) +* Added Pango::GlyphString wrapper. (Murray Cumming) +* Many more get_*() methods are now const. (Jarek Dukat) +* Gtk::TextBuffer::create_mark() reference-count bug fixed. (Andrew E Makeev) +* Gdk::Drawable: Compilation fix for Sun's Forte compiler. (Michael v. Szombathely) +* Added Glib::Module wrapper. (Murray Cumming) +* Improved gtkmmproc documentation. (Murray Cumming) +* Distribute CHANGES files. (Morten Brix Pedersen) + + +2002-06-17: 1.3.16: + +* Distribute cell renderer example header files. Doh! (Daniel Elstner) +* Rename several remove_foo() methods to unset_foo(), to avoid confusion with + container operations. (Daniel Elstner) +* Gtk::FileSelection::set_filename(): Change argument type to std::string, to + follow the GTK+ inconsistency fix -- both get_filename() and set_filename() + work with on-disk encoding now. (Daniel Elstner) +* Glib::Mutex::Lock and friends: Replace the bool acquire_immediately + parameter with overloaded ctors. See the docs, it should be easier now. + (Daniel Elstner) + +2002-06-15: 1.3.15: + +* Major low-level GObject changes to allow on-the-fly GType registration. This allows + creation of custom TreeView CellRenderers in C++, and should allow implementation of + GTK+ Interfaces in C++. See examples/cellrenderercustom/ + (Daniel Elstner) +* Gtk::Notebook: Restored the STL-style interface, but this time properly. + (Martin Schulze) +* Gtk::TreeSortable: set_sort_func() now uses SigC C++ Slots instead of C callbacks. + (Jarek Dukat) +* Glib::Dispatcher: A special libsigc++ signal for easy inter-thread communication through + a pipe. See examples/thread/dispatcher and + http://www.gtkmm.org/gtkmm2/reference/html/classGlib_1_1Dispatcher.html#_details + (Daniel Elstner) +* Added optimisation that allows us to use C++ types even in default signal handlers, so + there should soon be no C types anywhere in the gtkmm interface. (Daniel Elstner) +* Added comments to the C<->C++ callback hookups. (Murray Cumming) +* Gtk::MenuShell and MenuBar implementation cleanup. (Daniel Elstner) +* Gdk::Pixmap/Bitmap implementation simplified. (Daniel Elstner) +* Gtk::Widget: + - new enum Gtk::WidgetFlags. + - width() renamed to get_width(). Likewise height(). + (Daniel Elstner) +* Gdk::Drawable: More use of C++ types, and constness fixes. (Daniel Elstner) +* Gtk::Style: Wrap gtk_paint_*() functions. (Daniel Elstner) +* Gtk::Stock: + - Implement Gtk::Stock::add(). + - StockItem: Allow checking for null. + (Daniel Elstner) +* Gtk::Paned::pack(): Uses the AttachOptions enum instead of unreadable bools. + (Daniel Elstner) +* Removed need for wrap_specific_type(). (Daniel Elstner) +* Removed Gtk::Kit typedef. Just use Gtk::Main. (Daniel Elstner) + +2002-05-12: 1.3.14: + +* Gtk::TreeView and friends: + - Namespaced TreeIter, TreePath, TreeViewColumn, etc, as TreeModel::iterator, + TreeModel::Path, TreeView::Column, etc. (Murray Cumming) + - Separated TreeModel::iterator into iterator and Row, obtained by + dereferencing the iterator. This is more STL-like. (Daniel Elstner) + - Some Model methods moved to Row, and set_value()/get_value() replaced by + array-style operator[]. (Daniel Elstner) + - Added overrides to allow for simple model-to-view column mapping without + repetitive specifying of TreeViewColumns and CellRenderers and attributes. + Examples and demos therefore greatly simplified. (Murray Cumming) + - TreeModel::iterator comparison problems fixed. (Daniel Elstner) + - Added Path(iterator&) constructor. + - All get_*() methods are now const. (Murray Cumming) +* Gtk::Box::pack_start() and pack_end(): Now uses AttachOptions flags instead + of two bool paratemers, to make code more readable and to be consistent with + Gtk::Table::attach(). (Murray Cumming) +* Gtk::Notebook: STL-style interface remoeved because GTK+ doesn't expose + enough internals anymore. The simple append/prepend interface remains. + (Murray Cumming) +* Some enums placed inside their related classes. (Daniel Elstner) +* Glib::FileError enums renamed to avoid clashes with C #defines on some + platforms (Daniel Elstner) +* Fixed refcount problem with manage() ed child widget destruction. + (Murray Cumming) +* test suite started. (Daniel Elstner) +* Glib::Value and properties simplifications. (Daniel Elstner) +* Gtk::Dialog: Dialogs are now hidden when run() finishes. (Murray Cumming) + +2002-05-01 gtkmm 1.3.13: + +* Mostly just a release to sync with a new gnomemm release. +* Some glibmm code is now autogenerated with gtkmmproc (Daniel Elstner) +* Improvements to enum generation (Daniel Elstner) +* Improvements to glibmm character conversions (Daniel Elstner) +* gtk-demo segfault fixed. (Martin Schulze) + +2002-04-27 gtkmm 1.3.12: + +* Many many fixes for Sun's Forte C++ compiler. + (Michael v. Szombathel, Daniel Elstner, Murray Cumming) +* StockID API improved and used more consistently. + (Martin Schultze, Daniel Elstner) +* Glib::ustring conversion improvements (Daniel Elstner) +* gtkmmproc improved for use in bonobomm. (Murray Cumming) +* Gdk::Point wrapper improved. (Martin Schulze) +* Gtk::Adjustment constructor fixed. (Murray Cumming) +* Gtk::TreeView:methods that took function pointers now take SigC::Slots. + (Murray Cumming) +* Less #including of C headers in gtkmm headers, so less pollution of the + global namespace. (Murray Cumming) +* Menu API more complete and consistent. (Martin Schultze) +* Gtk::Dialog::get_action_area() now does. (Murray Cumming) +* GType changes to allow libglade/libglademm cooperation. (Murray Cumming) +* Reference documentation: + - Stock IDs in HTML: + http://gtkmm.org/gtkmm2/reference/html/namespaceGtk_1_1Stock.html#a6 + - Makefile dependencies fixed for faster docs building. +* General API review. + +2002-04-13 gtkmm 1.3.11: + +* gdkmm.h: No longer includes non-existent files. (Daniel Elstner) +* Build: Non-cvs users don't need perl. (Daniel Elstner) +* glibmm: pkg-config now reports libgobject for linking. (Murray Cumming). + +2002-04-11 gtkmm 1.3.10: + +* Now builds with {G,GDK,GTK}_DISABLE_DEPRECATED - some methods removed; + entirely removed Gdk::Font and Gtk::Progress. (Daniel Elstner) +* Reference documentation: + - Some automatic C->C++ conversion when reusing C reference documentation: + - enums and flags grouped together. + - html post-processed to produce "int& someint" instead of "int &someint". + - Some example code merged into the refernce docs. + (Daniel Elstner) +* Gtk::TreeView: + - Gtk::TreeIter is a bit more like a STL iterator. + - Gtk::ListStore has a more STL-like interface. + - Gtk::TreeModelColumn - new class used to contain column type and number. + - Gtk::TreeModelColumnRecord - new class to contain all TreeModelColumns. + - examples/demos updated accordingly. + (Daniel Elstner) +* gtkmm now uses its own enums, in the Gtk namespace. (Daniel Elstner) +* Gtk::ProgressBar: removed deprecated Adjustment stuff, leaving just the + new fraction-orientated interface. (Daniel Elstner) +* Some .hg format changes needed by bonobomm. (Murray Cumming) +* new Glib::IOSource for watching file descriptor. (Martin Schultze) + +2002-03-27 gtkmm 1.3.9: + +* Custom Signal Proxies simplified, implementing only custom C callback + functions and specifying them to the signal proxy constructors. + (Daniel Elstner) +* Complete recoding of Boxed Types wrappers, not using generic _copy + and _free methods functions when they aren't necessary, and sometimes + inheriting directly from the underlying struct. (Daniel Elstner) +* gtk-demo compilation fixed. (Daniel Elstner) +* gtk-demo stock browser part rewritten and working. (Matthew Walton) +* Properly implemented enum and flags property proxies. (Daniel Elstner). +* Reference documentation: + - some gtk+ docs are now merged in automatically, but we don't yet + have acccess to the stuff in gtk+'s tmpl/*.sgml files. + (Murray Cumming) + - Added class documentation, based on docs in GTK+. + - Custom headers and footers. (Paolo Pinto) +* Added Gtk::TreeSortable, Gtk::TreeDragDest, and Gtk::TreeDragSource + interface wrappers. (Murray Cumming) +* Gdk::Pixbuf: render* method args are now const-correct, which allows + casting of temporary instances. (Murray Cumming) +* Gtk::MessageDialog: changed argument order in constructors, to + allow sensible defaults. (Murray Cumming) + +2002-03-11 gtkmm 1.3.8: + +* Generated C++ source code is now distributed, so that we can use extra + dependencies, such as perl modules, when generating the C++ source. + (Daniel Elstner) +* Signals now use C++ types. We've said it before, but this time we meant it. + (Murray Cumming) +* Added an exception hierarchy, used to wrap GError. Used in + Gdk::Pixbuf and demonstrated in demos/pixbuf-demo. (Daniel Elstner). +* Drag and Drop now wrapped, with examples, and the first draft of a chapter in + the tutorial: + http://gtkmm.sourceforge.net//gtkmm2/tutorial/html/ch12.html + (Murray Cumming) +* Revised Gtk::Menu API - accelerators now work. (Andreas Holzmann) +* Glib::ustring can now be used directly with standard streams, converting + to the current locale where necessary. (Daniel Elstner) +* Added wrappers for glib conversion functions. (Daniel Elstner) +* Initial GtkClipboard wrapper. (Murray Cumming) +* Simplified checks for standard library features (Daniel Elstner) + + + +2002-02-24 gtkmm-1.3.7: + +* operator=() for BoxedTypes improved. (Daniel Elstner) +* pangomm api review, and use of generic intermediate ListHandle containers. + for method arguments instead of just std::list. (Gergo Erdi) +* Gdk::Cursor constructor now public. (Andreas Holzmann) +* property.get_value() improved. (Andreas Holzmann) +* New wrappers for Atk::Relation, Atk::RelationSet, and Atk::StateSet. + (Murray Cumming) +* Glib::ustring documentation and case conversion methods. + (Daniel Elstner) +* Improvements to ListHandle generic intermediate containers. + (Daniel Elstner) +* Gtk::TreeModel: several methods now take C++ arguments instead of C types. + (Murray Cumming) +* Build fails on failed m4 conversions. (Daniel Elstner) + + +2002-02-20 gtkmm-1.3.6: + +No major changes - mostly just a workaround for gcc 2.95.4. + +* gcc 2.95.4 seems to have a problem with a use +of RefPtr::operator bool() in textbuffer.cc, so +we've used is_null() as a workaround. This is mysterious. +* configure.in mentioned a Makefile.am that isn't distributed. +* Added examples/book, which will contain examples from the + +2002-02-18 gtkmm-1.3.5: +* Tutorial converted to latest DocBook XML, with some improvements of the text. + (Murray Cumming) +* Examples can be built all at once. Some use of deprecated widgets removed. + (Murray Cumming) +* Gdk::Cursor: Gdk::Color args are now const. (Andreas Holzmann) +* Toolbar: StockElem can now be used to add stock items to toolbars. + (Andreas Holzmann) +* Gdk::Bitmap now derives from Gdk::Pixmap, allowing a Bitmap to be used + anywhere that a Pixmap can be used. This is the intention in GTK+. + (Murray Cumming, Andreas Holzmann) +* Gtk::TextBuffer improvements (Daniel Elstner) +* More wrapping of Atk::Object (Murray Cumming) +* Documentation overview page: + http://gtkmm.sourceforge.net/gtkmm2/ + (Paulo Pinto) + +2002-01-26 gtkmm-1.3.4: + +* Removed deprecated widgets such as CList, CTree, Text, etc. (Murray Cumming) +* Some exception handling: Use Glib::add_exception_handler() to specify a method to be called in the unlikely event that a signal handler throws an exception. If it's not used then gtkmm will report the problem and then segfault normally. Previously the exception would just be swallowed by the underlying C code and you'd have an uniformative segfault. + (Karl Nelson) +* Menu Elements: Menu Elements can now be stored in STL containers. Fixed rare memory leak + (Karl Nelson) +* Improved, clearer, more versatile intermediate handle types, for lists/vectors/arrays of strings/widgets etc. + (Daniel Elstner) +* Improved reference documentation: Signal accessors show the names of the signal handler arguments, and Widgets, Containers, and Dialogs can be seen grouped toether on their own special pages. + (Murray Cumming) +* Improved Gtk::TreeView and Gtk::TextView API, using more C++ types. (Murray Cumming, Daniel Elstner). + + +2002-01-10 gtkmm-1.3.3: + +* Interface methods use C++ types: + Interfaces now have a something_vfunc() which uses C types and which can be overridden to change the behaviour, and something() which uses C++ types and can be used to invoke the virtual function. This seems like the best mix of efficiency and convenience. (Murray Cumming) +* Property change notification: + Added changed signal to property proxies. For instance, you can now do: + something.property_example().signal_changed().connect( ... ). + (Murray Cumming) +* Simplified inheritance hierarchy: + Glib::ObjectBase derives from SigC::Object, thus Glib::Object no longer needs to derive from SigC::Object by using Multiple Inheritance. (Daniel Elstner) + + +2001-12-28 gtkmm-1.3.2: + +* No more gint, gdouble, gfloat, glong: + We use normal C++ types instead. (Murray Cumming) +* Signals are now used via accessors, and SigC::slot() requires a reference to the instance instead of a pointer. + For instance, + gtkmm 1.2: button.clicked.connect(SigC::slot(this, &Something::somemethod)); + gtkmm 1.3: button.signal_clicked().connect(SigC::slot(*this, &Something::somemethod)); + (Karl Nelson) +* Properties are used via accessors. For instance: + someobject.property_something().set_value(2); + (Karl Nelson) +* Removed any uses of Glib::nstring: + We provide an additional method instead of allowing a null value. e.g. remove_something() instead of + set_something(0). (Daniel Elstner) +* Improved gtkmmproc installation: + For use by, for instance, libgnomeuimm and libgnomecanvasmm. (Murray Cumming) +* Menu wrappers updated for GTK+2. (Murray Cumming) +* Another gtkmmproc overhaul. It now detects more .defs format errors, warns about as yet unwrapped functions, + and is faster. (Karl Nelson) +* More api review and fixes. (Murray Cumming, Daniel Elstner, Gergo Erdi, Karl Nelson) + +Note also that we use a newer version of libsigc++-1.1 which contains some segfault-related fixes. + + +2001-11-28 gtkmm-1.3.1. + +* Properties ( e.g. someobject.property_something.set_value(2); ) (Murray Cumming) +* ListHandler (Use almost any std container where GTK+ takes/returns a GList*) (Daniel Elstner) +* TreeView and TextView wrappers, including multiply-inherited 'Interface' classes, such as Gtk::TreeModel + (Murray Cumming) +* gtk-demo: C++ version of the big new gtk+ demo that shows its own source code. + This demonstrates TreeView, TextView, and Pango, among other things. (Murray Cumming) +* Reference documentation, using doxygen: + http://gtkmm.sourceforge.net/gtkmm2/reference/html/ + (Murray Cumming) +* Gtk::Window no longer self-destructs. The bool return value of Gtk::Window::signal_delete_event now + determines whether the window will be hidden, not whether it will be destroyed. (Daniel Elstner) +* Gtk::Main::run(Gtk::Window& window): + Allows you to specify a main application window. The application will quit when that window is hidden. + (Murray Cumming) +* Lots and lots of API review. See our progress here: + http://cvs.gnome.org/bonsai/cvsblame.cgi?file=gtkmm-root/base/api_status.txt&rev=&root=/cvs/gnome + (Murray Cumming, Daniel Elstner, Gergo Erdi) +* We can now use either automake 1.4p5 (like the rest of GNOME2) or automake 1.5 (Daniel Elstner) +* Glib::ustring, which interoperates with std::string now has even more of the std::string interace. + (Daniel Elstner) +* Fixed the library names and the names reported by pkgconfig, for better co-existence with gtkmm 1.2. + (Gergo Erdi) + +Known problems: + gtk-demo crashes on exit with warnings. + gtk-demo "stock browser" doesn't work yet. + Gtk::TreePath(ustring) constructor seems to have problems - see the TODO comments in demos/gtk-demo/example_treeview_editable_cells.cc + + + +2001-10-26 gtkmm-1.3.0. + +Initial release, introducing: +* Glib::ustring +* Glib::RefPtr +* signal_ prefix +* Renamed default signal handlers (on_ prefix). +* Rewritten gdkmm diff --git a/libs/gtkmm2/PORTING b/libs/gtkmm2/PORTING new file mode 100644 index 0000000000..3210ff4418 --- /dev/null +++ b/libs/gtkmm2/PORTING @@ -0,0 +1,5 @@ +This should help people with some of the first problems that they are likely +to find when porting apps from gtkmm 1.2 to gtkmm 2: + +Some of these are explained in more details in the CHANGES file. + diff --git a/libs/gtkmm2/README b/libs/gtkmm2/README new file mode 100644 index 0000000000..b480135f39 --- /dev/null +++ b/libs/gtkmm2/README @@ -0,0 +1,3 @@ +This is gtkmm, a C++ API for GTK+. +See http://www.gtkmm.org/ + diff --git a/libs/gtkmm2/README.SUN b/libs/gtkmm2/README.SUN new file mode 100644 index 0000000000..971109707c --- /dev/null +++ b/libs/gtkmm2/README.SUN @@ -0,0 +1,88 @@ +Building gtkmm under Sun Solaris +================================ + +This README refers currently only to Sun Forte[tm] C++ compiler (WS6U2) +under Solaris 8/Sparc. + +The described procedure to compile gtkmm with Sun's commercial C++ +compiler assumes the default compiler installation of Forte[tm] C++ 6 +update 2. Furthermore all currently available product and adequate SunOS +patches for Forte[tm] C++ 6 update 2, which can be donwload from the +links given at http://access1.sun.com/sundev/fdp6u2-patches.html, have +to be applied. After that your compiler should give the following +version information: + + $ CC -V + CC: Sun WorkShop 6 update 2 C++ 5.3 Patch 111685-10 2002/09/16 + +You will not be able to compile gtkmm with the unpatched compiler +installation. Also, it is important to hide any gcc installation +from your PATH. + + +The installation procedure: + +* Recent versions of the following GNU utilities should be avalaible in + your PATH: + + make (3.79.1) + libtool (1.4.2) + m4 (1.4) + perl (5.6.1) + + The version information (in brackets) apply to my GNU installation. + +* Assuming your compiler installation is in /opt/SUNWspro, the following + environment changes are required: + + PATH=/opt/SUNWspro/bin:$PATH + LD_LIBRARY_PATH=/opt/SUNWspro/bin:$LD_LIBRARY_PATH + export PATH LD_LIBRARY_PATH + + CC="cc" + CXX="CC" + LD="CC" + CFLAGS="-g" or "-g -xO3" for better optimization + CXXFLAGS="-g" or "-g -O3" for better optimization + export CC CXX LD CFLAGS CXXFLAGS + +* Select an installation directory ($PREFIX). + +* The image libraries jpeg-6b, libpng-1.2.5 and tiff-v3.5.7 are pre- + requisites to build gtk+ libraries. They can be obtained from + www.sunfreeware.com or build from source. Compiling from source + requires some manual corrections (basically prefix settings in the + makefiles), because their build mechanism are rather old. All three + libraries should be build as shared libraries and installed to the + choosen installation directory. + +* gtk+-Installation. For each package of pkgconfig-0.12.0, glib-2.0.6, + atk-1.0.3, pango-1.0.4, gtk+-2.0.6 do: + + cd + CPPFLAGS=-I$PREFIX/include CFLAGS="-I$PREFIX/include $CFLAGS" \ + ./configure --prefix=$PREFIX + make + make install + +* gtkmm-Installation. For each package of libsigc++-1.2.x, gtkmm-2.0.x do: + + cd + ./configure --prefix=$PREFIX + make + make install + +* Verification can easily done by + + cd gtkmm-1.2.x/examples + make + + and testing all built executables. + + +Feel free to contact the gtkmm mailing list in case of problems compiling gtkmm under Sun +Solaris. + + +Michael v. Szombathely, 31-Oct-02 + \ No newline at end of file diff --git a/libs/gtkmm2/README.win32 b/libs/gtkmm2/README.win32 new file mode 100644 index 0000000000..46b6665790 --- /dev/null +++ b/libs/gtkmm2/README.win32 @@ -0,0 +1,69 @@ +Building gtkmm on Win32 +=========================== + +Currently, both the mingw (native win32) gcc compiler and MS Visual +Studio 2005 are supported. gtkmm can be built with mingw32-gcc using +the gnu autotools (automake, autoconf, libtool). As explicitly +stated in the gtk+ for win32 distribution (http://www.gimp.org/win32/), +the gcc compiler provided by the cygwin distribution should not be +used to build gtk+/gtkmm libraries and/or applications (see the +README.win32 that comes with the gtk+ DLLs). This MIGHT cause +conflicts between the cygwin and msvcrt runtime environments. + +1. Mingw + +The mingw distribution which has been tested with this release is the +following : + +* MinGW-4.1 as the base distribution. + +The bare mingw distribution does not provide the necessary tools (sh, perl, m4 +, autoconf, automake, ..) to run the provided configure script "as is". One +(currently non supported) solution is to use mingw in conjunction with msys, +which is readily available on the mingw website (http://www.mingw.org/). + +The preferred method is to combine the cygwin distribution (for the unix tools +that were mentioned above) with mingw by making sure that the mingw +tools (gcc, ld, dlltool, ..) are called first. + +First, make sure that you have working distribution of the native port +of both libsigc++-2.0.x and gtk+-2.0 on win32 (see +http://www.gimp.org/win32). If you can't compile a simple gtk+ example +using gcc and `pkg-config --cflags --libs`, you should not even think +about trying to compile gtkmm, let alone using precompiled libgtkmm +DLLs to port your gtkmm application ! + +The configure script can then be called using (as an example) the +following options + +./configure --prefix=/target --build=i386-pc-mingw32 --disable-static + +then + +make +make check +make install + +2. MS Visual Studio 2005 + +Open the gtkmm.sln solution file in the MSVC_Net2003 directory. In +the Tools/Options panel, add the appropriate GTK+, glibmm include and lib +directories to the Projects and Solutions/VC++ directories. Build the +solution. + +Important NOTE : to circumvent the C++ compiler bug described in this +bugzilla entry (http://bugzilla.gnome.org/show_bug.cgi?id=158040), it +is necessary to add '/vd2' to the list of compiler options when +building and/or using gtkmm with Visual Studio 2005. + +gtkmm-2.8 will probably not work correctly with Visual Studio 7.1 or +below because of the aforementioned bug. + +3. Gtkmm methods and signals not available on win32 + +All gtkmm methods and signals are available on win32. + +4. Gtkmm examples and demos on win32 + +All demos and examples compile/run on win32 + diff --git a/libs/gtkmm2/aclocal.m4 b/libs/gtkmm2/aclocal.m4 new file mode 100644 index 0000000000..a7514177f4 --- /dev/null +++ b/libs/gtkmm2/aclocal.m4 @@ -0,0 +1,7519 @@ +# generated automatically by aclocal 1.10 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +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.10], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 9 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 3 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; 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 10q "$mf" | grep '^#.*generated by automake' > /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 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.60])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +dnl +dnl Some macros needed for autoconf +dnl + + +AC_DEFUN([GLIBMM_CV_PERL_VERSION],[glibmm_cv_perl_version_[]m4_translit([$1],[.${}],[____])]) + + +AC_DEFUN([GLIBMM_CHECK_PERL], +[ + glibmm_perl_result=no + + AC_PATH_PROGS([PERL_PATH], [perl perl5], [not found]) + + if test "x$PERL_PATH" != "xnot found"; then + { + AC_CACHE_CHECK( + [whether Perl is new enough], + GLIBMM_CV_PERL_VERSION([$1]), + [ + ]GLIBMM_CV_PERL_VERSION([$1])[=no + "$PERL_PATH" -e "require v$1; exit 0;" >/dev/null 2>&1 && ]GLIBMM_CV_PERL_VERSION([$1])[=yes + ]) + test "x${GLIBMM_CV_PERL_VERSION([$1])}" = xyes && glibmm_perl_result=yes + } + else + { + # Make sure we have something sensible, even if it doesn't work. + PERL_PATH=perl + } + fi + + if test "x$glibmm_perl_result" = xno && test "x$USE_MAINTAINER_MODE" = xyes; then + { + AC_MSG_ERROR([[ +*** Perl >= ]$1[ is required for building $PACKAGE in maintainer-mode. +]]) + } + fi + + AC_SUBST([PERL_PATH]) +]) + + +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +# serial 48 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl + +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + AC_PATH_MAGIC + fi + ;; +esac + +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +enable_win32_dll=yes, enable_win32_dll=no) + +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP + + +# _LT_AC_SYS_COMPILER +# ------------------- +AC_DEFUN([_LT_AC_SYS_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_AC_SYS_COMPILER + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX + + +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT + + +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +[_LT_AC_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +echo=${ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +fi + +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(ECHO) +])])# _LT_AC_PROG_ECHO_BACKSLASH + + +# _LT_AC_LOCK +# ----------- +AC_DEFUN([_LT_AC_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +[*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; + ]) +esac + +need_locks="$enable_libtool_lock" + +])# _LT_AC_LOCK + + +# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +[AC_REQUIRE([LT_AC_PROG_SED]) +AC_CACHE_CHECK([$1], [$2], + [$2=no + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + 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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $rm conftest* +]) + +if test x"[$]$2" = xyes; then + ifelse([$5], , :, [$5]) +else + ifelse([$6], , :, [$6]) +fi +])# AC_LIBTOOL_COMPILER_OPTION + + +# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ------------------------------------------------------------ +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +[AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + ifelse([$4], , :, [$4]) +else + ifelse([$5], , :, [$5]) +fi +])# AC_LIBTOOL_LINKER_OPTION + + +# AC_LIBTOOL_SYS_MAX_CMD_LEN +# -------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +[# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +])# AC_LIBTOOL_SYS_MAX_CMD_LEN + + +# _LT_AC_CHECK_DLFCN +# ------------------ +AC_DEFUN([_LT_AC_CHECK_DLFCN], +[AC_CHECK_HEADERS(dlfcn.h)dnl +])# _LT_AC_CHECK_DLFCN + + +# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# --------------------------------------------------------------------- +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + exit (status); +}] +EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_AC_TRY_DLOPEN_SELF + + +# AC_LIBTOOL_DLOPEN_SELF +# ---------------------- +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +])# AC_LIBTOOL_DLOPEN_SELF + + +# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) +# --------------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler +AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* +]) +])# AC_LIBTOOL_PROG_CC_C_O + + +# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) +# ----------------------------------------- +# Check to see if we can do hard links to lock some files if needed +AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], +[AC_REQUIRE([_LT_AC_LOCK])dnl + +hard_links="nottested" +if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS + + +# AC_LIBTOOL_OBJDIR +# ----------------- +AC_DEFUN([AC_LIBTOOL_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +])# AC_LIBTOOL_OBJDIR + + +# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) +# ---------------------------------------------- +# Check hardcoding attributes. +AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_AC_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ + test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ + test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_AC_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_AC_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_AC_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH + + +# AC_LIBTOOL_SYS_LIB_STRIP +# ------------------------ +AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], +[striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +])# AC_LIBTOOL_SYS_LIB_STRIP + + +# AC_LIBTOOL_SYS_DYNAMIC_LINKER +# ----------------------------- +# PORTME Fill in your ld.so characteristics +AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], +[AC_MSG_CHECKING([dynamic linker characteristics]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[123]]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + 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}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +knetbsd*-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='GNU ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx*) + 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=yes + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi +])# AC_LIBTOOL_SYS_DYNAMIC_LINKER + + +# _LT_AC_TAGCONFIG +# ---------------- +AC_DEFUN([_LT_AC_TAGCONFIG], +[AC_ARG_WITH([tags], + [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], + [include additional configurations @<:@automatic@:>@])], + [tagnames="$withval"]) + +if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then + AC_MSG_WARN([output file `$ofile' does not exist]) + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then + AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) + else + AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) + fi + fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for tagname in $tagnames; do + IFS="$lt_save_ifs" + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in + "") ;; + *) AC_MSG_ERROR([invalid tag name: $tagname]) + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then + AC_MSG_ERROR([tag name \"$tagname\" already exists]) + fi + + # Update the list of available tags. + if test -n "$tagname"; then + echo appending configuration tag \"$tagname\" to $ofile + + case $tagname in + CXX) + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_LIBTOOL_LANG_CXX_CONFIG + else + tagname="" + fi + ;; + + F77) + if test -n "$F77" && test "X$F77" != "Xno"; then + AC_LIBTOOL_LANG_F77_CONFIG + else + tagname="" + fi + ;; + + GCJ) + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + AC_LIBTOOL_LANG_GCJ_CONFIG + else + tagname="" + fi + ;; + + RC) + AC_LIBTOOL_LANG_RC_CONFIG + ;; + + *) + AC_MSG_ERROR([Unsupported tag name: $tagname]) + ;; + esac + + # Append the new tag name to the list of available tags. + if test -n "$tagname" ; then + available_tags="$available_tags $tagname" + fi + fi + done + IFS="$lt_save_ifs" + + # Now substitute the updated list of available tags. + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then + mv "${ofile}T" "$ofile" + chmod +x "$ofile" + else + rm -f "${ofile}T" + AC_MSG_ERROR([unable to update list of available tagged configurations.]) + fi +fi +])# _LT_AC_TAGCONFIG + + +# AC_LIBTOOL_DLOPEN +# ----------------- +# enable checks for dlopen support +AC_DEFUN([AC_LIBTOOL_DLOPEN], + [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) +])# AC_LIBTOOL_DLOPEN + + +# AC_LIBTOOL_WIN32_DLL +# -------------------- +# declare package support for building win32 DLLs +AC_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) +])# AC_LIBTOOL_WIN32_DLL + + +# AC_ENABLE_SHARED([DEFAULT]) +# --------------------------- +# implement the --enable-shared flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_SHARED], +[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([shared], + [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]AC_ENABLE_SHARED_DEFAULT) +])# AC_ENABLE_SHARED + + +# AC_DISABLE_SHARED +# ----------------- +# set the default shared flag to --disable-shared +AC_DEFUN([AC_DISABLE_SHARED], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_SHARED(no) +])# AC_DISABLE_SHARED + + +# AC_ENABLE_STATIC([DEFAULT]) +# --------------------------- +# implement the --enable-static flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_STATIC], +[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([static], + [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]AC_ENABLE_STATIC_DEFAULT) +])# AC_ENABLE_STATIC + + +# AC_DISABLE_STATIC +# ----------------- +# set the default static flag to --disable-static +AC_DEFUN([AC_DISABLE_STATIC], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_STATIC(no) +])# AC_DISABLE_STATIC + + +# AC_ENABLE_FAST_INSTALL([DEFAULT]) +# --------------------------------- +# implement the --enable-fast-install flag +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +AC_DEFUN([AC_ENABLE_FAST_INSTALL], +[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +AC_ARG_ENABLE([fast-install], + [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) +])# AC_ENABLE_FAST_INSTALL + + +# AC_DISABLE_FAST_INSTALL +# ----------------------- +# set the default to --disable-fast-install +AC_DEFUN([AC_DISABLE_FAST_INSTALL], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_ENABLE_FAST_INSTALL(no) +])# AC_DISABLE_FAST_INSTALL + + +# AC_LIBTOOL_PICMODE([MODE]) +# -------------------------- +# implement the --with-pic flag +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +AC_DEFUN([AC_LIBTOOL_PICMODE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +pic_mode=ifelse($#,1,$1,default) +])# AC_LIBTOOL_PICMODE + + +# AC_PROG_EGREP +# ------------- +# This is predefined starting with Autoconf 2.54, so this conditional +# definition can be removed once we require Autoconf 2.54 or later. +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi]) + EGREP=$ac_cv_prog_egrep + AC_SUBST([EGREP]) +])]) + + +# AC_PATH_TOOL_PREFIX +# ------------------- +# find a file program which can recognise shared library +AC_DEFUN([AC_PATH_TOOL_PREFIX], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="ifelse([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +])# AC_PATH_TOOL_PREFIX + + +# AC_PATH_MAGIC +# ------------- +# find a file program which can recognise a shared library +AC_DEFUN([AC_PATH_MAGIC], +[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# AC_PATH_MAGIC + + +# AC_PROG_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([AC_PROG_LD], +[AC_ARG_WITH([gnu-ld], + [AC_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no]) +AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be Linux ELF. +linux*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + 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 + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +nto-qnx*) + lt_cv_deplibs_check_method=unknown + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown +])# AC_DEPLIBS_CHECK_METHOD + + +# AC_PROG_NM +# ---------- +# find the pathname to a BSD-compatible name lister +AC_DEFUN([AC_PROG_NM], +[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +fi]) +NM="$lt_cv_path_NM" +])# AC_PROG_NM + + +# AC_CHECK_LIBM +# ------------- +# check for math library +AC_DEFUN([AC_CHECK_LIBM], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +])# AC_CHECK_LIBM + + +# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) +# ----------------------------------- +# sets LIBLTDL to the link flags for the libltdl convenience library and +# LTDLINCL to the include flags for the libltdl header and adds +# --enable-ltdl-convenience to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# it is assumed to be `libltdl'. LIBLTDL will be prefixed with +# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' +# (note the single quotes!). If your package is not flat and you're not +# using automake, define top_builddir and top_srcdir appropriately in +# the Makefiles. +AC_DEFUN([AC_LIBLTDL_CONVENIENCE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + case $enable_ltdl_convenience in + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; + "") enable_ltdl_convenience=yes + ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; + esac + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" +])# AC_LIBLTDL_CONVENIENCE + + +# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) +# ----------------------------------- +# sets LIBLTDL to the link flags for the libltdl installable library and +# LTDLINCL to the include flags for the libltdl header and adds +# --enable-ltdl-install to the configure arguments. Note that +# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, +# and an installed libltdl is not found, it is assumed to be `libltdl'. +# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with +# '${top_srcdir}/' (note the single quotes!). If your package is not +# flat and you're not using automake, define top_builddir and top_srcdir +# appropriately in the Makefiles. +# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +AC_DEFUN([AC_LIBLTDL_INSTALLABLE], +[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_CHECK_LIB(ltdl, lt_dlinit, + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], + [if test x"$enable_ltdl_install" = xno; then + AC_MSG_WARN([libltdl not installed, but installation disabled]) + else + enable_ltdl_install=yes + fi + ]) + if test x"$enable_ltdl_install" = x"yes"; then + ac_configure_args="$ac_configure_args --enable-ltdl-install" + LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) + else + ac_configure_args="$ac_configure_args --enable-ltdl-install=no" + LIBLTDL="-lltdl" + LTDLINCL= + fi + # For backwards non-gettext consistent compatibility... + INCLTDL="$LTDLINCL" +])# AC_LIBLTDL_INSTALLABLE + + +# AC_LIBTOOL_CXX +# -------------- +# enable support for C++ libraries +AC_DEFUN([AC_LIBTOOL_CXX], +[AC_REQUIRE([_LT_AC_LANG_CXX]) +])# AC_LIBTOOL_CXX + + +# _LT_AC_LANG_CXX +# --------------- +AC_DEFUN([_LT_AC_LANG_CXX], +[AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) +])# _LT_AC_LANG_CXX + +# _LT_AC_PROG_CXXCPP +# ------------------ +AC_DEFUN([_LT_AC_PROG_CXXCPP], +[ +AC_REQUIRE([AC_PROG_CXX]) +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +fi +])# _LT_AC_PROG_CXXCPP + +# AC_LIBTOOL_F77 +# -------------- +# enable support for Fortran 77 libraries +AC_DEFUN([AC_LIBTOOL_F77], +[AC_REQUIRE([_LT_AC_LANG_F77]) +])# AC_LIBTOOL_F77 + + +# _LT_AC_LANG_F77 +# --------------- +AC_DEFUN([_LT_AC_LANG_F77], +[AC_REQUIRE([AC_PROG_F77]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) +])# _LT_AC_LANG_F77 + + +# AC_LIBTOOL_GCJ +# -------------- +# enable support for GCJ libraries +AC_DEFUN([AC_LIBTOOL_GCJ], +[AC_REQUIRE([_LT_AC_LANG_GCJ]) +])# AC_LIBTOOL_GCJ + + +# _LT_AC_LANG_GCJ +# --------------- +AC_DEFUN([_LT_AC_LANG_GCJ], +[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], + [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], + [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], + [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) +])# _LT_AC_LANG_GCJ + + +# AC_LIBTOOL_RC +# ------------- +# enable support for Windows resource files +AC_DEFUN([AC_LIBTOOL_RC], +[AC_REQUIRE([LT_AC_PROG_RC]) +_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) +])# AC_LIBTOOL_RC + + +# AC_LIBTOOL_LANG_C_CONFIG +# ------------------------ +# Ensure that the configuration vars for the C compiler are +# suitably defined. Those variables are subsequently used by +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) +AC_DEFUN([_LT_AC_LANG_C_CONFIG], +[lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_AC_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}\n' + +_LT_AC_SYS_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) +AC_LIBTOOL_PROG_COMPILER_PIC($1) +AC_LIBTOOL_PROG_CC_C_O($1) +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) +AC_LIBTOOL_SYS_LIB_STRIP +AC_LIBTOOL_DLOPEN_SELF + +# Report which library types will actually be built +AC_MSG_CHECKING([if libtool supports shared libraries]) +AC_MSG_RESULT([$can_build_shared]) + +AC_MSG_CHECKING([whether to build shared libraries]) +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case $host_os in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +AC_MSG_RESULT([$enable_shared]) + +AC_MSG_CHECKING([whether to build static libraries]) +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +AC_MSG_RESULT([$enable_static]) + +AC_LIBTOOL_CONFIG($1) + +AC_LANG_POP +CC="$lt_save_CC" +])# AC_LIBTOOL_LANG_C_CONFIG + + +# AC_LIBTOOL_LANG_CXX_CONFIG +# -------------------------- +# Ensure that the configuration vars for the C compiler are +# suitably defined. Those variables are subsequently used by +# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. +AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) +AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], +[AC_LANG_PUSH(C++) +AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([_LT_AC_PROG_CXXCPP]) + +_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_AC_TAGVAR(allow_undefined_flag, $1)= +_LT_AC_TAGVAR(always_export_symbols, $1)=no +_LT_AC_TAGVAR(archive_expsym_cmds, $1)= +_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_AC_TAGVAR(hardcode_direct, $1)=no +_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= +_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= +_LT_AC_TAGVAR(hardcode_minus_L, $1)=no +_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_AC_TAGVAR(hardcode_automatic, $1)=no +_LT_AC_TAGVAR(module_cmds, $1)= +_LT_AC_TAGVAR(module_expsym_cmds, $1)= +_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown +_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_AC_TAGVAR(no_undefined_flag, $1)= +_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= +_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Dependencies to place before and after the object being linked: +_LT_AC_TAGVAR(predep_objects, $1)= +_LT_AC_TAGVAR(postdep_objects, $1)= +_LT_AC_TAGVAR(predeps, $1)= +_LT_AC_TAGVAR(postdeps, $1)= +_LT_AC_TAGVAR(compiler_lib_search_path, $1)= + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_AC_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_AC_SYS_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_LD=$LD +lt_save_GCC=$GCC +GCC=$GXX +lt_save_with_gnu_ld=$with_gnu_ld +lt_save_path_LD=$lt_cv_path_LD +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +else + $as_unset lt_cv_prog_gnu_ld +fi +if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX +else + $as_unset lt_cv_path_LD +fi +test -z "${LDCXX+set}" || LD=$LDCXX +CC=${CXX-"c++"} +compiler=$CC +_LT_AC_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) + +# We don't want -fno-exception wen compiling C++ code, so set the +# no_builtin_flag separately +if test "$GXX" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' +else + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= +fi + +if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + AC_PROG_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ + grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +else + GXX=no + with_gnu_ld=no + wlarc= +fi + +# PORTME: fill in a description of your system's C++ link characteristics +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +_LT_AC_TAGVAR(ld_shlibs, $1)=yes +case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_AC_TAGVAR(archive_cmds, $1)='' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + freebsd[[12]]*) + # C++ shared libraries reported to be fairly broken before switch to ELF + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + freebsd-elf*) + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + ;; + gnu*) + ;; + hpux9*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + ;; + *) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + linux*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc*) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC*) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac + ;; + lynxos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + m88k*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + openbsd2*) + # C++ shared libraries are fairly broken + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + psos*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + fi + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + fi + ;; + esac + ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + vxworks*) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; +esac +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_AC_TAGVAR(GCC, $1)="$GXX" +_LT_AC_TAGVAR(LD, $1)="$LD" + +AC_LIBTOOL_POSTDEP_PREDEP($1) +AC_LIBTOOL_PROG_COMPILER_PIC($1) +AC_LIBTOOL_PROG_CC_C_O($1) +AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) +AC_LIBTOOL_PROG_LD_SHLIBS($1) +AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) +AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) + +AC_LIBTOOL_CONFIG($1) + +AC_LANG_POP +CC=$lt_save_CC +LDCXX=$LD +LD=$lt_save_LD +GCC=$lt_save_GCC +with_gnu_ldcxx=$with_gnu_ld +with_gnu_ld=$lt_save_with_gnu_ld +lt_cv_path_LDCXX=$lt_cv_path_LD +lt_cv_path_LD=$lt_save_path_LD +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +])# AC_LIBTOOL_LANG_CXX_CONFIG + +# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) +# ------------------------------------ +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" +ifelse([$1], [], +[#! $SHELL + +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# +# This file is part of GNU Libtool: +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="$SED -e 1s/^X//" + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# The names of the tagged configurations supported by this script. +available_tags= + +# ### BEGIN LIBTOOL CONFIG], +[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) + +# Is the compiler the GNU C compiler? +with_gcc=$_LT_AC_TAGVAR(GCC, $1) + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_[]_LT_AC_TAGVAR(LD, $1) + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1) + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1) +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) + +# Commands used to build and install a shared archive. +archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) +archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) +module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" + +# Set to yes if exported symbols are required. +always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) + +# The commands to list exported symbols. +export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1) + +# Symbols that must always be exported. +include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) + +ifelse([$1],[], +[# ### END LIBTOOL CONFIG], +[# ### END LIBTOOL TAG CONFIG: $tagname]) + +__EOF__ + +ifelse([$1],[], [ + case $host_os in + aix3*) + cat <<\EOF >> "$cfgfile" + +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +EOF + ;; + esac + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || \ + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +]) +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi +])# AC_LIBTOOL_CONFIG + + +# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------------------- +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], +[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl + +_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + + AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI + + +# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +# --------------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_NM]) +AC_REQUIRE([AC_OBJEXT]) +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Transform an extracted symbol line into a proper C declaration +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) # Its linker distinguishes data from code symbols + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +linux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDGIRSTW]]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if grep ' nm_test_var$' "$nlist" >/dev/null; then + if grep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + + cat <> conftest.$ac_ext +#if defined (__STDC__) && __STDC__ +# define lt_ptr_t void * +#else +# define lt_ptr_t char * +# define const +#endif + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + lt_ptr_t address; +} +lt_preloaded_symbols[[]] = +{ +EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext + cat <<\EOF >> conftest.$ac_ext + {0, (lt_ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -f conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi +]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE + + +# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) +# --------------------------------------- +AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], +[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= + +AC_MSG_CHECKING([for $compiler option to produce PIC]) + ifelse([$1],[CXX],[ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix4* | aix5*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + icpc* | ecpc*) + # Intel C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC*) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + esac + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + newsos6) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + linux*) + case $cc_basename in + icc* | ecc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then + AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], + _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +# +# Check to make sure the static flag actually works. +# +wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" +AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) +]) + + +# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) +# ------------------------------------ +# See if the linker supports building shared libraries. +AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], +[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +ifelse([$1],[CXX],[ + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix4* | aix5*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw*) + _LT_AC_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' + ;; + *) + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +],[ + runpath_var= + _LT_AC_TAGVAR(allow_undefined_flag, $1)= + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)= + _LT_AC_TAGVAR(archive_expsym_cmds, $1)= + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= + _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_minus_L, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown + _LT_AC_TAGVAR(hardcode_automatic, $1)=no + _LT_AC_TAGVAR(module_cmds, $1)= + _LT_AC_TAGVAR(module_expsym_cmds, $1)= + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_AC_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + _LT_CC_BASENAME([$compiler]) + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + else + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_AC_TAGVAR(archive_cmds, $1)='' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + else + # We have old collect2 + _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_AC_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + # see comment about different semantics on the GNU ld section + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + bsdi[[45]]*) + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[[012]]) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_automatic, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi + ;; + + dgux*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + freebsd1*) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | kfreebsd*-gnu | dragonfly*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + openbsd*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + wlarc='' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; + esac + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_AC_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_AC_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no + ;; + esac + fi +]) +AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) +test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +# +# Do we need to explicitly link libc? +# +case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_AC_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) + _LT_AC_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) + then + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) + ;; + esac + fi + ;; +esac +])# AC_LIBTOOL_PROG_LD_SHLIBS + + +# _LT_AC_FILE_LTDLL_C +# ------------------- +# Be careful that the start marker always follows a newline. +AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ +# /* ltdll.c starts here */ +# #define WIN32_LEAN_AND_MEAN +# #include +# #undef WIN32_LEAN_AND_MEAN +# #include +# +# #ifndef __CYGWIN__ +# # ifdef __CYGWIN32__ +# # define __CYGWIN__ __CYGWIN32__ +# # endif +# #endif +# +# #ifdef __cplusplus +# extern "C" { +# #endif +# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); +# #ifdef __cplusplus +# } +# #endif +# +# #ifdef __CYGWIN__ +# #include +# DECLARE_CYGWIN_DLL( DllMain ); +# #endif +# HINSTANCE __hDllInstance_base; +# +# BOOL APIENTRY +# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +# { +# __hDllInstance_base = hInst; +# return TRUE; +# } +# /* ltdll.c ends here */ +])# _LT_AC_FILE_LTDLL_C + + +# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) +# --------------------------------- +AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) + + +# old names +AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) +AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) +AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) +AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) +AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) + +# This is just to silence aclocal about the macro not being used +ifelse([AC_DISABLE_FAST_INSTALL]) + +AC_DEFUN([LT_AC_PROG_GCJ], +[AC_CHECK_TOOL(GCJ, gcj, no) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS) +]) + +AC_DEFUN([LT_AC_PROG_RC], +[AC_CHECK_TOOL(RC, windres, no) +]) + +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +# LT_AC_PROG_SED +# -------------- +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +AC_DEFUN([LT_AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_MSG_RESULT([$SED]) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[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 + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +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 --errors-to-stdout --print-errors "$2"` + else + $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 + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES + +m4_include([scripts/docgen.m4]) +m4_include([scripts/macros.m4]) +m4_include([scripts/reduced.m4]) diff --git a/libs/gtkmm2/atk/.cvsignore b/libs/gtkmm2/atk/.cvsignore deleted file mode 100644 index e5d046710f..0000000000 --- a/libs/gtkmm2/atk/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.dylib diff --git a/libs/gtkmm2/atk/Makefile.am b/libs/gtkmm2/atk/Makefile.am new file mode 100644 index 0000000000..9cdcc63ed8 --- /dev/null +++ b/libs/gtkmm2/atk/Makefile.am @@ -0,0 +1,14 @@ +SUBDIRS = src atkmm + +EXTRA_DIST = README atkmm-1.6.pc.in + +atkmm_includedir = $(includedir)/atkmm-1.6 +atkmm_include_HEADERS = atkmm.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = atkmm-1.6.pc + + + + + diff --git a/libs/gtkmm2/atk/Makefile.in b/libs/gtkmm2/atk/Makefile.in new file mode 100644 index 0000000000..b8b2d806de --- /dev/null +++ b/libs/gtkmm2/atk/Makefile.in @@ -0,0 +1,576 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = atk +DIST_COMMON = README $(atkmm_include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/atkmm-1.6.pc.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = atkmm-1.6.pc +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(atkmm_includedir)" +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgconfig_DATA) +atkmm_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(atkmm_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = src atkmm +EXTRA_DIST = README atkmm-1.6.pc.in +atkmm_includedir = $(includedir)/atkmm-1.6 +atkmm_include_HEADERS = atkmm.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = atkmm-1.6.pc +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu atk/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +atkmm-1.6.pc: $(top_builddir)/config.status $(srcdir)/atkmm-1.6.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +install-atkmm_includeHEADERS: $(atkmm_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(atkmm_includedir)" || $(MKDIR_P) "$(DESTDIR)$(atkmm_includedir)" + @list='$(atkmm_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(atkmm_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(atkmm_includedir)/$$f'"; \ + $(atkmm_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(atkmm_includedir)/$$f"; \ + done + +uninstall-atkmm_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(atkmm_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(atkmm_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(atkmm_includedir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) $(HEADERS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(atkmm_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-atkmm_includeHEADERS install-pkgconfigDATA + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-atkmm_includeHEADERS uninstall-pkgconfigDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am \ + install-atkmm_includeHEADERS install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-atkmm_includeHEADERS \ + uninstall-pkgconfigDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/atk/README b/libs/gtkmm2/atk/README new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/gtkmm2/atk/atkmm-1.6.pc.in b/libs/gtkmm2/atk/atkmm-1.6.pc.in new file mode 100644 index 0000000000..b17fad5548 --- /dev/null +++ b/libs/gtkmm2/atk/atkmm-1.6.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: atkmm +Description: C++ wrapper for atk +Requires: glibmm-2.4 atk +Version: @VERSION@ +Libs: -L${libdir} -latkmm-1.6 +Cflags: -I${includedir}/atkmm-1.6 diff --git a/libs/gtkmm2/atk/atkmm/.cvsignore b/libs/gtkmm2/atk/atkmm/.cvsignore deleted file mode 100644 index 1edeb79fd1..0000000000 --- a/libs/gtkmm2/atk/atkmm/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.os diff --git a/libs/gtkmm2/atk/atkmm/Makefile.am b/libs/gtkmm2/atk/atkmm/Makefile.am new file mode 100644 index 0000000000..f48577b372 --- /dev/null +++ b/libs/gtkmm2/atk/atkmm/Makefile.am @@ -0,0 +1,31 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +SUBDIRS = private + +sublib_name = atkmm +sublib_libname = atkmm-1.6 +sublib_libversion = $(LIBGTKMM_SO_VERSION) +sublib_namespace = Atk +sublib_cflags = $(ATKMM_CFLAGS) +sublib_topdir = atk +sublib_win32_dlls_libs = + +sublib_files_extra_posix_cc = +sublib_files_extra_win32_cc = +sublib_files_extra_general_cc = init.cc +sublib_files_extra_general_deprecated_cc = + +sublib_files_extra_posix_h = +sublib_files_extra_win32_h = +sublib_files_extra_general_h = init.h +sublib_files_extra_general_deprecated_h = + +include $(top_srcdir)/build_shared/Makefile_build.am_fragment + +lib_LTLIBRARIES = libatkmm-1.6.la + +libatkmm_1_6_la_SOURCES = $(files_built_cc) $(files_extra_cc) +libatkmm_1_6_la_LDFLAGS = $(common_ldflags) +libatkmm_1_6_la_LIBADD = $(win32_dlls_extra_libs) $(ATKMM_LIBS) + diff --git a/libs/gtkmm2/atk/atkmm/Makefile.in b/libs/gtkmm2/atk/atkmm/Makefile.in new file mode 100644 index 0000000000..59f3fe20a0 --- /dev/null +++ b/libs/gtkmm2/atk/atkmm/Makefile.in @@ -0,0 +1,782 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(sublib_include_HEADERS) \ + $(top_srcdir)/build_shared/Makefile_build.am_fragment \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment +subdir = atk/atkmm +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(sublib_includedir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +@PLATFORM_WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +libatkmm_1_6_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) +am__libatkmm_1_6_la_SOURCES_DIST = action.cc component.cc document.cc \ + editabletext.cc hyperlink.cc hypertext.cc image.cc \ + implementor.cc noopobject.cc object.cc objectaccessible.cc \ + relation.cc relationset.cc selection.cc stateset.cc \ + streamablecontent.cc table.cc text.cc value.cc wrap_init.cc \ + init.cc +am__objects_1 = action.lo component.lo document.lo editabletext.lo \ + hyperlink.lo hypertext.lo image.lo implementor.lo \ + noopobject.lo object.lo objectaccessible.lo relation.lo \ + relationset.lo selection.lo stateset.lo streamablecontent.lo \ + table.lo text.lo value.lo +am__objects_2 = +@OS_WIN32_FALSE@am__objects_3 = $(am__objects_1) $(am__objects_2) \ +@OS_WIN32_FALSE@ $(am__objects_2) +@OS_WIN32_TRUE@am__objects_3 = $(am__objects_1) $(am__objects_2) \ +@OS_WIN32_TRUE@ $(am__objects_2) +am__objects_4 = $(am__objects_3) wrap_init.lo +am__objects_5 = init.lo +@OS_WIN32_FALSE@am__objects_6 = $(am__objects_2) $(am__objects_5) +@OS_WIN32_TRUE@am__objects_6 = $(am__objects_2) $(am__objects_5) +am_libatkmm_1_6_la_OBJECTS = $(am__objects_4) $(am__objects_6) +libatkmm_1_6_la_OBJECTS = $(am_libatkmm_1_6_la_OBJECTS) +libatkmm_1_6_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libatkmm_1_6_la_LDFLAGS) $(LDFLAGS) -o $@ +depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libatkmm_1_6_la_SOURCES) +DIST_SOURCES = $(am__libatkmm_1_6_la_SOURCES_DIST) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +sublib_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(sublib_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ -DG_LOG_DOMAIN=\"$(sublib_name)\" $(extra_win32_defines) +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = private +sublib_name = atkmm +sublib_libname = atkmm-1.6 +sublib_libversion = $(LIBGTKMM_SO_VERSION) +sublib_namespace = Atk +sublib_cflags = $(ATKMM_CFLAGS) +sublib_topdir = atk +sublib_win32_dlls_libs = +sublib_files_extra_posix_cc = +sublib_files_extra_win32_cc = +sublib_files_extra_general_cc = init.cc +sublib_files_extra_general_deprecated_cc = +sublib_files_extra_posix_h = +sublib_files_extra_win32_h = +sublib_files_extra_general_h = init.h +sublib_files_extra_general_deprecated_h = +files_posix_hg = +files_win32_hg = +files_general_hg = action.hg component.hg document.hg editabletext.hg hyperlink.hg hypertext.hg image.hg \ + implementor.hg noopobject.hg object.hg objectaccessible.hg relation.hg relationset.hg selection.hg \ + stateset.hg streamablecontent.hg table.hg text.hg value.hg + +files_general_deprecated_hg = +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +@PLATFORM_WIN32_FALSE@extra_win32_defines = + +# Support for DLL on mingw using libtool > 1.4 +# When creating DLLs on win32, we need to explicitly add a few extra +# libraries at link time to resolve symbols (remember a dll is like an +# executable). +@PLATFORM_WIN32_TRUE@extra_win32_defines = \ +@PLATFORM_WIN32_TRUE@ -D$(shell echo $(sublib_name) | tr [:lower:] [:upper:])_BUILD + +@PLATFORM_WIN32_FALSE@no_undefined = +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols +@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = +@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs) +common_ldflags = -version-info $(sublib_libversion) $(no_undefined) + +# All modules can include all other modules, +# for instance, so that gdkmm can use headers in pangomm. +all_includes = -I$(top_builddir)/$(sublib_topdir) -I$(top_srcdir)/$(sublib_topdir) \ + -I$(top_builddir)/pango -I$(top_srcdir)/pango \ + -I$(top_builddir)/atk -I$(top_srcdir)/atk \ + -I$(top_builddir)/gdk -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gtk -I$(top_srcdir)/gtk \ + $(sublib_cflags) $(GTHREAD_CFLAGS) + +dist_sources = $(files_all_built_cc) $(files_all_extra_cc) $(files_all_built_h) $(files_all_extra_h) +DISTFILES = $(DIST_COMMON) $(dist_sources) $(TEXINFOS) $(EXTRA_DIST) +DEFAULT_INCLUDES = + +# DISABLE_DEPRECATED_CFLAGS and DISABLE_DEPRECATED_API_CFLAGS are empty unless the appropriate --enable-*=no options are specified to configure: +INCLUDES = $(strip $(all_includes)) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) +sublib_includedir = $(includedir)/$(sublib_libname)/$(sublib_name) +sublib_include_HEADERS = $(files_all_built_h) $(files_all_extra_h) +lib_LTLIBRARIES = libatkmm-1.6.la +libatkmm_1_6_la_SOURCES = $(files_built_cc) $(files_extra_cc) +libatkmm_1_6_la_LDFLAGS = $(common_ldflags) +libatkmm_1_6_la_LIBADD = $(win32_dlls_extra_libs) $(ATKMM_LIBS) +all: all-recursive + +.SUFFIXES: +.SUFFIXES: .cc .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_build.am_fragment $(srcdir)/../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atk/atkmm/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu atk/atkmm/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libatkmm-1.6.la: $(libatkmm_1_6_la_OBJECTS) $(libatkmm_1_6_la_DEPENDENCIES) + $(libatkmm_1_6_la_LINK) -rpath $(libdir) $(libatkmm_1_6_la_OBJECTS) $(libatkmm_1_6_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/component.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/document.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editabletext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hyperlink.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hypertext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/implementor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/noopobject.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objectaccessible.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relationset.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stateset.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/streamablecontent.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/value.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrap_init.Plo@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-sublib_includeHEADERS: $(sublib_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(sublib_includedir)" || $(MKDIR_P) "$(DESTDIR)$(sublib_includedir)" + @list='$(sublib_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(sublib_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sublib_includedir)/$$f'"; \ + $(sublib_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sublib_includedir)/$$f"; \ + done + +uninstall-sublib_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(sublib_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(sublib_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(sublib_includedir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sublib_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-sublib_includeHEADERS + +install-dvi: install-dvi-recursive + +install-exec-am: install-libLTLIBRARIES + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-sublib_includeHEADERS installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS + + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_all_built_cc) $(files_all_built_h)) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/atk/atkmm/action.cc b/libs/gtkmm2/atk/atkmm/action.cc index 9af6fe0e85..66585d57ef 100644 --- a/libs/gtkmm2/atk/atkmm/action.cc +++ b/libs/gtkmm2/atk/atkmm/action.cc @@ -37,7 +37,7 @@ namespace Glib Glib::RefPtr wrap(AtkAction* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -89,7 +89,7 @@ void Action_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED gboolean Action_Class::do_action_vfunc_callback(AtkAction* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -97,41 +97,44 @@ gboolean Action_Class::do_action_vfunc_callback(AtkAction* self, gint i) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->do_action_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->do_action_vfunc(i )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->do_action) + return (*base->do_action)(self, i); - // Call the original underlying C function: - if(base && base->do_action) - return (*base->do_action)(self, i); - } typedef gboolean RType; return RType(); } gint Action_Class::get_n_actions_vfunc_callback(AtkAction* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -139,40 +142,43 @@ gint Action_Class::get_n_actions_vfunc_callback(AtkAction* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_actions_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_actions_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_n_actions) + return (*base->get_n_actions)(self); - // Call the original underlying C function: - if(base && base->get_n_actions) - return (*base->get_n_actions)(self); - } typedef gint RType; return RType(); } const gchar* Action_Class::get_description_vfunc_callback(AtkAction* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -180,41 +186,44 @@ const gchar* Action_Class::get_description_vfunc_callback(AtkAction* self, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_description_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_description_vfunc(i ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_description) + return (*base->get_description)(self, i); - // Call the original underlying C function: - if(base && base->get_description) - return (*base->get_description)(self, i); - } typedef const gchar* RType; return RType(); } const gchar* Action_Class::get_name_vfunc_callback(AtkAction* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -222,41 +231,44 @@ const gchar* Action_Class::get_name_vfunc_callback(AtkAction* self, gint i) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_name_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_name_vfunc(i ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_name) + return (*base->get_name)(self, i); - // Call the original underlying C function: - if(base && base->get_name) - return (*base->get_name)(self, i); - } typedef const gchar* RType; return RType(); } const gchar* Action_Class::get_keybinding_vfunc_callback(AtkAction* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -264,41 +276,44 @@ const gchar* Action_Class::get_keybinding_vfunc_callback(AtkAction* self, gint i // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_keybinding_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_keybinding_vfunc(i ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_keybinding) + return (*base->get_keybinding)(self, i); - // Call the original underlying C function: - if(base && base->get_keybinding) - return (*base->get_keybinding)(self, i); - } typedef const gchar* RType; return RType(); } gboolean Action_Class::set_description_vfunc_callback(AtkAction* self, gint i, const gchar* desc) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -306,35 +321,38 @@ gboolean Action_Class::set_description_vfunc_callback(AtkAction* self, gint i, c // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_description_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_description_vfunc(i , Glib::convert_const_gchar_ptr_to_ustring(desc) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_description) + return (*base->set_description)(self, i, desc); - // Call the original underlying C function: - if(base && base->set_description) - return (*base->set_description)(self, i, desc); - } typedef gboolean RType; return RType(); diff --git a/libs/gtkmm2/atk/atkmm/action.h b/libs/gtkmm2/atk/atkmm/action.h index c31a2c9e31..a9513f7701 100644 --- a/libs/gtkmm2/atk/atkmm/action.h +++ b/libs/gtkmm2/atk/atkmm/action.h @@ -80,8 +80,14 @@ private: protected: Action(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Action(AtkAction* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -204,10 +210,13 @@ protected: namespace Glib { - /** @relates Atk::Action - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Action */ Glib::RefPtr wrap(AtkAction* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/component.cc b/libs/gtkmm2/atk/atkmm/component.cc index 8d51116bc1..088b381d73 100644 --- a/libs/gtkmm2/atk/atkmm/component.cc +++ b/libs/gtkmm2/atk/atkmm/component.cc @@ -51,7 +51,7 @@ namespace Glib Glib::RefPtr wrap(AtkComponent* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -110,7 +110,7 @@ void Component_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED guint Component_Class::add_focus_handler_vfunc_callback(AtkComponent* self, AtkFocusHandler handler) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -118,40 +118,43 @@ guint Component_Class::add_focus_handler_vfunc_callback(AtkComponent* self, AtkF // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->add_focus_handler_vfunc(handler); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->add_focus_handler_vfunc(handler); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_focus_handler) + return (*base->add_focus_handler)(self, handler); - // Call the original underlying C function: - if(base && base->add_focus_handler) - return (*base->add_focus_handler)(self, handler); - } typedef guint RType; return RType(); } gboolean Component_Class::contains_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -159,43 +162,46 @@ gboolean Component_Class::contains_vfunc_callback(AtkComponent* self, gint x, gi // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->contains_vfunc(x + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->contains_vfunc(x , y , ((CoordType)(coord_type)) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->contains) + return (*base->contains)(self, x, y, coord_type); - // Call the original underlying C function: - if(base && base->contains) - return (*base->contains)(self, x, y, coord_type); - } typedef gboolean RType; return RType(); } AtkObject* Component_Class::ref_accessible_at_point_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -203,43 +209,46 @@ AtkObject* Component_Class::ref_accessible_at_point_vfunc_callback(AtkComponent* // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap_copy(obj->get_accessible_at_point_vfunc(x + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap_copy(obj->get_accessible_at_point_vfunc(x , y , ((CoordType)(coord_type)) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->ref_accessible_at_point) + return (*base->ref_accessible_at_point)(self, x, y, coord_type); - // Call the original underlying C function: - if(base && base->ref_accessible_at_point) - return (*base->ref_accessible_at_point)(self, x, y, coord_type); - } typedef AtkObject* RType; return RType(); } void Component_Class::get_extents_vfunc_callback(AtkComponent* self, gint* x, gint* y, gint* width, gint* height, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -247,42 +256,46 @@ void Component_Class::get_extents_vfunc_callback(AtkComponent* self, gint* x, gi // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_extents_vfunc(*(x) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_extents_vfunc(*(x) , *(y) , *(width) , *(height) , ((CoordType)(coord_type)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_extents) + (*base->get_extents)(self, x, y, width, height, coord_type); - // Call the original underlying C function: - if(base && base->get_extents) - (*base->get_extents)(self, x, y, width, height, coord_type); - } } void Component_Class::get_position_vfunc_callback(AtkComponent* self, gint* x, gint* y, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -290,40 +303,44 @@ void Component_Class::get_position_vfunc_callback(AtkComponent* self, gint* x, g // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_position_vfunc(*(x) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_position_vfunc(*(x) , *(y) , ((CoordType)(coord_type)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_position) + (*base->get_position)(self, x, y, coord_type); - // Call the original underlying C function: - if(base && base->get_position) - (*base->get_position)(self, x, y, coord_type); - } } void Component_Class::get_size_vfunc_callback(AtkComponent* self, gint* width, gint* height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -331,39 +348,43 @@ void Component_Class::get_size_vfunc_callback(AtkComponent* self, gint* width, g // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_size_vfunc(*(width) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_size_vfunc(*(width) , *(height) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_size) + (*base->get_size)(self, width, height); - // Call the original underlying C function: - if(base && base->get_size) - (*base->get_size)(self, width, height); - } } AtkLayer Component_Class::get_layer_vfunc_callback(AtkComponent* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -371,40 +392,43 @@ AtkLayer Component_Class::get_layer_vfunc_callback(AtkComponent* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return ((AtkLayer)(obj->get_layer_vfunc())); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return ((AtkLayer)(obj->get_layer_vfunc())); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_layer) + return (*base->get_layer)(self); - // Call the original underlying C function: - if(base && base->get_layer) - return (*base->get_layer)(self); - } typedef AtkLayer RType; return RType(); } gint Component_Class::get_mdi_zorder_vfunc_callback(AtkComponent* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -412,40 +436,43 @@ gint Component_Class::get_mdi_zorder_vfunc_callback(AtkComponent* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_mdi_zorder_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_mdi_zorder_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_mdi_zorder) + return (*base->get_mdi_zorder)(self); - // Call the original underlying C function: - if(base && base->get_mdi_zorder) - return (*base->get_mdi_zorder)(self); - } typedef gint RType; return RType(); } gboolean Component_Class::grab_focus_vfunc_callback(AtkComponent* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -453,40 +480,43 @@ gboolean Component_Class::grab_focus_vfunc_callback(AtkComponent* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->grab_focus_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->grab_focus_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->grab_focus) + return (*base->grab_focus)(self); - // Call the original underlying C function: - if(base && base->grab_focus) - return (*base->grab_focus)(self); - } typedef gboolean RType; return RType(); } void Component_Class::remove_focus_handler_vfunc_callback(AtkComponent* self, guint handler_id) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -494,37 +524,41 @@ void Component_Class::remove_focus_handler_vfunc_callback(AtkComponent* self, gu // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->remove_focus_handler_vfunc(handler_id); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->remove_focus_handler_vfunc(handler_id); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->remove_focus_handler) + (*base->remove_focus_handler)(self, handler_id); - // Call the original underlying C function: - if(base && base->remove_focus_handler) - (*base->remove_focus_handler)(self, handler_id); - } } gboolean Component_Class::set_extents_vfunc_callback(AtkComponent* self, gint x, gint y, gint width, gint height, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -532,45 +566,48 @@ gboolean Component_Class::set_extents_vfunc_callback(AtkComponent* self, gint x, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_extents_vfunc(x + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_extents_vfunc(x , y , width , height , ((CoordType)(coord_type)) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_extents) + return (*base->set_extents)(self, x, y, width, height, coord_type); - // Call the original underlying C function: - if(base && base->set_extents) - return (*base->set_extents)(self, x, y, width, height, coord_type); - } typedef gboolean RType; return RType(); } gboolean Component_Class::set_position_vfunc_callback(AtkComponent* self, gint x, gint y, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -578,43 +615,46 @@ gboolean Component_Class::set_position_vfunc_callback(AtkComponent* self, gint x // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_position_vfunc(x + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_position_vfunc(x , y , ((CoordType)(coord_type)) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_position) + return (*base->set_position)(self, x, y, coord_type); - // Call the original underlying C function: - if(base && base->set_position) - return (*base->set_position)(self, x, y, coord_type); - } typedef gboolean RType; return RType(); } gboolean Component_Class::set_size_vfunc_callback(AtkComponent* self, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -622,35 +662,38 @@ gboolean Component_Class::set_size_vfunc_callback(AtkComponent* self, gint width // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_size_vfunc(width + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_size_vfunc(width , height )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_size) + return (*base->set_size)(self, width, height); - // Call the original underlying C function: - if(base && base->set_size) - return (*base->set_size)(self, width, height); - } typedef gboolean RType; return RType(); diff --git a/libs/gtkmm2/atk/atkmm/component.h b/libs/gtkmm2/atk/atkmm/component.h index ccde1fb22d..db2b7eda7a 100644 --- a/libs/gtkmm2/atk/atkmm/component.h +++ b/libs/gtkmm2/atk/atkmm/component.h @@ -151,8 +151,14 @@ private: protected: Component(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Component(AtkComponent* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -363,10 +369,13 @@ protected: namespace Glib { - /** @relates Atk::Component - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Component */ Glib::RefPtr wrap(AtkComponent* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/document.cc b/libs/gtkmm2/atk/atkmm/document.cc index f27b4ff522..9d7be7e655 100644 --- a/libs/gtkmm2/atk/atkmm/document.cc +++ b/libs/gtkmm2/atk/atkmm/document.cc @@ -45,7 +45,7 @@ namespace Glib Glib::RefPtr wrap(AtkDocument* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -93,7 +93,7 @@ void Document_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED const gchar* Document_Class::get_document_type_vfunc_callback(AtkDocument* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -101,40 +101,43 @@ const gchar* Document_Class::get_document_type_vfunc_callback(AtkDocument* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_document_type_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_document_type_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_document_type) + return (*base->get_document_type)(self); - // Call the original underlying C function: - if(base && base->get_document_type) - return (*base->get_document_type)(self); - } typedef const gchar* RType; return RType(); } gpointer Document_Class::get_document_vfunc_callback(AtkDocument* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -142,33 +145,36 @@ gpointer Document_Class::get_document_vfunc_callback(AtkDocument* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_document_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_document_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_document) + return (*base->get_document)(self); - // Call the original underlying C function: - if(base && base->get_document) - return (*base->get_document)(self); - } typedef gpointer RType; return RType(); diff --git a/libs/gtkmm2/atk/atkmm/document.h b/libs/gtkmm2/atk/atkmm/document.h index 76c84a4007..3e2e29df00 100644 --- a/libs/gtkmm2/atk/atkmm/document.h +++ b/libs/gtkmm2/atk/atkmm/document.h @@ -73,8 +73,14 @@ private: protected: Document(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Document(AtkDocument* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -144,10 +150,13 @@ protected: namespace Glib { - /** @relates Atk::Document - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Document */ Glib::RefPtr wrap(AtkDocument* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/editabletext.cc b/libs/gtkmm2/atk/atkmm/editabletext.cc index eb776c954c..bbae279171 100644 --- a/libs/gtkmm2/atk/atkmm/editabletext.cc +++ b/libs/gtkmm2/atk/atkmm/editabletext.cc @@ -38,7 +38,7 @@ namespace Glib Glib::RefPtr wrap(AtkEditableText* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -91,7 +91,7 @@ void EditableText_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED gboolean EditableText_Class::set_run_attributes_vfunc_callback(AtkEditableText* self, AtkAttributeSet* attrib_set, gint start_offset, gint end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -99,42 +99,45 @@ gboolean EditableText_Class::set_run_attributes_vfunc_callback(AtkEditableText* // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_run_attributes_vfunc(attrib_set, start_offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_run_attributes_vfunc(attrib_set, start_offset , end_offset )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_run_attributes) + return (*base->set_run_attributes)(self, attrib_set, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->set_run_attributes) - return (*base->set_run_attributes)(self, attrib_set, start_offset, end_offset); - } typedef gboolean RType; return RType(); } void EditableText_Class::set_text_contents_vfunc_callback(AtkEditableText* self, const gchar* string) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -142,38 +145,42 @@ void EditableText_Class::set_text_contents_vfunc_callback(AtkEditableText* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_text_contents_vfunc(Glib::convert_const_gchar_ptr_to_ustring(string) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_text_contents_vfunc(Glib::convert_const_gchar_ptr_to_ustring(string) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_text_contents) + (*base->set_text_contents)(self, string); - // Call the original underlying C function: - if(base && base->set_text_contents) - (*base->set_text_contents)(self, string); - } } void EditableText_Class::insert_text_vfunc_callback(AtkEditableText* self, const gchar* string, gint length, gint* position) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -181,40 +188,44 @@ void EditableText_Class::insert_text_vfunc_callback(AtkEditableText* self, const // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->insert_text_vfunc(Glib::convert_const_gchar_ptr_to_ustring(string) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->insert_text_vfunc(Glib::convert_const_gchar_ptr_to_ustring(string) , length , *(position) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->insert_text) + (*base->insert_text)(self, string, length, position); - // Call the original underlying C function: - if(base && base->insert_text) - (*base->insert_text)(self, string, length, position); - } } void EditableText_Class::copy_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -222,39 +233,43 @@ void EditableText_Class::copy_text_vfunc_callback(AtkEditableText* self, gint st // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->copy_text_vfunc(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->copy_text_vfunc(start_pos , end_pos ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->copy_text) + (*base->copy_text)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->copy_text) - (*base->copy_text)(self, start_pos, end_pos); - } } void EditableText_Class::cut_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -262,39 +277,43 @@ void EditableText_Class::cut_text_vfunc_callback(AtkEditableText* self, gint sta // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->cut_text_vfunc(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->cut_text_vfunc(start_pos , end_pos ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->cut_text) + (*base->cut_text)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->cut_text) - (*base->cut_text)(self, start_pos, end_pos); - } } void EditableText_Class::delete_text_vfunc_callback(AtkEditableText* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -302,39 +321,43 @@ void EditableText_Class::delete_text_vfunc_callback(AtkEditableText* self, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->delete_text_vfunc(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->delete_text_vfunc(start_pos , end_pos ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->delete_text) + (*base->delete_text)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->delete_text) - (*base->delete_text)(self, start_pos, end_pos); - } } void EditableText_Class::paste_text_vfunc_callback(AtkEditableText* self, gint position) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -342,34 +365,38 @@ void EditableText_Class::paste_text_vfunc_callback(AtkEditableText* self, gint p // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->paste_text_vfunc(position + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->paste_text_vfunc(position ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->paste_text) + (*base->paste_text)(self, position); - // Call the original underlying C function: - if(base && base->paste_text) - (*base->paste_text)(self, position); - } } #endif //GLIBMM_VFUNCS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/editabletext.h b/libs/gtkmm2/atk/atkmm/editabletext.h index 982673231c..d8869b0ec9 100644 --- a/libs/gtkmm2/atk/atkmm/editabletext.h +++ b/libs/gtkmm2/atk/atkmm/editabletext.h @@ -77,8 +77,14 @@ private: protected: EditableText(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit EditableText(AtkEditableText* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -207,10 +213,13 @@ protected: namespace Glib { - /** @relates Atk::EditableText - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::EditableText */ Glib::RefPtr wrap(AtkEditableText* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/hyperlink.cc b/libs/gtkmm2/atk/atkmm/hyperlink.cc index 3bbf41c426..2adac64563 100644 --- a/libs/gtkmm2/atk/atkmm/hyperlink.cc +++ b/libs/gtkmm2/atk/atkmm/hyperlink.cc @@ -113,7 +113,7 @@ void Hyperlink_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED gchar* Hyperlink_Class::get_uri_vfunc_callback(AtkHyperlink* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -121,40 +121,43 @@ gchar* Hyperlink_Class::get_uri_vfunc_callback(AtkHyperlink* self, gint i) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_uri_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_uri_vfunc(i ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_uri) + return (*base->get_uri)(self, i); - // Call the original underlying C function: - if(base && base->get_uri) - return (*base->get_uri)(self, i); - } typedef gchar* RType; return RType(); } AtkObject* Hyperlink_Class::get_object_vfunc_callback(AtkHyperlink* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -162,40 +165,43 @@ AtkObject* Hyperlink_Class::get_object_vfunc_callback(AtkHyperlink* self, gint i // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_object_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_object_vfunc(i )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_object) + return (*base->get_object)(self, i); - // Call the original underlying C function: - if(base && base->get_object) - return (*base->get_object)(self, i); - } typedef AtkObject* RType; return RType(); } gint Hyperlink_Class::get_end_index_vfunc_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -203,39 +209,42 @@ gint Hyperlink_Class::get_end_index_vfunc_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_end_index_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_end_index_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_end_index) + return (*base->get_end_index)(self); - // Call the original underlying C function: - if(base && base->get_end_index) - return (*base->get_end_index)(self); - } typedef gint RType; return RType(); } gint Hyperlink_Class::get_start_index_vfunc_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -243,39 +252,42 @@ gint Hyperlink_Class::get_start_index_vfunc_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_start_index_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_start_index_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_start_index) + return (*base->get_start_index)(self); - // Call the original underlying C function: - if(base && base->get_start_index) - return (*base->get_start_index)(self); - } typedef gint RType; return RType(); } gboolean Hyperlink_Class::is_valid_vfunc_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -283,39 +295,42 @@ gboolean Hyperlink_Class::is_valid_vfunc_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_valid_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_valid_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->is_valid) + return (*base->is_valid)(self); - // Call the original underlying C function: - if(base && base->is_valid) - return (*base->is_valid)(self); - } typedef gboolean RType; return RType(); } gint Hyperlink_Class::get_n_anchors_vfunc_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -323,39 +338,42 @@ gint Hyperlink_Class::get_n_anchors_vfunc_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_anchors_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_anchors_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_n_anchors) + return (*base->get_n_anchors)(self); - // Call the original underlying C function: - if(base && base->get_n_anchors) - return (*base->get_n_anchors)(self); - } typedef gint RType; return RType(); } guint Hyperlink_Class::link_state_vfunc_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -363,39 +381,42 @@ guint Hyperlink_Class::link_state_vfunc_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->link_state_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->link_state_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->link_state) + return (*base->link_state)(self); - // Call the original underlying C function: - if(base && base->link_state) - return (*base->link_state)(self); - } typedef guint RType; return RType(); } gboolean Hyperlink_Class::is_selected_link_vfunc_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -403,32 +424,35 @@ gboolean Hyperlink_Class::is_selected_link_vfunc_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_selected_link_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_selected_link_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->is_selected_link) + return (*base->is_selected_link)(self); - // Call the original underlying C function: - if(base && base->is_selected_link) - return (*base->is_selected_link)(self); - } typedef gboolean RType; return RType(); @@ -438,7 +462,7 @@ gboolean Hyperlink_Class::is_selected_link_vfunc_callback(AtkHyperlink* self) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Hyperlink_Class::link_activated_callback(AtkHyperlink* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -446,32 +470,35 @@ void Hyperlink_Class::link_activated_callback(AtkHyperlink* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_link_activated(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_link_activated(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->link_activated) - (*base->link_activated)(self); - } + // Call the original underlying C function: + if(base && base->link_activated) + (*base->link_activated)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/hyperlink.h b/libs/gtkmm2/atk/atkmm/hyperlink.h index 5a529ec46b..685a140ff0 100644 --- a/libs/gtkmm2/atk/atkmm/hyperlink.h +++ b/libs/gtkmm2/atk/atkmm/hyperlink.h @@ -171,9 +171,9 @@ public: bool is_selected_link() const; -/** + /** * @par Prototype: - * void %link_activated() + * void on_my_%link_activated() */ Glib::SignalProxy0< void > signal_link_activated(); @@ -282,10 +282,13 @@ protected: namespace Glib { - /** @relates Atk::Hyperlink - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Hyperlink */ Glib::RefPtr wrap(AtkHyperlink* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/hypertext.cc b/libs/gtkmm2/atk/atkmm/hypertext.cc index c0e2781cd2..66ef0a85e0 100644 --- a/libs/gtkmm2/atk/atkmm/hypertext.cc +++ b/libs/gtkmm2/atk/atkmm/hypertext.cc @@ -80,7 +80,7 @@ namespace Glib Glib::RefPtr wrap(AtkHypertext* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -130,7 +130,7 @@ void Hypertext_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED AtkHyperlink* Hypertext_Class::get_link_vfunc_callback(AtkHypertext* self, gint link_index) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -138,41 +138,44 @@ AtkHyperlink* Hypertext_Class::get_link_vfunc_callback(AtkHypertext* self, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_link_vfunc(link_index + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_link_vfunc(link_index )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_link) + return (*base->get_link)(self, link_index); - // Call the original underlying C function: - if(base && base->get_link) - return (*base->get_link)(self, link_index); - } typedef AtkHyperlink* RType; return RType(); } gint Hypertext_Class::get_n_links_vfunc_callback(AtkHypertext* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -180,40 +183,43 @@ gint Hypertext_Class::get_n_links_vfunc_callback(AtkHypertext* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_links_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_links_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_n_links) + return (*base->get_n_links)(self); - // Call the original underlying C function: - if(base && base->get_n_links) - return (*base->get_n_links)(self); - } typedef gint RType; return RType(); } gint Hypertext_Class::get_link_index_vfunc_callback(AtkHypertext* self, gint char_index) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -221,34 +227,37 @@ gint Hypertext_Class::get_link_index_vfunc_callback(AtkHypertext* self, gint cha // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_link_index_vfunc(char_index + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_link_index_vfunc(char_index ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_link_index) + return (*base->get_link_index)(self, char_index); - // Call the original underlying C function: - if(base && base->get_link_index) - return (*base->get_link_index)(self, char_index); - } typedef gint RType; return RType(); @@ -258,7 +267,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Hypertext_Class::link_selected_callback(AtkHypertext* self, gint p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -266,34 +275,37 @@ void Hypertext_Class::link_selected_callback(AtkHypertext* self, gint p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_link_selected(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_link_selected(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->link_selected) - (*base->link_selected)(self, p0); - } + // Call the original underlying C function: + if(base && base->link_selected) + (*base->link_selected)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/hypertext.h b/libs/gtkmm2/atk/atkmm/hypertext.h index 406b138dfb..cb7310a9c8 100644 --- a/libs/gtkmm2/atk/atkmm/hypertext.h +++ b/libs/gtkmm2/atk/atkmm/hypertext.h @@ -73,8 +73,14 @@ private: protected: Hypertext(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Hypertext(AtkHypertext* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -128,9 +134,9 @@ public: int get_link_index(int char_index) const; -/** + /** * @par Prototype: - * void %link_selected(int link_index) + * void on_my_%link_selected(int link_index) */ Glib::SignalProxy1< void,int > signal_link_selected(); @@ -174,10 +180,13 @@ protected: namespace Glib { - /** @relates Atk::Hypertext - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Hypertext */ Glib::RefPtr wrap(AtkHypertext* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/image.cc b/libs/gtkmm2/atk/atkmm/image.cc index b557a6b929..a2a41d9269 100644 --- a/libs/gtkmm2/atk/atkmm/image.cc +++ b/libs/gtkmm2/atk/atkmm/image.cc @@ -38,7 +38,7 @@ namespace Glib Glib::RefPtr wrap(AtkImage* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -88,7 +88,7 @@ void Image_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED gboolean Image_Class::set_image_description_vfunc_callback(AtkImage* self, const gchar* description) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -96,41 +96,44 @@ gboolean Image_Class::set_image_description_vfunc_callback(AtkImage* self, const // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_image_description_vfunc(Glib::convert_const_gchar_ptr_to_ustring(description) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_image_description_vfunc(Glib::convert_const_gchar_ptr_to_ustring(description) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_image_description) + return (*base->set_image_description)(self, description); - // Call the original underlying C function: - if(base && base->set_image_description) - return (*base->set_image_description)(self, description); - } typedef gboolean RType; return RType(); } const gchar* Image_Class::get_image_description_vfunc_callback(AtkImage* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -138,40 +141,43 @@ const gchar* Image_Class::get_image_description_vfunc_callback(AtkImage* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_image_description_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_image_description_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_image_description) + return (*base->get_image_description)(self); - // Call the original underlying C function: - if(base && base->get_image_description) - return (*base->get_image_description)(self); - } typedef const gchar* RType; return RType(); } void Image_Class::get_image_position_vfunc_callback(AtkImage* self, gint* x, gint* y, AtkCoordType coord_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -179,40 +185,44 @@ void Image_Class::get_image_position_vfunc_callback(AtkImage* self, gint* x, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_image_position_vfunc(*(x) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_image_position_vfunc(*(x) , *(y) , ((CoordType)(coord_type)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_image_position) + (*base->get_image_position)(self, x, y, coord_type); - // Call the original underlying C function: - if(base && base->get_image_position) - (*base->get_image_position)(self, x, y, coord_type); - } } void Image_Class::get_image_size_vfunc_callback(AtkImage* self, gint* width, gint* height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -220,35 +230,39 @@ void Image_Class::get_image_size_vfunc_callback(AtkImage* self, gint* width, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_image_size_vfunc(*(width) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_image_size_vfunc(*(width) , *(height) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_image_size) + (*base->get_image_size)(self, width, height); - // Call the original underlying C function: - if(base && base->get_image_size) - (*base->get_image_size)(self, width, height); - } } #endif //GLIBMM_VFUNCS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/image.h b/libs/gtkmm2/atk/atkmm/image.h index 9c36aa57ef..41775cd52b 100644 --- a/libs/gtkmm2/atk/atkmm/image.h +++ b/libs/gtkmm2/atk/atkmm/image.h @@ -79,8 +79,14 @@ private: protected: Image(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Image(AtkImage* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -178,10 +184,13 @@ protected: namespace Glib { - /** @relates Atk::Image - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Image */ Glib::RefPtr wrap(AtkImage* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/implementor.cc b/libs/gtkmm2/atk/atkmm/implementor.cc index fc70956d86..91d9bb51b0 100644 --- a/libs/gtkmm2/atk/atkmm/implementor.cc +++ b/libs/gtkmm2/atk/atkmm/implementor.cc @@ -38,7 +38,7 @@ namespace Glib Glib::RefPtr wrap(AtkImplementor* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -85,7 +85,7 @@ void Implementor_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED AtkObject* Implementor_Class::ref_accessible_vfunc_callback(AtkImplementor* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -93,33 +93,36 @@ AtkObject* Implementor_Class::ref_accessible_vfunc_callback(AtkImplementor* self // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->ref_accessibile_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->ref_accessibile_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->ref_accessible) + return (*base->ref_accessible)(self); - // Call the original underlying C function: - if(base && base->ref_accessible) - return (*base->ref_accessible)(self); - } typedef AtkObject* RType; return RType(); diff --git a/libs/gtkmm2/atk/atkmm/implementor.h b/libs/gtkmm2/atk/atkmm/implementor.h index f25fe1a7db..e91fe99001 100644 --- a/libs/gtkmm2/atk/atkmm/implementor.h +++ b/libs/gtkmm2/atk/atkmm/implementor.h @@ -70,8 +70,14 @@ private: protected: Implementor(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Implementor(AtkImplementor* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -123,10 +129,13 @@ protected: namespace Glib { - /** @relates Atk::Implementor - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Implementor */ Glib::RefPtr wrap(AtkImplementor* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/noopobject.h b/libs/gtkmm2/atk/atkmm/noopobject.h index 1421c0f084..04dd2946b1 100644 --- a/libs/gtkmm2/atk/atkmm/noopobject.h +++ b/libs/gtkmm2/atk/atkmm/noopobject.h @@ -137,10 +137,13 @@ protected: namespace Glib { - /** @relates Atk::NoOpObject - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::NoOpObject */ Glib::RefPtr wrap(AtkNoOpObject* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/object.cc b/libs/gtkmm2/atk/atkmm/object.cc index b129a0af67..e9cb71ee24 100644 --- a/libs/gtkmm2/atk/atkmm/object.cc +++ b/libs/gtkmm2/atk/atkmm/object.cc @@ -314,7 +314,7 @@ void Object_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Object_Class::children_changed_callback(AtkObject* self, guint p0, gpointer p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -322,36 +322,39 @@ void Object_Class::children_changed_callback(AtkObject* self, guint p0, gpointer // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_children_changed(p0, p1); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_children_changed(p0, p1); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->children_changed) - (*base->children_changed)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->children_changed) + (*base->children_changed)(self, p0, p1); } void Object_Class::focus_event_callback(AtkObject* self, gboolean p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -359,37 +362,40 @@ void Object_Class::focus_event_callback(AtkObject* self, gboolean p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_focus_event(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_focus_event(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->focus_event) - (*base->focus_event)(self, p0); - } + // Call the original underlying C function: + if(base && base->focus_event) + (*base->focus_event)(self, p0); } void Object_Class::property_change_callback(AtkObject* self, AtkPropertyValues* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -397,36 +403,39 @@ void Object_Class::property_change_callback(AtkObject* self, AtkPropertyValues* // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_property_change(p0); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_property_change(p0); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->property_change) - (*base->property_change)(self, p0); - } + // Call the original underlying C function: + if(base && base->property_change) + (*base->property_change)(self, p0); } void Object_Class::state_change_callback(AtkObject* self, const gchar* p0, gboolean p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -434,38 +443,41 @@ void Object_Class::state_change_callback(AtkObject* self, const gchar* p0, gbool // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_state_change(Glib::convert_const_gchar_ptr_to_ustring(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_state_change(Glib::convert_const_gchar_ptr_to_ustring(p0) , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->state_change) - (*base->state_change)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->state_change) + (*base->state_change)(self, p0, p1); } void Object_Class::visible_data_changed_callback(AtkObject* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -473,36 +485,39 @@ void Object_Class::visible_data_changed_callback(AtkObject* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_visible_data_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_visible_data_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->visible_data_changed) - (*base->visible_data_changed)(self); - } + // Call the original underlying C function: + if(base && base->visible_data_changed) + (*base->visible_data_changed)(self); } void Object_Class::active_descendant_changed_callback(AtkObject* self, gpointer* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -510,33 +525,36 @@ void Object_Class::active_descendant_changed_callback(AtkObject* self, gpointer* // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_active_descendant_changed(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_active_descendant_changed(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->active_descendant_changed) - (*base->active_descendant_changed)(self, p0); - } + // Call the original underlying C function: + if(base && base->active_descendant_changed) + (*base->active_descendant_changed)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/object.h b/libs/gtkmm2/atk/atkmm/object.h index 5b2431b57a..d41905e904 100644 --- a/libs/gtkmm2/atk/atkmm/object.h +++ b/libs/gtkmm2/atk/atkmm/object.h @@ -321,49 +321,49 @@ public: bool remove_relationship(RelationType relationship, const Glib::RefPtr& target); -/** + /** * @par Prototype: - * void %children_changed(guint change_index, gpointer changed_child) + * void on_my_%children_changed(guint change_index, gpointer changed_child) */ Glib::SignalProxy2< void,guint,gpointer > signal_children_changed(); -/** + /** * @par Prototype: - * void %focus_event(bool focus_in) + * void on_my_%focus_event(bool focus_in) */ Glib::SignalProxy1< void,bool > signal_focus_event(); -/** + /** * @par Prototype: - * void %property_change(AtkPropertyValues* values) + * void on_my_%property_change(AtkPropertyValues* values) */ Glib::SignalProxy1< void,AtkPropertyValues* > signal_property_change(); -/** + /** * @par Prototype: - * void %state_change(const Glib::ustring& name, bool state_set) + * void on_my_%state_change(const Glib::ustring& name, bool state_set) */ Glib::SignalProxy2< void,const Glib::ustring&,bool > signal_state_change(); -/** + /** * @par Prototype: - * void %visible_data_changed() + * void on_my_%visible_data_changed() */ Glib::SignalProxy0< void > signal_visible_data_changed(); -/** + /** * @par Prototype: - * void %active_descendant_changed(void** child) + * void on_my_%active_descendant_changed(void** child) */ Glib::SignalProxy1< void,void** > signal_active_descendant_changed(); @@ -642,10 +642,13 @@ protected: namespace Glib { - /** @relates Atk::Object - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Object */ Glib::RefPtr wrap(AtkObject* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/objectaccessible.h b/libs/gtkmm2/atk/atkmm/objectaccessible.h index f3ed6f5b9c..a06eefed54 100644 --- a/libs/gtkmm2/atk/atkmm/objectaccessible.h +++ b/libs/gtkmm2/atk/atkmm/objectaccessible.h @@ -139,10 +139,13 @@ protected: namespace Glib { - /** @relates Atk::ObjectAccessible - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::ObjectAccessible */ Glib::RefPtr wrap(AtkGObjectAccessible* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/private/Makefile.am b/libs/gtkmm2/atk/atkmm/private/Makefile.am new file mode 100644 index 0000000000..8b5e0b77ae --- /dev/null +++ b/libs/gtkmm2/atk/atkmm/private/Makefile.am @@ -0,0 +1,14 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment +files_built_p_h = $(files_all_hg:.hg=_p.h) + +private_includedir = $(includedir)/atkmm-1.6/atkmm/private +private_include_HEADERS = $(files_built_p_h) + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_built_p_h)) + + + diff --git a/libs/glibmm2/tools/pm/Makefile.in b/libs/gtkmm2/atk/atkmm/private/Makefile.in similarity index 59% rename from libs/glibmm2/tools/pm/Makefile.in rename to libs/gtkmm2/atk/atkmm/private/Makefile.in index 040a1e7021..7da834c587 100644 --- a/libs/glibmm2/tools/pm/Makefile.in +++ b/libs/gtkmm2/atk/atkmm/private/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,17 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,23 +38,21 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(tools_pm_include_HEADERS) \ - $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment -subdir = tools/pm +DIST_COMMON = $(private_include_HEADERS) \ + $(srcdir)/../../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment +subdir = atk/atkmm/private ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -62,18 +62,18 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(tools_pm_includedir)" -tools_pm_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(tools_pm_include_HEADERS) +am__installdirs = "$(DESTDIR)$(private_includedir)" +private_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(private_include_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -89,37 +89,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -127,43 +134,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -175,38 +172,88 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_pm) +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +files_posix_hg = +files_win32_hg = +files_general_hg = action.hg component.hg document.hg editabletext.hg hyperlink.hg hypertext.hg image.hg \ + implementor.hg noopobject.hg object.hg objectaccessible.hg relation.hg relationset.hg selection.hg \ + stateset.hg streamablecontent.hg table.hg text.hg value.hg -# Install the .pm, files: -tools_pm_includedir = $(libdir)/glibmm-2.4/proc/pm -tools_pm_include_HEADERS = $(files_tools_pm) +files_general_deprecated_hg = +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +files_built_p_h = $(files_all_hg:.hg=_p.h) +private_includedir = $(includedir)/atkmm-1.6/atkmm/private +private_include_HEADERS = $(files_built_p_h) all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -215,9 +262,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/pm/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atk/atkmm/private/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/pm/Makefile + $(AUTOMAKE) --gnu atk/atkmm/private/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -241,26 +288,22 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-tools_pm_includeHEADERS: $(tools_pm_include_HEADERS) +install-private_includeHEADERS: $(private_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(tools_pm_includedir)" || $(mkdir_p) "$(DESTDIR)$(tools_pm_includedir)" - @list='$(tools_pm_include_HEADERS)'; for p in $$list; do \ + test -z "$(private_includedir)" || $(MKDIR_P) "$(DESTDIR)$(private_includedir)" + @list='$(private_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(tools_pm_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(tools_pm_includedir)/$$f'"; \ - $(tools_pm_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(tools_pm_includedir)/$$f"; \ + echo " $(private_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(private_includedir)/$$f'"; \ + $(private_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(private_includedir)/$$f"; \ done -uninstall-tools_pm_includeHEADERS: +uninstall-private_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(tools_pm_include_HEADERS)'; for p in $$list; do \ + @list='$(private_include_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(tools_pm_includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(tools_pm_includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(private_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(private_includedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -312,23 +355,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../tools/pm - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -343,8 +384,8 @@ check-am: all-am check: check-am all-am: Makefile $(HEADERS) installdirs: - for dir in "$(DESTDIR)$(tools_pm_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + for dir in "$(DESTDIR)$(private_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -376,8 +417,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-am @@ -389,19 +429,28 @@ info: info-am info-am: -install-data-am: install-tools_pm_includeHEADERS +install-data-am: install-private_includeHEADERS + +install-dvi: install-dvi-am install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local mostlyclean: mostlyclean-am @@ -415,20 +464,27 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-tools_pm_includeHEADERS +uninstall-am: uninstall-private_includeHEADERS + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip \ - install-tools_pm_includeHEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-tools_pm_includeHEADERS + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-private_includeHEADERS install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-private_includeHEADERS + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_built_p_h)) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libs/gtkmm2/atk/atkmm/relation.h b/libs/gtkmm2/atk/atkmm/relation.h index f0b1fe2f44..1646ce6c50 100644 --- a/libs/gtkmm2/atk/atkmm/relation.h +++ b/libs/gtkmm2/atk/atkmm/relation.h @@ -187,10 +187,13 @@ protected: namespace Glib { - /** @relates Atk::Relation - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Relation */ Glib::RefPtr wrap(AtkRelation* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/relationset.cc b/libs/gtkmm2/atk/atkmm/relationset.cc index 3638f4ece1..4efd72ecb3 100644 --- a/libs/gtkmm2/atk/atkmm/relationset.cc +++ b/libs/gtkmm2/atk/atkmm/relationset.cc @@ -133,7 +133,8 @@ GType RelationSet::get_base_type() RelationSet::RelationSet() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(relationset_class_.init())) { } diff --git a/libs/gtkmm2/atk/atkmm/relationset.h b/libs/gtkmm2/atk/atkmm/relationset.h index a2a52c2fac..2484fe54db 100644 --- a/libs/gtkmm2/atk/atkmm/relationset.h +++ b/libs/gtkmm2/atk/atkmm/relationset.h @@ -174,10 +174,13 @@ protected: namespace Glib { - /** @relates Atk::RelationSet - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::RelationSet */ Glib::RefPtr wrap(AtkRelationSet* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/selection.cc b/libs/gtkmm2/atk/atkmm/selection.cc index ed5fb629e7..c281c9582e 100644 --- a/libs/gtkmm2/atk/atkmm/selection.cc +++ b/libs/gtkmm2/atk/atkmm/selection.cc @@ -48,7 +48,7 @@ namespace Glib Glib::RefPtr wrap(AtkSelection* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -102,7 +102,7 @@ void Selection_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED gboolean Selection_Class::add_selection_vfunc_callback(AtkSelection* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -110,41 +110,44 @@ gboolean Selection_Class::add_selection_vfunc_callback(AtkSelection* self, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->add_selection_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->add_selection_vfunc(i )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_selection) + return (*base->add_selection)(self, i); - // Call the original underlying C function: - if(base && base->add_selection) - return (*base->add_selection)(self, i); - } typedef gboolean RType; return RType(); } gboolean Selection_Class::clear_selection_vfunc_callback(AtkSelection* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -152,40 +155,43 @@ gboolean Selection_Class::clear_selection_vfunc_callback(AtkSelection* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->clear_selection_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->clear_selection_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->clear_selection) + return (*base->clear_selection)(self); - // Call the original underlying C function: - if(base && base->clear_selection) - return (*base->clear_selection)(self); - } typedef gboolean RType; return RType(); } AtkObject* Selection_Class::ref_selection_vfunc_callback(AtkSelection* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -193,41 +199,44 @@ AtkObject* Selection_Class::ref_selection_vfunc_callback(AtkSelection* self, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap_copy(obj->get_selection_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap_copy(obj->get_selection_vfunc(i )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->ref_selection) + return (*base->ref_selection)(self, i); - // Call the original underlying C function: - if(base && base->ref_selection) - return (*base->ref_selection)(self, i); - } typedef AtkObject* RType; return RType(); } gint Selection_Class::get_selection_count_vfunc_callback(AtkSelection* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -235,40 +244,43 @@ gint Selection_Class::get_selection_count_vfunc_callback(AtkSelection* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_selection_count_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_selection_count_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_selection_count) + return (*base->get_selection_count)(self); - // Call the original underlying C function: - if(base && base->get_selection_count) - return (*base->get_selection_count)(self); - } typedef gint RType; return RType(); } gboolean Selection_Class::is_child_selected_vfunc_callback(AtkSelection* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -276,41 +288,44 @@ gboolean Selection_Class::is_child_selected_vfunc_callback(AtkSelection* self, g // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_child_selected_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_child_selected_vfunc(i )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->is_child_selected) + return (*base->is_child_selected)(self, i); - // Call the original underlying C function: - if(base && base->is_child_selected) - return (*base->is_child_selected)(self, i); - } typedef gboolean RType; return RType(); } gboolean Selection_Class::remove_selection_vfunc_callback(AtkSelection* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -318,41 +333,44 @@ gboolean Selection_Class::remove_selection_vfunc_callback(AtkSelection* self, gi // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->remove_selection_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->remove_selection_vfunc(i )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->remove_selection) + return (*base->remove_selection)(self, i); - // Call the original underlying C function: - if(base && base->remove_selection) - return (*base->remove_selection)(self, i); - } typedef gboolean RType; return RType(); } gboolean Selection_Class::select_all_selection_vfunc_callback(AtkSelection* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -360,33 +378,36 @@ gboolean Selection_Class::select_all_selection_vfunc_callback(AtkSelection* self // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->select_all_selection_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->select_all_selection_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->select_all_selection) + return (*base->select_all_selection)(self); - // Call the original underlying C function: - if(base && base->select_all_selection) - return (*base->select_all_selection)(self); - } typedef gboolean RType; return RType(); @@ -396,7 +417,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Selection_Class::selection_changed_callback(AtkSelection* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -404,33 +425,36 @@ void Selection_Class::selection_changed_callback(AtkSelection* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_selection_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_selection_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->selection_changed) - (*base->selection_changed)(self); - } + // Call the original underlying C function: + if(base && base->selection_changed) + (*base->selection_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/selection.h b/libs/gtkmm2/atk/atkmm/selection.h index eaf17896a9..3d9a2e49a3 100644 --- a/libs/gtkmm2/atk/atkmm/selection.h +++ b/libs/gtkmm2/atk/atkmm/selection.h @@ -78,8 +78,14 @@ private: protected: Selection(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Selection(AtkSelection* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -164,9 +170,9 @@ public: bool select_all_selection(); -/** + /** * @par Prototype: - * void %selection_changed() + * void on_my_%selection_changed() */ Glib::SignalProxy0< void > signal_selection_changed(); @@ -227,10 +233,13 @@ protected: namespace Glib { - /** @relates Atk::Selection - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Selection */ Glib::RefPtr wrap(AtkSelection* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/stateset.cc b/libs/gtkmm2/atk/atkmm/stateset.cc index bb8d7745fa..00ea350e85 100644 --- a/libs/gtkmm2/atk/atkmm/stateset.cc +++ b/libs/gtkmm2/atk/atkmm/stateset.cc @@ -157,7 +157,8 @@ GType StateSet::get_base_type() StateSet::StateSet() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(stateset_class_.init())) { } diff --git a/libs/gtkmm2/atk/atkmm/stateset.h b/libs/gtkmm2/atk/atkmm/stateset.h index 559e702cc4..a3bb7c2482 100644 --- a/libs/gtkmm2/atk/atkmm/stateset.h +++ b/libs/gtkmm2/atk/atkmm/stateset.h @@ -242,10 +242,13 @@ protected: namespace Glib { - /** @relates Atk::StateSet - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::StateSet */ Glib::RefPtr wrap(AtkStateSet* object, bool take_copy = false); } diff --git a/libs/gtkmm2/atk/atkmm/streamablecontent.cc b/libs/gtkmm2/atk/atkmm/streamablecontent.cc index 8c10a6b13d..46fd74ce5e 100644 --- a/libs/gtkmm2/atk/atkmm/streamablecontent.cc +++ b/libs/gtkmm2/atk/atkmm/streamablecontent.cc @@ -45,7 +45,7 @@ namespace Glib Glib::RefPtr wrap(AtkStreamableContent* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -94,7 +94,7 @@ void StreamableContent_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED int StreamableContent_Class::get_n_mime_types_vfunc_callback(AtkStreamableContent* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -102,40 +102,43 @@ int StreamableContent_Class::get_n_mime_types_vfunc_callback(AtkStreamableConten // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_mime_types_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_mime_types_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_n_mime_types) + return (*base->get_n_mime_types)(self); - // Call the original underlying C function: - if(base && base->get_n_mime_types) - return (*base->get_n_mime_types)(self); - } typedef int RType; return RType(); } const gchar* StreamableContent_Class::get_mime_type_vfunc_callback(AtkStreamableContent* self, gint i) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -143,41 +146,44 @@ const gchar* StreamableContent_Class::get_mime_type_vfunc_callback(AtkStreamable // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_mime_type_vfunc(i + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_mime_type_vfunc(i ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_mime_type) + return (*base->get_mime_type)(self, i); - // Call the original underlying C function: - if(base && base->get_mime_type) - return (*base->get_mime_type)(self, i); - } typedef const gchar* RType; return RType(); } GIOChannel* StreamableContent_Class::get_stream_vfunc_callback(AtkStreamableContent* self, const gchar* mime_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -185,34 +191,37 @@ GIOChannel* StreamableContent_Class::get_stream_vfunc_callback(AtkStreamableCont // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_stream_vfunc(Glib::convert_const_gchar_ptr_to_ustring(mime_type) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_stream_vfunc(Glib::convert_const_gchar_ptr_to_ustring(mime_type) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_stream) + return (*base->get_stream)(self, mime_type); - // Call the original underlying C function: - if(base && base->get_stream) - return (*base->get_stream)(self, mime_type); - } typedef GIOChannel* RType; return RType(); diff --git a/libs/gtkmm2/atk/atkmm/streamablecontent.h b/libs/gtkmm2/atk/atkmm/streamablecontent.h index fe93cf72cb..a292443519 100644 --- a/libs/gtkmm2/atk/atkmm/streamablecontent.h +++ b/libs/gtkmm2/atk/atkmm/streamablecontent.h @@ -72,8 +72,14 @@ private: protected: StreamableContent(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit StreamableContent(AtkStreamableContent* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -155,10 +161,13 @@ protected: namespace Glib { - /** @relates Atk::StreamableContent - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::StreamableContent */ Glib::RefPtr wrap(AtkStreamableContent* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/table.cc b/libs/gtkmm2/atk/atkmm/table.cc index c03cca5ac3..c881a1f8f8 100644 --- a/libs/gtkmm2/atk/atkmm/table.cc +++ b/libs/gtkmm2/atk/atkmm/table.cc @@ -222,7 +222,7 @@ namespace Glib Glib::RefPtr wrap(AtkTable* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -304,7 +304,7 @@ void Table_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED AtkObject* Table_Class::ref_at_vfunc_callback(AtkTable* self, gint row, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -312,42 +312,45 @@ AtkObject* Table_Class::ref_at_vfunc_callback(AtkTable* self, gint row, gint col // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap_copy(obj->get_at_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap_copy(obj->get_at_vfunc(row , column )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->ref_at) + return (*base->ref_at)(self, row, column); - // Call the original underlying C function: - if(base && base->ref_at) - return (*base->ref_at)(self, row, column); - } typedef AtkObject* RType; return RType(); } gint Table_Class::get_index_at_vfunc_callback(AtkTable* self, gint row, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -355,42 +358,45 @@ gint Table_Class::get_index_at_vfunc_callback(AtkTable* self, gint row, gint col // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_index_at_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_index_at_vfunc(row , column ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_index_at) + return (*base->get_index_at)(self, row, column); - // Call the original underlying C function: - if(base && base->get_index_at) - return (*base->get_index_at)(self, row, column); - } typedef gint RType; return RType(); } gint Table_Class::get_column_at_index_vfunc_callback(AtkTable* self, gint index_) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -398,41 +404,44 @@ gint Table_Class::get_column_at_index_vfunc_callback(AtkTable* self, gint index_ // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_column_at_index_vfunc(index_ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_column_at_index_vfunc(index_ ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_column_at_index) + return (*base->get_column_at_index)(self, index_); - // Call the original underlying C function: - if(base && base->get_column_at_index) - return (*base->get_column_at_index)(self, index_); - } typedef gint RType; return RType(); } gint Table_Class::get_row_at_index_vfunc_callback(AtkTable* self, gint index_) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -440,41 +449,44 @@ gint Table_Class::get_row_at_index_vfunc_callback(AtkTable* self, gint index_) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_row_at_index_vfunc(index_ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_row_at_index_vfunc(index_ ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_row_at_index) + return (*base->get_row_at_index)(self, index_); - // Call the original underlying C function: - if(base && base->get_row_at_index) - return (*base->get_row_at_index)(self, index_); - } typedef gint RType; return RType(); } gint Table_Class::get_n_columns_vfunc_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -482,40 +494,43 @@ gint Table_Class::get_n_columns_vfunc_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_columns_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_columns_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_n_columns) + return (*base->get_n_columns)(self); - // Call the original underlying C function: - if(base && base->get_n_columns) - return (*base->get_n_columns)(self); - } typedef gint RType; return RType(); } gint Table_Class::get_n_rows_vfunc_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -523,40 +538,43 @@ gint Table_Class::get_n_rows_vfunc_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_rows_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_rows_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_n_rows) + return (*base->get_n_rows)(self); - // Call the original underlying C function: - if(base && base->get_n_rows) - return (*base->get_n_rows)(self); - } typedef gint RType; return RType(); } gint Table_Class::get_column_extent_at_vfunc_callback(AtkTable* self, gint row, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -564,42 +582,45 @@ gint Table_Class::get_column_extent_at_vfunc_callback(AtkTable* self, gint row, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_column_extent_at_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_column_extent_at_vfunc(row , column ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_column_extent_at) + return (*base->get_column_extent_at)(self, row, column); - // Call the original underlying C function: - if(base && base->get_column_extent_at) - return (*base->get_column_extent_at)(self, row, column); - } typedef gint RType; return RType(); } gint Table_Class::get_row_extent_at_vfunc_callback(AtkTable* self, gint row, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -607,42 +628,45 @@ gint Table_Class::get_row_extent_at_vfunc_callback(AtkTable* self, gint row, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_row_extent_at_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_row_extent_at_vfunc(row , column ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_row_extent_at) + return (*base->get_row_extent_at)(self, row, column); - // Call the original underlying C function: - if(base && base->get_row_extent_at) - return (*base->get_row_extent_at)(self, row, column); - } typedef gint RType; return RType(); } AtkObject* Table_Class::get_caption_vfunc_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -650,40 +674,43 @@ AtkObject* Table_Class::get_caption_vfunc_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_caption_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_caption_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_caption) + return (*base->get_caption)(self); - // Call the original underlying C function: - if(base && base->get_caption) - return (*base->get_caption)(self); - } typedef AtkObject* RType; return RType(); } const gchar* Table_Class::get_column_description_vfunc_callback(AtkTable* self, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -691,41 +718,44 @@ const gchar* Table_Class::get_column_description_vfunc_callback(AtkTable* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_column_description_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_column_description_vfunc(column ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_column_description) + return (*base->get_column_description)(self, column); - // Call the original underlying C function: - if(base && base->get_column_description) - return (*base->get_column_description)(self, column); - } typedef const gchar* RType; return RType(); } AtkObject* Table_Class::get_column_header_vfunc_callback(AtkTable* self, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -733,41 +763,44 @@ AtkObject* Table_Class::get_column_header_vfunc_callback(AtkTable* self, gint co // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_column_header_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_column_header_vfunc(column )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_column_header) + return (*base->get_column_header)(self, column); - // Call the original underlying C function: - if(base && base->get_column_header) - return (*base->get_column_header)(self, column); - } typedef AtkObject* RType; return RType(); } const gchar* Table_Class::get_row_description_vfunc_callback(AtkTable* self, gint row) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -775,41 +808,44 @@ const gchar* Table_Class::get_row_description_vfunc_callback(AtkTable* self, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_row_description_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_row_description_vfunc(row ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_row_description) + return (*base->get_row_description)(self, row); - // Call the original underlying C function: - if(base && base->get_row_description) - return (*base->get_row_description)(self, row); - } typedef const gchar* RType; return RType(); } AtkObject* Table_Class::get_row_header_vfunc_callback(AtkTable* self, gint row) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -817,41 +853,44 @@ AtkObject* Table_Class::get_row_header_vfunc_callback(AtkTable* self, gint row) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_row_header_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_row_header_vfunc(row )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_row_header) + return (*base->get_row_header)(self, row); - // Call the original underlying C function: - if(base && base->get_row_header) - return (*base->get_row_header)(self, row); - } typedef AtkObject* RType; return RType(); } AtkObject* Table_Class::get_summary_vfunc_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -859,40 +898,43 @@ AtkObject* Table_Class::get_summary_vfunc_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_summary_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_summary_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_summary) + return (*base->get_summary)(self); - // Call the original underlying C function: - if(base && base->get_summary) - return (*base->get_summary)(self); - } typedef AtkObject* RType; return RType(); } void Table_Class::set_caption_vfunc_callback(AtkTable* self, AtkObject* caption) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -900,38 +942,42 @@ void Table_Class::set_caption_vfunc_callback(AtkTable* self, AtkObject* caption) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_caption_vfunc(Glib::wrap(caption, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_caption_vfunc(Glib::wrap(caption, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_caption) + (*base->set_caption)(self, caption); - // Call the original underlying C function: - if(base && base->set_caption) - (*base->set_caption)(self, caption); - } } void Table_Class::set_column_description_vfunc_callback(AtkTable* self, gint column, const gchar* description) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -939,39 +985,43 @@ void Table_Class::set_column_description_vfunc_callback(AtkTable* self, gint col // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_column_description_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_column_description_vfunc(column , description ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_column_description) + (*base->set_column_description)(self, column, description); - // Call the original underlying C function: - if(base && base->set_column_description) - (*base->set_column_description)(self, column, description); - } } void Table_Class::set_column_header_vfunc_callback(AtkTable* self, gint column, AtkObject* header) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -979,39 +1029,43 @@ void Table_Class::set_column_header_vfunc_callback(AtkTable* self, gint column, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_column_header_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_column_header_vfunc(column , Glib::wrap(header, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_column_header) + (*base->set_column_header)(self, column, header); - // Call the original underlying C function: - if(base && base->set_column_header) - (*base->set_column_header)(self, column, header); - } } void Table_Class::set_row_description_vfunc_callback(AtkTable* self, gint row, const gchar* description) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1019,39 +1073,43 @@ void Table_Class::set_row_description_vfunc_callback(AtkTable* self, gint row, c // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_row_description_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_row_description_vfunc(row , description ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_row_description) + (*base->set_row_description)(self, row, description); - // Call the original underlying C function: - if(base && base->set_row_description) - (*base->set_row_description)(self, row, description); - } } void Table_Class::set_row_header_vfunc_callback(AtkTable* self, gint row, AtkObject* header) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1059,39 +1117,43 @@ void Table_Class::set_row_header_vfunc_callback(AtkTable* self, gint row, AtkObj // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_row_header_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_row_header_vfunc(row , Glib::wrap(header, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_row_header) + (*base->set_row_header)(self, row, header); - // Call the original underlying C function: - if(base && base->set_row_header) - (*base->set_row_header)(self, row, header); - } } void Table_Class::set_summary_vfunc_callback(AtkTable* self, AtkObject* accessible) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1099,38 +1161,42 @@ void Table_Class::set_summary_vfunc_callback(AtkTable* self, AtkObject* accessib // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_summary_vfunc(Glib::wrap(accessible, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_summary_vfunc(Glib::wrap(accessible, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_summary) + (*base->set_summary)(self, accessible); - // Call the original underlying C function: - if(base && base->set_summary) - (*base->set_summary)(self, accessible); - } } gboolean Table_Class::is_column_selected_vfunc_callback(AtkTable* self, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1138,41 +1204,44 @@ gboolean Table_Class::is_column_selected_vfunc_callback(AtkTable* self, gint col // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_column_selected_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_column_selected_vfunc(column )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->is_column_selected) + return (*base->is_column_selected)(self, column); - // Call the original underlying C function: - if(base && base->is_column_selected) - return (*base->is_column_selected)(self, column); - } typedef gboolean RType; return RType(); } gboolean Table_Class::is_row_selected_vfunc_callback(AtkTable* self, gint row) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1180,41 +1249,44 @@ gboolean Table_Class::is_row_selected_vfunc_callback(AtkTable* self, gint row) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_row_selected_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_row_selected_vfunc(row )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->is_row_selected) + return (*base->is_row_selected)(self, row); - // Call the original underlying C function: - if(base && base->is_row_selected) - return (*base->is_row_selected)(self, row); - } typedef gboolean RType; return RType(); } gboolean Table_Class::is_selected_vfunc_callback(AtkTable* self, gint row, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1222,42 +1294,45 @@ gboolean Table_Class::is_selected_vfunc_callback(AtkTable* self, gint row, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_selected_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_selected_vfunc(row , column )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->is_selected) + return (*base->is_selected)(self, row, column); - // Call the original underlying C function: - if(base && base->is_selected) - return (*base->is_selected)(self, row, column); - } typedef gboolean RType; return RType(); } gboolean Table_Class::add_row_selection_vfunc_callback(AtkTable* self, gint row) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1265,41 +1340,44 @@ gboolean Table_Class::add_row_selection_vfunc_callback(AtkTable* self, gint row) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->add_row_selection_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->add_row_selection_vfunc(row )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_row_selection) + return (*base->add_row_selection)(self, row); - // Call the original underlying C function: - if(base && base->add_row_selection) - return (*base->add_row_selection)(self, row); - } typedef gboolean RType; return RType(); } gboolean Table_Class::remove_row_selection_vfunc_callback(AtkTable* self, gint row) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1307,41 +1385,44 @@ gboolean Table_Class::remove_row_selection_vfunc_callback(AtkTable* self, gint r // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->remove_row_selection_vfunc(row + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->remove_row_selection_vfunc(row )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->remove_row_selection) + return (*base->remove_row_selection)(self, row); - // Call the original underlying C function: - if(base && base->remove_row_selection) - return (*base->remove_row_selection)(self, row); - } typedef gboolean RType; return RType(); } gboolean Table_Class::add_column_selection_vfunc_callback(AtkTable* self, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1349,41 +1430,44 @@ gboolean Table_Class::add_column_selection_vfunc_callback(AtkTable* self, gint c // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->add_column_selection_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->add_column_selection_vfunc(column )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_column_selection) + return (*base->add_column_selection)(self, column); - // Call the original underlying C function: - if(base && base->add_column_selection) - return (*base->add_column_selection)(self, column); - } typedef gboolean RType; return RType(); } gboolean Table_Class::remove_column_selection_vfunc_callback(AtkTable* self, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1391,41 +1475,44 @@ gboolean Table_Class::remove_column_selection_vfunc_callback(AtkTable* self, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->remove_column_selection_vfunc(column + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->remove_column_selection_vfunc(column )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->remove_column_selection) + return (*base->remove_column_selection)(self, column); - // Call the original underlying C function: - if(base && base->remove_column_selection) - return (*base->remove_column_selection)(self, column); - } typedef gboolean RType; return RType(); } gint Table_Class::get_selected_columns_vfunc_callback(AtkTable* self, gint** selected) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1433,41 +1520,44 @@ gint Table_Class::get_selected_columns_vfunc_callback(AtkTable* self, gint** sel // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_selected_columns_vfunc(selected + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_selected_columns_vfunc(selected ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_selected_columns) + return (*base->get_selected_columns)(self, selected); - // Call the original underlying C function: - if(base && base->get_selected_columns) - return (*base->get_selected_columns)(self, selected); - } typedef gint RType; return RType(); } gint Table_Class::get_selected_rows_vfunc_callback(AtkTable* self, gint** selected) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1475,34 +1565,37 @@ gint Table_Class::get_selected_rows_vfunc_callback(AtkTable* self, gint** select // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_selected_rows_vfunc(selected + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_selected_rows_vfunc(selected ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_selected_rows) + return (*base->get_selected_rows)(self, selected); - // Call the original underlying C function: - if(base && base->get_selected_rows) - return (*base->get_selected_rows)(self, selected); - } typedef gint RType; return RType(); @@ -1512,7 +1605,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Table_Class::row_inserted_callback(AtkTable* self, gint p0, gint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1520,39 +1613,42 @@ void Table_Class::row_inserted_callback(AtkTable* self, gint p0, gint p1) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_row_inserted(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_row_inserted(p0 , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->row_inserted) - (*base->row_inserted)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->row_inserted) + (*base->row_inserted)(self, p0, p1); } void Table_Class::column_inserted_callback(AtkTable* self, gint p0, gint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1560,39 +1656,42 @@ void Table_Class::column_inserted_callback(AtkTable* self, gint p0, gint p1) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_column_inserted(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_column_inserted(p0 , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->column_inserted) - (*base->column_inserted)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->column_inserted) + (*base->column_inserted)(self, p0, p1); } void Table_Class::row_deleted_callback(AtkTable* self, gint p0, gint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1600,39 +1699,42 @@ void Table_Class::row_deleted_callback(AtkTable* self, gint p0, gint p1) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_row_deleted(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_row_deleted(p0 , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->row_deleted) - (*base->row_deleted)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->row_deleted) + (*base->row_deleted)(self, p0, p1); } void Table_Class::column_deleted_callback(AtkTable* self, gint p0, gint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1640,39 +1742,42 @@ void Table_Class::column_deleted_callback(AtkTable* self, gint p0, gint p1) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_column_deleted(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_column_deleted(p0 , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->column_deleted) - (*base->column_deleted)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->column_deleted) + (*base->column_deleted)(self, p0, p1); } void Table_Class::row_reordered_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1680,37 +1785,40 @@ void Table_Class::row_reordered_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_row_reordered(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_row_reordered(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->row_reordered) - (*base->row_reordered)(self); - } + // Call the original underlying C function: + if(base && base->row_reordered) + (*base->row_reordered)(self); } void Table_Class::column_reordered_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1718,37 +1826,40 @@ void Table_Class::column_reordered_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_column_reordered(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_column_reordered(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->column_reordered) - (*base->column_reordered)(self); - } + // Call the original underlying C function: + if(base && base->column_reordered) + (*base->column_reordered)(self); } void Table_Class::model_changed_callback(AtkTable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1756,33 +1867,36 @@ void Table_Class::model_changed_callback(AtkTable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_model_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_model_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->model_changed) - (*base->model_changed)(self); - } + // Call the original underlying C function: + if(base && base->model_changed) + (*base->model_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/table.h b/libs/gtkmm2/atk/atkmm/table.h index c5b351f06a..da08740e91 100644 --- a/libs/gtkmm2/atk/atkmm/table.h +++ b/libs/gtkmm2/atk/atkmm/table.h @@ -83,8 +83,14 @@ private: protected: Table(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Table(AtkTable* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -337,63 +343,65 @@ public: bool remove_column_selection(int column); -/** + /** * @par Prototype: - * void %row_inserted(int row, int num_inserted) + * void on_my_%row_inserted(int row, int num_inserted) */ Glib::SignalProxy2< void,int,int > signal_row_inserted(); -/** + /** * @par Prototype: - * void %column_inserted(int column, int num_inserted) + * void on_my_%column_inserted(int column, int num_inserted) */ Glib::SignalProxy2< void,int,int > signal_column_inserted(); -/** + /** * @par Prototype: - * void %row_deleted(int row, int num_deleted) + * void on_my_%row_deleted(int row, int num_deleted) */ Glib::SignalProxy2< void,int,int > signal_row_deleted(); -/** + /** * @par Prototype: - * void %column_deleted(int column, int num_deleted) + * void on_my_%column_deleted(int column, int num_deleted) */ Glib::SignalProxy2< void,int,int > signal_column_deleted(); -/** + /** * @par Prototype: - * void %row_reordered() + * void on_my_%row_reordered() */ Glib::SignalProxy0< void > signal_row_reordered(); -/** + /** * @par Prototype: - * void %column_reordered() + * void on_my_%column_reordered() */ Glib::SignalProxy0< void > signal_column_reordered(); -/** + /** * @par Prototype: - * void %model_changed() + * void on_my_%model_changed() */ Glib::SignalProxy0< void > signal_model_changed(); protected: + + #ifdef GLIBMM_VFUNCS_ENABLED virtual Glib::RefPtr get_at_vfunc(int row, int column); #endif //GLIBMM_VFUNCS_ENABLED @@ -542,10 +550,13 @@ protected: namespace Glib { - /** @relates Atk::Table - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Table */ Glib::RefPtr wrap(AtkTable* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/text.cc b/libs/gtkmm2/atk/atkmm/text.cc index 1212ce18ff..a566275f6b 100644 --- a/libs/gtkmm2/atk/atkmm/text.cc +++ b/libs/gtkmm2/atk/atkmm/text.cc @@ -248,7 +248,7 @@ namespace Glib Glib::RefPtr wrap(AtkText* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -315,7 +315,7 @@ void Text_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED gchar* Text_Class::get_text_vfunc_callback(AtkText* self, gint start_offset, gint end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -323,42 +323,45 @@ gchar* Text_Class::get_text_vfunc_callback(AtkText* self, gint start_offset, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_text_vfunc(start_offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_text_vfunc(start_offset , end_offset )).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_text) + return (*base->get_text)(self, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->get_text) - return (*base->get_text)(self, start_offset, end_offset); - } typedef gchar* RType; return RType(); } gunichar Text_Class::get_character_at_offset_vfunc_callback(AtkText* self, gint offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -366,41 +369,44 @@ gunichar Text_Class::get_character_at_offset_vfunc_callback(AtkText* self, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_character_at_offset_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_character_at_offset_vfunc(offset ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_character_at_offset) + return (*base->get_character_at_offset)(self, offset); - // Call the original underlying C function: - if(base && base->get_character_at_offset) - return (*base->get_character_at_offset)(self, offset); - } typedef gunichar RType; return RType(); } gchar* Text_Class::get_text_after_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -408,44 +414,47 @@ gchar* Text_Class::get_text_after_offset_vfunc_callback(AtkText* self, gint offs // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_text_after_offset_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_text_after_offset_vfunc(offset , ((TextBoundary)(boundary_type)) , *(start_offset) , *(end_offset) )).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_text_after_offset) + return (*base->get_text_after_offset)(self, offset, boundary_type, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->get_text_after_offset) - return (*base->get_text_after_offset)(self, offset, boundary_type, start_offset, end_offset); - } typedef gchar* RType; return RType(); } gchar* Text_Class::get_text_at_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -453,44 +462,47 @@ gchar* Text_Class::get_text_at_offset_vfunc_callback(AtkText* self, gint offset, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_text_at_offset_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_text_at_offset_vfunc(offset , ((TextBoundary)(boundary_type)) , *(start_offset) , *(end_offset) )).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_text_at_offset) + return (*base->get_text_at_offset)(self, offset, boundary_type, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->get_text_at_offset) - return (*base->get_text_at_offset)(self, offset, boundary_type, start_offset, end_offset); - } typedef gchar* RType; return RType(); } gchar* Text_Class::get_text_before_offset_vfunc_callback(AtkText* self, gint offset, AtkTextBoundary boundary_type, gint* start_offset, gint* end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -498,44 +510,47 @@ gchar* Text_Class::get_text_before_offset_vfunc_callback(AtkText* self, gint off // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_text_before_offset_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_text_before_offset_vfunc(offset , ((TextBoundary)(boundary_type)) , *(start_offset) , *(end_offset) )).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_text_before_offset) + return (*base->get_text_before_offset)(self, offset, boundary_type, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->get_text_before_offset) - return (*base->get_text_before_offset)(self, offset, boundary_type, start_offset, end_offset); - } typedef gchar* RType; return RType(); } gint Text_Class::get_caret_offset_vfunc_callback(AtkText* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -543,40 +558,43 @@ gint Text_Class::get_caret_offset_vfunc_callback(AtkText* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_caret_offset_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_caret_offset_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_caret_offset) + return (*base->get_caret_offset)(self); - // Call the original underlying C function: - if(base && base->get_caret_offset) - return (*base->get_caret_offset)(self); - } typedef gint RType; return RType(); } void Text_Class::get_character_extents_vfunc_callback(AtkText* self, gint offset, gint* x, gint* y, gint* width, gint* height, AtkCoordType coords) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -584,43 +602,47 @@ void Text_Class::get_character_extents_vfunc_callback(AtkText* self, gint offset // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_character_extents_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_character_extents_vfunc(offset , *(x) , *(y) , *(width) , *(height) , ((CoordType)(coords)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_character_extents) + (*base->get_character_extents)(self, offset, x, y, width, height, coords); - // Call the original underlying C function: - if(base && base->get_character_extents) - (*base->get_character_extents)(self, offset, x, y, width, height, coords); - } } AtkAttributeSet* Text_Class::get_run_attributes_vfunc_callback(AtkText* self, gint offset, gint* start_offset, gint* end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -628,43 +650,46 @@ AtkAttributeSet* Text_Class::get_run_attributes_vfunc_callback(AtkText* self, gi // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_run_attributes_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_run_attributes_vfunc(offset , *(start_offset) , *(end_offset) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_run_attributes) + return (*base->get_run_attributes)(self, offset, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->get_run_attributes) - return (*base->get_run_attributes)(self, offset, start_offset, end_offset); - } typedef AtkAttributeSet* RType; return RType(); } AtkAttributeSet* Text_Class::get_default_attributes_vfunc_callback(AtkText* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -672,40 +697,43 @@ AtkAttributeSet* Text_Class::get_default_attributes_vfunc_callback(AtkText* self // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_default_attributes_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_default_attributes_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_default_attributes) + return (*base->get_default_attributes)(self); - // Call the original underlying C function: - if(base && base->get_default_attributes) - return (*base->get_default_attributes)(self); - } typedef AtkAttributeSet* RType; return RType(); } gint Text_Class::get_character_count_vfunc_callback(AtkText* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -713,40 +741,43 @@ gint Text_Class::get_character_count_vfunc_callback(AtkText* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_character_count_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_character_count_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_character_count) + return (*base->get_character_count)(self); - // Call the original underlying C function: - if(base && base->get_character_count) - return (*base->get_character_count)(self); - } typedef gint RType; return RType(); } gint Text_Class::get_offset_at_point_vfunc_callback(AtkText* self, gint x, gint y, AtkCoordType coords) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -754,43 +785,46 @@ gint Text_Class::get_offset_at_point_vfunc_callback(AtkText* self, gint x, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_offset_at_point_vfunc(x + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_offset_at_point_vfunc(x , y , ((CoordType)(coords)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_offset_at_point) + return (*base->get_offset_at_point)(self, x, y, coords); - // Call the original underlying C function: - if(base && base->get_offset_at_point) - return (*base->get_offset_at_point)(self, x, y, coords); - } typedef gint RType; return RType(); } gint Text_Class::get_n_selections_vfunc_callback(AtkText* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -798,40 +832,43 @@ gint Text_Class::get_n_selections_vfunc_callback(AtkText* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_n_selections_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_n_selections_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_n_selections) + return (*base->get_n_selections)(self); - // Call the original underlying C function: - if(base && base->get_n_selections) - return (*base->get_n_selections)(self); - } typedef gint RType; return RType(); } gchar* Text_Class::get_selection_vfunc_callback(AtkText* self, gint selection_num, gint* start_offset, gint* end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -839,43 +876,46 @@ gchar* Text_Class::get_selection_vfunc_callback(AtkText* self, gint selection_nu // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_selection_vfunc(selection_num + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_selection_vfunc(selection_num , *(start_offset) , *(end_offset) )).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_selection) + return (*base->get_selection)(self, selection_num, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->get_selection) - return (*base->get_selection)(self, selection_num, start_offset, end_offset); - } typedef gchar* RType; return RType(); } gboolean Text_Class::add_selection_vfunc_callback(AtkText* self, gint start_offset, gint end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -883,42 +923,45 @@ gboolean Text_Class::add_selection_vfunc_callback(AtkText* self, gint start_offs // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->add_selection_vfunc(start_offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->add_selection_vfunc(start_offset , end_offset )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_selection) + return (*base->add_selection)(self, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->add_selection) - return (*base->add_selection)(self, start_offset, end_offset); - } typedef gboolean RType; return RType(); } gboolean Text_Class::remove_selection_vfunc_callback(AtkText* self, gint selection_num) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -926,41 +969,44 @@ gboolean Text_Class::remove_selection_vfunc_callback(AtkText* self, gint selecti // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->remove_selection_vfunc(selection_num + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->remove_selection_vfunc(selection_num )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->remove_selection) + return (*base->remove_selection)(self, selection_num); - // Call the original underlying C function: - if(base && base->remove_selection) - return (*base->remove_selection)(self, selection_num); - } typedef gboolean RType; return RType(); } gboolean Text_Class::set_selection_vfunc_callback(AtkText* self, gint selection_num, gint start_offset, gint end_offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -968,43 +1014,46 @@ gboolean Text_Class::set_selection_vfunc_callback(AtkText* self, gint selection_ // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_selection_vfunc(selection_num + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_selection_vfunc(selection_num , start_offset , end_offset )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_selection) + return (*base->set_selection)(self, selection_num, start_offset, end_offset); - // Call the original underlying C function: - if(base && base->set_selection) - return (*base->set_selection)(self, selection_num, start_offset, end_offset); - } typedef gboolean RType; return RType(); } gboolean Text_Class::set_caret_offset_vfunc_callback(AtkText* self, gint offset) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1012,34 +1061,37 @@ gboolean Text_Class::set_caret_offset_vfunc_callback(AtkText* self, gint offset) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_caret_offset_vfunc(offset + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_caret_offset_vfunc(offset )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_caret_offset) + return (*base->set_caret_offset)(self, offset); - // Call the original underlying C function: - if(base && base->set_caret_offset) - return (*base->set_caret_offset)(self, offset); - } typedef gboolean RType; return RType(); @@ -1049,7 +1101,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Text_Class::text_changed_callback(AtkText* self, gint p0, gint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1057,39 +1109,42 @@ void Text_Class::text_changed_callback(AtkText* self, gint p0, gint p1) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_text_changed(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_text_changed(p0 , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->text_changed) - (*base->text_changed)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->text_changed) + (*base->text_changed)(self, p0, p1); } void Text_Class::text_caret_moved_callback(AtkText* self, gint p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1097,38 +1152,41 @@ void Text_Class::text_caret_moved_callback(AtkText* self, gint p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_text_caret_moved(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_text_caret_moved(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->text_caret_moved) - (*base->text_caret_moved)(self, p0); - } + // Call the original underlying C function: + if(base && base->text_caret_moved) + (*base->text_caret_moved)(self, p0); } void Text_Class::text_selection_changed_callback(AtkText* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1136,37 +1194,40 @@ void Text_Class::text_selection_changed_callback(AtkText* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_text_selection_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_text_selection_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->text_selection_changed) - (*base->text_selection_changed)(self); - } + // Call the original underlying C function: + if(base && base->text_selection_changed) + (*base->text_selection_changed)(self); } void Text_Class::text_attributes_changed_callback(AtkText* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1174,33 +1235,36 @@ void Text_Class::text_attributes_changed_callback(AtkText* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_text_attributes_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_text_attributes_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->text_attributes_changed) - (*base->text_attributes_changed)(self); - } + // Call the original underlying C function: + if(base && base->text_attributes_changed) + (*base->text_attributes_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/atk/atkmm/text.h b/libs/gtkmm2/atk/atkmm/text.h index 01d10f4658..a7ac7cb39c 100644 --- a/libs/gtkmm2/atk/atkmm/text.h +++ b/libs/gtkmm2/atk/atkmm/text.h @@ -297,8 +297,14 @@ private: protected: Text(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Text(AtkText* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -622,33 +628,33 @@ public: TextClipType x_clip_type, TextClipType y_clip_type); -/** + /** * @par Prototype: - * void %text_changed(int position, int length) + * void on_my_%text_changed(int position, int length) */ Glib::SignalProxy2< void,int,int > signal_text_changed(); -/** + /** * @par Prototype: - * void %text_caret_moved(int location) + * void on_my_%text_caret_moved(int location) */ Glib::SignalProxy1< void,int > signal_text_caret_moved(); -/** + /** * @par Prototype: - * void %text_selection_changed() + * void on_my_%text_selection_changed() */ Glib::SignalProxy0< void > signal_text_selection_changed(); -/** + /** * @par Prototype: - * void %text_attributes_changed() + * void on_my_%text_attributes_changed() */ Glib::SignalProxy0< void > signal_text_attributes_changed(); @@ -757,10 +763,13 @@ protected: namespace Glib { - /** @relates Atk::Text - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Text */ Glib::RefPtr wrap(AtkText* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/atkmm/value.cc b/libs/gtkmm2/atk/atkmm/value.cc index 3a92b2df12..e94c2a8cb0 100644 --- a/libs/gtkmm2/atk/atkmm/value.cc +++ b/libs/gtkmm2/atk/atkmm/value.cc @@ -37,7 +37,7 @@ namespace Glib Glib::RefPtr wrap(AtkValue* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -87,7 +87,7 @@ void Value_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED void Value_Class::get_current_value_vfunc_callback(AtkValue* self, GValue* value) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -95,38 +95,42 @@ void Value_Class::get_current_value_vfunc_callback(AtkValue* self, GValue* value // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_current_value_vfunc(*reinterpret_cast(value) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_current_value_vfunc(*reinterpret_cast(value) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_current_value) + (*base->get_current_value)(self, value); - // Call the original underlying C function: - if(base && base->get_current_value) - (*base->get_current_value)(self, value); - } } void Value_Class::get_maximum_value_vfunc_callback(AtkValue* self, GValue* value) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -134,38 +138,42 @@ void Value_Class::get_maximum_value_vfunc_callback(AtkValue* self, GValue* value // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_maximum_value_vfunc(*reinterpret_cast(value) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_maximum_value_vfunc(*reinterpret_cast(value) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_maximum_value) + (*base->get_maximum_value)(self, value); - // Call the original underlying C function: - if(base && base->get_maximum_value) - (*base->get_maximum_value)(self, value); - } } void Value_Class::get_minimum_value_vfunc_callback(AtkValue* self, GValue* value) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -173,38 +181,42 @@ void Value_Class::get_minimum_value_vfunc_callback(AtkValue* self, GValue* value // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_minimum_value_vfunc(*reinterpret_cast(value) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_minimum_value_vfunc(*reinterpret_cast(value) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_minimum_value) + (*base->get_minimum_value)(self, value); - // Call the original underlying C function: - if(base && base->get_minimum_value) - (*base->get_minimum_value)(self, value); - } } gboolean Value_Class::set_current_value_vfunc_callback(AtkValue* self, const GValue* value) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -212,34 +224,37 @@ gboolean Value_Class::set_current_value_vfunc_callback(AtkValue* self, const GVa // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->set_current_value_vfunc(*reinterpret_cast(value) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->set_current_value_vfunc(*reinterpret_cast(value) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_current_value) + return (*base->set_current_value)(self, value); - // Call the original underlying C function: - if(base && base->set_current_value) - return (*base->set_current_value)(self, value); - } typedef gboolean RType; return RType(); diff --git a/libs/gtkmm2/atk/atkmm/value.h b/libs/gtkmm2/atk/atkmm/value.h index 92f2e487fd..113805b289 100644 --- a/libs/gtkmm2/atk/atkmm/value.h +++ b/libs/gtkmm2/atk/atkmm/value.h @@ -74,8 +74,14 @@ private: protected: Value(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Value(AtkValue* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -162,10 +168,13 @@ protected: namespace Glib { - /** @relates Atk::Value - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Atk::Value */ Glib::RefPtr wrap(AtkValue* object, bool take_copy = false); diff --git a/libs/gtkmm2/atk/src/Makefile.am b/libs/gtkmm2/atk/src/Makefile.am new file mode 100644 index 0000000000..13eef17c8a --- /dev/null +++ b/libs/gtkmm2/atk/src/Makefile.am @@ -0,0 +1,14 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +sublib_name = atkmm +sublib_namespace = Atk +sublib_parentdir = atkmm +files_defs = atk.defs atk_enums.defs atk_methods.defs atk_signals.defs atk_vfuncs.defs \ + atk_docs.xml atk_docs_override.xml + +include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment + + + + diff --git a/libs/gtkmm2/atk/src/Makefile.in b/libs/gtkmm2/atk/src/Makefile.in new file mode 100644 index 0000000000..b7667c8701 --- /dev/null +++ b/libs/gtkmm2/atk/src/Makefile.in @@ -0,0 +1,463 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment \ + $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment \ + $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment \ + $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment +subdir = atk/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +sublib_name = atkmm +sublib_namespace = Atk +sublib_parentdir = atkmm +files_defs = atk.defs atk_enums.defs atk_methods.defs atk_signals.defs atk_vfuncs.defs \ + atk_docs.xml atk_docs_override.xml + +tools_dir = $(top_srcdir)/tools +tools_dir_m4 = $(top_srcdir)/tools/m4 +tools_dir_pm = $(top_srcdir)/tools/pm +gensrc_destdir = $(srcdir)/../$(sublib_name) +stamp_dir = $(srcdir)/.stamps +files_tools_m4 = convert.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ + convert_gtk.m4 convert_pango.m4 + +tools_m4 = $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4) +files_posix_hg = +files_win32_hg = +files_general_hg = action.hg component.hg document.hg editabletext.hg hyperlink.hg hypertext.hg image.hg \ + implementor.hg noopobject.hg object.hg objectaccessible.hg relation.hg relationset.hg selection.hg \ + stateset.hg streamablecontent.hg table.hg text.hg value.hg + +files_general_deprecated_hg = +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +# tools_pm = $(files_tools_pm:%.pm=$(tools_dir_pm)/%.pm) +files_all_ccg = $(files_all_hg:%.hg=%.ccg) +files_h = $(files_all_hg:%.hg=$(gensrc_destdir)/%.h) +files_cc = $(files_all_hg:%.hg=$(gensrc_destdir)/%.cc) +files_stamp = $(files_all_hg:%.hg=$(stamp_dir)/stamp-%) + +#Installed gmmproc stuff, from glibmm: +gmmproc_path = $(GMMPROC) +gmmproc_dir = $(GMMPROC_DIR) + +# We use our own m4 and pm files as well as the ones installed by gtkmm: +# Our override m4 include seems to need to be before the default one. +gmmproc_args = -I $(tools_dir_m4) --defs $(srcdir) +run_gmmproc = $(gmmproc_path) $(gmmproc_args) +gen_wrap_init_path = $(gmmproc_dir)/generate_wrap_init.pl +gen_wrap_init_args = --namespace=$(sublib_namespace) --parent_dir=$(sublib_parentdir) +run_gen_wrap_init = $(gen_wrap_init_path) $(gen_wrap_init_args) +EXTRA_DIST = Makefile_list_of_hg.am_fragment \ + $(files_defs) $(files_all_hg) $(files_all_ccg) + +sublib_srcdir = $(srcdir)/../src +files_hg_with_path = $(patsubst %.hg,$(sublib_srcdir)/%.hg,$(files_all_hg)) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment $(srcdir)/../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atk/src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu atk/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +@MAINTAINER_MODE_FALSE@all-local: +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +$(stamp_dir)/stamp-%: %.hg %.ccg $(tools_m4) $(files_defs) + $(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir) + @echo 'timestamp' > $@ + +$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_path) $(files_hg_with_path) + $(run_gen_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) >$@ + +create-stamp-dir: + @(test -d $(stamp_dir) || mkdir $(stamp_dir)) + +@MAINTAINER_MODE_TRUE@all-local: create-stamp-dir $(files_stamp) $(gensrc_destdir)/wrap_init.cc + +maintainer-clean-local: + rm -rf $(stamp_dir) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/atk/src/Makefile_list_of_hg.am_fragment b/libs/gtkmm2/atk/src/Makefile_list_of_hg.am_fragment new file mode 100644 index 0000000000..8c90339973 --- /dev/null +++ b/libs/gtkmm2/atk/src/Makefile_list_of_hg.am_fragment @@ -0,0 +1,12 @@ +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +files_posix_hg = +files_win32_hg = +files_general_hg = action.hg component.hg document.hg editabletext.hg hyperlink.hg hypertext.hg image.hg \ + implementor.hg noopobject.hg object.hg objectaccessible.hg relation.hg relationset.hg selection.hg \ + stateset.hg streamablecontent.hg table.hg text.hg value.hg +files_general_deprecated_hg = + +include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment diff --git a/libs/gtkmm2/atk/src/action.ccg b/libs/gtkmm2/atk/src/action.ccg new file mode 100644 index 0000000000..6118feefe0 --- /dev/null +++ b/libs/gtkmm2/atk/src/action.ccg @@ -0,0 +1,22 @@ +// -*- c++ -*- +/* $Id: action.ccg,v 1.1 2003/01/21 13:36:56 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + diff --git a/libs/gtkmm2/atk/src/action.hg b/libs/gtkmm2/atk/src/action.hg new file mode 100644 index 0000000000..700e92fc19 --- /dev/null +++ b/libs/gtkmm2/atk/src/action.hg @@ -0,0 +1,71 @@ +/* $Id: action.hg,v 1.5 2004/03/12 20:35:53 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/interface_p.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { typedef struct _AtkActionIface AtkActionIface; } +#endif + + +namespace Atk +{ + +/** The ATK interface provided by UI components which the user can activate/interact with, + * This should be implemented by instances of Atk::Object classes with which the user can interact directly, i.e. buttons, + * checkboxes, scrollbars, e.g. components which are not "passive" providers of UI information. + * + * Exceptions: when the user interaction is already covered by another appropriate interface such as Atk::EditableText + * (insert/delete test, etc.) or Atk::Value (set value) then these actions should not be exposed by Atk::Action as well. + * + * Also note that the Atk::Action API is limited in that parameters may not be passed to the object being activated; + * thus the action must be self-contained and specifiable via only a single "verb". Concrete examples include "press", + * "release", "click" for buttons, "drag" (meaning initiate drag) and "drop" for drag sources and drop targets, etc. + * + * Though most UI interactions on components should be invocable via keyboard as well as mouse, there will generally be + * a close mapping between "mouse actions" that are possible on a component and the Atk::Actions. Where mouse and keyboard + * actions are redundant in effect, Atk::Action should expose only one action rather than exposing redundant actions if + * possible. By convention we have been using "mouse centric" terminology for Atk::Action names. + */ +class Action : public Glib::Interface +{ + _CLASS_INTERFACE(Action, AtkAction, ATK_ACTION, AtkActionIface) + +public: + + _WRAP_METHOD(bool do_action(int i), atk_action_do_action) + _WRAP_METHOD(int get_n_actions() const, atk_action_get_n_actions) + _WRAP_METHOD(Glib::ustring get_description(int i) const, atk_action_get_description) + _WRAP_METHOD(Glib::ustring get_name(int i) const, atk_action_get_name) + _WRAP_METHOD(Glib::ustring get_keybinding(int i), atk_action_get_keybinding) + _WRAP_METHOD(bool set_description(int i, const Glib::ustring& desc), atk_action_set_description) + _WRAP_METHOD(Glib::ustring get_localized_name(int i), atk_action_get_localized_name) + +protected: + _WRAP_VFUNC(bool do_action(int i), "do_action") + _WRAP_VFUNC(int get_n_actions() const, "get_n_actions") + _WRAP_VFUNC(const char* get_description(int i) const, "get_description") + _WRAP_VFUNC(const char* get_name(int i) const, "get_name") + _WRAP_VFUNC(const char* get_keybinding(int i) const, "get_keybinding") + _WRAP_VFUNC(bool set_description(int i, const Glib::ustring& desc), "set_description") +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/atk.defs b/libs/gtkmm2/atk/src/atk.defs new file mode 100644 index 0000000000..6d470030ec --- /dev/null +++ b/libs/gtkmm2/atk/src/atk.defs @@ -0,0 +1,4 @@ +(include atk_methods.defs) +(include atk_signals.defs) +(include atk_enums.defs) +(include atk_vfuncs.defs) diff --git a/libs/gtkmm2/atk/src/atk_docs.xml b/libs/gtkmm2/atk/src/atk_docs.xml new file mode 100644 index 0000000000..1bd4071d54 --- /dev/null +++ b/libs/gtkmm2/atk/src/atk_docs.xml @@ -0,0 +1,4049 @@ + + + +Gets the text from the specified selection. + + + + + + an #AtkText + + + + The selection number. The selected regions are +assigned numbers that correspond to how far the region is from the +start of the text. The selected region closest to the beginning +of the text region is assigned the number 0, etc. Note that adding, +moving or deleting a selected region can change the numbering. + + + + passes back the start position of the selected region + + + + passes back the end position of (e.g. offset immediately past) +the selected region + + + + the selected text. + + + + + +Gets the position of the image in the form of a point specifying the +images top-left corner. The values of @x and @y are returned as -1 +if the values cannot be obtained. + + + + + a #GObject instance that implements AtkImageIface + + + + address of #gint to put x coordinate position + + + + address of #gint to put y coordinate position + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + + + + + +Gets a boolean value indicating whether the specified @row +is selected + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a gboolean representing if the row is selected, or 0 +if value does not implement this interface. + + + + + +Gets the number of rows in the table. + + + + + + a GObject instance that implements AtkTableIface + + + + a gint representing the number of rows, or 0 +if value does not implement this interface. + + + + + +Gets a reference to the state set of the accessible; the caller must +unreference it when it is no longer needed. + + + + + + an #AtkObject + + + + a reference to an #AtkStateSet which is the state +set of the accessible + + + + + +Specifies a function to be called when a property changes value. + + + + + + an #AtkObject + + + + a function to be called when a property changes its value + + + + a #guint which is the handler id used in +atk_object_remove_property_change_handler() + + + + + +Sets the accessible description of the accessible. + + + + + an #AtkObject + + + + a character string to be set as the accessible description + + + + + + + + +Register a new object state. + + + + + + a character string describing the new state. + + + + an #AtkState value for the new state. + + + + + +Gets the zorder of the component. The value G_MININT will be returned +if the layer of the component is not ATK_LAYER_MDI or ATK_LAYER_WINDOW. + + + + + + an #AtkComponent + + + + a gint which is the zorder of the component, i.e. the depth at +which the component is shown in relation to other components in the same +container. + + + + + +Adds the specified @row to the selection. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a gboolean representing if row was successfully added to selection, +or 0 if value does not implement this interface. + + + + + +Provides a default (non-functioning stub) #AtkObject. +Application maintainers should not use this method. + + + + + + a #GObject + + + + a default (non-functioning stub) #AtkObject + + + + + +Gets the description string describing the #AtkStateType @type. + + + + + + The #AtkStateType whose name is required + + + + the string describing the AtkStateType + + + + + +Gets the index with the hypertext document at which this link begins. + + + + + + an #AtkHyperlink + + + + the index with the hypertext document at which this link begins + + + + + +Gets the layer of the accessible. + + + + + + an #AtkObject + + + + an #AtkLayer which is the layer of the accessible + +@Deprecated: Use atk_component_get_layer instead. + + + + + +Insert text at a given position. + + + + + an #AtkEditableText + + + + the text to insert + + + + the length of text to insert, in bytes + + + + The caller initializes this to +the position at which to insert the text. After the call it +points at the position after the newly inserted text. + + + + + + + + +Gets a reference to an object's #AtkObject implementation, if +the object implements #AtkObjectIface + + + + + + The #GObject instance which should implement #AtkImplementorIface +if a non-null return value is required. + + + + a reference to an object's #AtkObject implementation + + + + + +Since the document that a link is associated with may have changed +this method returns %TRUE if the link is still valid (with +respect to the document it references) and %FALSE otherwise. + + + + + + an #AtkHyperlink + + + + whether or not this link is still valid + + + + + +Gets the offset of the character located at coordinates @x and @y. @x and @y +are interpreted as being relative to the screen or this widget's window +depending on @coords. + + + + + + an #AtkText + + + + screen x-position of character + + + + screen y-position of character + + + + specify whether coordinates are relative to the screen or +widget window + + + + the offset to the character which is located at +the specified @x and @y coordinates. + + + + + +Gets the number of selected regions. + + + + + + an #AtkText + + + + The number of selected regions, or -1 if a failure +occurred. + + + + + +Creates an #AtkAttributeSet which consists of the attributes explicitly +set at the position @offset in the text. @start_offset and @end_offset are +set to the start and end of the range around @offset where the attributes are +invariant. Note that @end_offset is the offset of the first character +after the range. See the enum AtkTextAttribute for types of text +attributes that can be returned. Note that other attributes may also be +returned. + + + + + + an #AtkText + + + + the offset at which to get the attributes + + + + the address to put the start offset of the range + + + + the address to put the end offset of the range + + + + an #AtkAttributeSet which contains the attributes explicitly set +at @offset. This #AtkAttributeSet should be freed by a call to +atk_attribute_set_free(). + + + + + +Gets the caption for the @table. + + + + + + a GObject instance that implements AtkTableInterface + + + + a AtkObject* representing the table caption, or %NULL +if value does not implement this interface. + + + + + +Gets a reference to the accessible child, if one exists, at the +coordinate point specified by @x and @y. + + + + + + the #AtkComponent + + + + x coordinate + + + + y coordinate + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + a reference to the accessible child, if one exists + + + + + +Adds the specified function to the list of functions to be called +when an object receives focus. + + + + + + Function to be added to the list of functions to be called +when an object receives focus. + + + + added focus tracker id, or 0 on failure. + + + + + +Sets the summary description of the table. + + + + + a GObject instance that implements AtkTableIface + + + + an #AtkObject representing the summary description +to set for @table + + + + + + + + +Copy text from @start_pos up to, but not including @end_pos +to the clipboard and then delete from the widget. + + + + + an #AtkEditableText + + + + start position + + + + end position + + + + + + + + +Gets the accessible object for the specified @obj. + + + + + + a #GObject + + + + a #AtkObject which is the accessible object for the @obj + + + + + +Gets the description text of the specified @column in the table + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in @table + + + + a gchar* representing the column description, or %NULL +if value does not implement this interface. + + + + + +Gets the specified text. + + + + + + an #AtkText + + + + position + + + + the character at @offset. + + + + + +Creates an instance of an #AtkObjectFactory which generates primitive +(non-functioning) #AtkObjects. + + + + + + an instance of an #AtkObjectFactory + + + + + +Gets the description string describing the #AtkRole @role. + + + + + + The #AtkRole whose name is required + + + + the string describing the AtkRole + + + + + +Creates an #AtkAttributeSet which consists of the default values of +attributes for the text. See the enum AtkTextAttribute for types of text +attributes that can be returned. Note that other attributes may also be +returned. + + + + + + an #AtkText + + + + an #AtkAttributeSet which contains the default values of attributes. +at @offset. This #AtkAttributeSet should be freed by a call to +atk_attribute_set_free(). + + + + + +Changes the start and end offset of the specified selection. + + + + + + an #AtkText + + + + The selection number. The selected regions are +assigned numbers that correspond to how far the region is from the +start of the text. The selected region closest to the beginning +of the text region is assigned the number 0, etc. Note that adding, +moving or deleting a selected region can change the numbering. + + + + the new start position of the selection + + + + the new end position of (e.g. offset immediately past) +the selection + + + + %TRUE if success, %FALSE otherwise + + + + + +Gets the number of mime types supported by this object. + + + + + + a GObject instance that implements AtkStreamableContentIface + + + + a gint which is the number of mime types supported by the object. + + + + + +Gets the type of @relation + + + + + + an #AtkRelation + + + + the type of @relation + + + + + +Paste text from clipboard to specified @position. + + + + + an #AtkEditableText + + + + position to paste + + + + + + + + +Gets the GType of the accessible which is created by the factory. +The value G_TYPE_INVALID is returned if no type if found. + + + + + an #AtkObjectFactory + + + + the type of the accessible which is created by the @factory. + + + + + +Gets the link in this hypertext document at index +@link_index + + + + + + an #AtkHypertext + + + + an integer specifying the desired link + + + + the link in this hypertext document at +index @link_index + + + + + +Get the bounding box for text within the specified range. + + + + + an #AtkText + + + + The offset of the first text character for which boundary +information is required. + + + + The offset of the text character after the last character +for which boundary information is required. + + + + Specify whether coordinates are relative to the screen or widget window. + + + + A pointer to a AtkTextRectangle which is filled in by this function. + + + + + + + + +Gets a #gint representing the column at the specified @index_, or -1 +if the table does not implement this interface + + + + + + a GObject instance that implements AtkTableInterface + + + + a #gint representing an index in @table + + + + a gint representing the column at the specified index. + + + + + +Gets the accessible parent of the accessible. + + + + + + an #AtkObject + + + + a #AtkObject representing the accessible parent of the accessible + + + + + +Determines if the current child of this object is selected +Note: callers should not rely on %NULL or on a zero value for +indication of whether AtkSelectionIface is implemented, they should +use type checking/interface checking macros or the +atk_get_accessible_value() convenience method. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + a #gint specifying the child index. + + + + a gboolean representing the specified child is selected, or 0 +if @selection does not implement this interface. + + + + + +Adds a selection bounded by the specified offsets. + + + + + + an #AtkText + + + + the start position of the selected region + + + + the offset of the first character after the selected region. + + + + %TRUE if success, %FALSE otherwise + + + + + +Gets the character count. + + + + + + an #AtkText + + + + the number of characters. + + + + + +Gets the description string describing the #AtkRelationType @type. + + + + + + The #AtkRelationType whose name is required + + + + the string describing the AtkRelationType + + + + + +Sets the specified row header to @header. + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + an #AtkTable + + + + + + + + +Gets the GObject for which @obj is the accessible object. + + + + + + a #AtkObject + + + + a #GObject which is the object for which @obj is the accessible objedct + + + + + +Creates a new empty relation set. + + + + + + a new #AtkRelationSet + + + + + +Adds the specified AtkObject to the target for the relation, if it is +not already present. + +Since: 1.9 + + + + + an #AtkRelation + + + + an #AtkObject + + + + + + + + +Gets the number of anchors associated with this hyperlink. + + + + + + an #AtkHyperlink + + + + the number of anchors associated with this hyperlink + + + + + +Sets the accessible name of the accessible. + + + + + an #AtkObject + + + + a character string to be set as the accessible name + + + + + + + + +Determines whether this AtkHyperlink is selected + + + + + + an #AtkHyperlink + + + + True is the AtkHyperlink is selected, False otherwise + + + + + +Gets a reference to the specified accessible child of the object. +The accessible children are 0-based so the first accessible child is +at index 0, the second at index 1 and so on. + + + + + + an #AtkObject + + + + a gint representing the position of the child, starting from 0 + + + + an #AtkObject representing the specified accessible child +of the accessible. + + + + + +Determines the relation at the specified position in the relation set. + + + + + + an #AtkRelationSet + + + + a gint representing a position in the set, starting from 0. + + + + a #AtkRelation, which is the relation at position i in the set. + + + + + +Removes the specified @row from the selection. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a gboolean representing if the row was successfully removed from +the selection, or 0 if value does not implement this interface. + + + + + +Sets the caret (cursor) position to the specified @offset. + + + + + + an #AtkText + + + + position + + + + %TRUE if success, %FALSE otherwise. + + + + + +Get the #AtkTextAttribute type corresponding to a text attribute name. + + + + + + a string which is the (non-localized) name of an ATK text attribute. + + + + the #AtkTextAttribute enumerated type corresponding to the specified +name, +or #ATK_TEXT_ATTRIBUTE_INVALID if no matching text attribute is found. + + + + + +Get a textual description of this image. + + + + + + a #GObject instance that implements AtkImageIface + + + + a string representing the image description + + + + + +Gets a %gpointer that points to an instance of the DOM. It is +up to the caller to check atk_document_get_type to determine +how to cast this pointer. + + + + + + a #GObject instance that implements AtkDocumentIface + + + + a %gpointer that points to an instance of the DOM. + + + + + +Gets a reference to the accessible object representing the specified +selected child of the object. +Note: callers should not rely on %NULL or on a zero value for +indication of whether AtkSelectionIface is implemented, they should +use type checking/interface checking macros or the +atk_get_accessible_value() convenience method. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + a #gint specifying the index in the selection set. (e.g. the +ith selection as opposed to the ith child). + + + + an #AtkObject representing the selected accessible , or %NULL +if @selection does not implement this interface. + + + + + +Removes the specified focus tracker from the list of functions +to be called when any object receives focus. + + + + + the id of the focus tracker to remove + + + + + + + + +Grabs focus for this @component. + + + + + + an #AtkComponent + + + + %TRUE if successful, %FALSE otherwise. + + + + + +Associate @name with a new #AtkRelationType + + + + + + a name string + + + + an #AtkRelationType associated with @name + + + + + +Add a new relation of the specified type with the specified target to +the current relation set if the relation set does not contain a relation +of that type. If it is does contain a relation of that typea the target +is added to the relation. + +Since: 1.9 + + + + + an #AtkRelationSet + + + + an #AtkRelationType + + + + an #AtkObject + + + + + + + + +Gets the role of the accessible. + + + + + + an #AtkObject + + + + an #AtkRole which is the role of the accessible + + + + + +Adds the specified function to the list of functions to be called +when a key event occurs. The @data element will be passed to the +#AtkKeySnoopFunc (@listener) as the @func_data param, on notification. + + + + + + the listener to notify + + + + a #gpointer that points to a block of data that should be sent to the registered listeners, +along with the event notification, when it occurs. + + + + added event listener id, or 0 on failure. + + + + + +Emits a state-change signal for the specified state. + + + + + an #AtkObject + + + + an #AtkState whose state is changed + + + + a gboolean which indicates whether the state is being set on or off + + + + + + + + +Cause the focus tracker functions which have been specified to be +executed for the object. + + + + + an #AtkObject + + + + + + + + +Gets a string indicating the document type. + + + + + + a #GObject instance that implements AtkDocumentIface + + + + a string indicating the document type + + + + + +Sets the textual description for this image. + + + + + + a #GObject instance that implements AtkImageIface + + + + a string description to set for @image + + + + boolean TRUE, or FALSE if operation could +not be completed. + + + + + +Gets the root accessible container for the current application. + + + + + + the root accessible container for the current application + + + + + +Copy text from @start_pos up to, but not including @end_pos +to the clipboard. + + + + + an #AtkEditableText + + + + start position + + + + end position + + + + + + + + +Gets the #AtkRelationSet associated with the object. + + + + + + an #AtkObject + + + + an #AtkRelationSet representing the relation set of the object. + + + + + +Provides an #AtkObject that implements an accessibility interface +on behalf of @obj + + + + + + The #AtkObjectFactory associated with @obj's +object type + + + + a #GObject + + + + an #AtkObject that implements an accessibility interface +on behalf of @obj + + + + + +Gets the selected rows of the table by initializing **selected with +the selected row numbers. This array should be freed by the caller. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint** that is to contain the selected row numbers + + + + a gint representing the number of selected rows, +or zero if value does not implement this interface. + + + + + +Removes all states from the state set. + + + + + an #AtkStateSet + + + + + + + + +Gets the 0-based index of this accessible in its parent; returns -1 if the +accessible does not have an accessible parent. + + + + + + an #AtkObject + + + + an integer which is the index of the accessible in its parent + + + + + +Gets the specified text. + +If the boundary_type if ATK_TEXT_BOUNDARY_CHAR the character at the +offset is returned. + +If the boundary_type is ATK_TEXT_BOUNDARY_WORD_START the returned string +is from the word start at or before the offset to the word start after +the offset. + +The returned string will contain the word at the offset if the offset +is inside a word and will contain the word before the offset if the +offset is not inside a word. + +If the boundary_type is ATK_TEXT_BOUNDARY_WORD_END the returned string +is from the word end before the offset to the word end at or after the +offset. + +The returned string will contain the word at the offset if the offset +is inside a word and will contain the word after to the offset if the +offset is not inside a word. + +If the boundary type is ATK_TEXT_BOUNDARY_SENTENCE_START the returned +string is from the sentence start at or before the offset to the sentence +start after the offset. + +The returned string will contain the sentence at the offset if the offset +is inside a sentence and will contain the sentence before the offset +if the offset is not inside a sentence. + +If the boundary_type is ATK_TEXT_BOUNDARY_SENTENCE_END the returned string +is from the sentence end before the offset to the sentence end at or +after the offset. + +The returned string will contain the sentence at the offset if the offset +is inside a sentence and will contain the sentence after the offset +if the offset is not inside a sentence. + +If the boundary type is ATK_TEXT_BOUNDARY_LINE_START the returned +string is from the line start at or before the offset to the line +start after the offset. + +If the boundary_type is ATK_TEXT_BOUNDARY_LINE_END the returned string +is from the line end before the offset to the line end at or after +the offset. + + + + + + an #AtkText + + + + position + + + + An #AtkTextBoundary + + + + the start offset of the returned string + + + + the offset of the first character after the +returned substring + + + + the text at @offset bounded by the specified @boundary_type. + + + + + +Adds the specified @column to the selection. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in @table + + + + a gboolean representing if the column was successfully added to +the selection, or 0 if value does not implement this interface. + + + + + +Gets the minimum value of this object. + + + + + a GObject instance that implements AtkValueIface + + + + a #GValue representing the minimum accessible value + + + + + + + + +Gets the target list of @relation + + + + + + an #AtkRelation + + + + the target list of @relation + + + + + +Gets the currently focused object. + + + + + + the currently focused object for the current application + + + + + +Removes a relationship of the specified type with the specified target. + + + + + + The #AtkObject from which an AtkRelation is to be removed. + + + + The #AtkRelationType of the relation + + + + The #AtkObject which is the target of the relation to be removed. + + + +TRUE if the relationship is removed. + + + + + +Removes the state for the specified type from the state set. + + + + + + an #AtkStateSet + + + + an #AtkType + + + + %TRUE if @type was the state type is in @set. + + + + + +Gets the value for the index of the #AtkTextAttribute + + + + + + The #AtkTextAttribute for which a value is required + + + + The index of the required value + + + + a string containing the value; this string should not be freed; +NULL is returned if there are no values maintained for the attr value. + + + + + +Checks whether the specified point is within the extent of the @component. + + + + + + the #AtkComponent + + + + x coordinate + + + + y coordinate + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + %TRUE or %FALSE indicating whether the specified point is within +the extent of the @component or not + + + + + +Gets the layer of the component. + + + + + + an #AtkComponent + + + + an #AtkLayer which is the layer of the component + + + + + +Add the specified handler to the set of functions to be called +when this object receives focus events (in or out). If the handler is +already added it is not added again + + + + + + The #AtkComponent to attach the @handler to + + + + The #AtkFocusHandler to be attached to @component + + + + a handler id which can be used in atk_component_remove_focus_handler +or zero if the handler was already added. + + + + + +Sets the extents of @component. + + + + + + an #AtkComponent + + + + x coordinate + + + + y coordinate + + + + width to set for @component + + + + height to set for @component + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + %TRUE or %FALSE whether the extents were set or not + + + + + +Create a new relation for the specified key and the specified list +of targets. + + + + + + an array of pointers to #AtkObjects + + + + number of #AtkObjects pointed to by @targets + + + + an #AtkRelationType with which to create the new +#AtkRelation + + + + a pointer to a new #AtkRelation + + + + + +Gets the number of accessible children of the accessible. + + + + + + an #AtkObject + + + + an integer representing the number of accessible children +of the accessible. + + + + + +Gets the column header of a specified column in an accessible table. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in the table + + + + a AtkObject* representing the specified column header, or +%NULL if value does not implement this interface. + + + + + +Sets the description text for the specified @row of @table. + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a #gchar representing the description text +to set for the specified @row of @table + + + + + + + + +This function is called when implementing subclasses of #AtkObject. +It does initialization required for the new object. It is intended +that this function should called only in the ..._new() functions used +to create an instance of a subclass of #AtkObject + + + + + a #AtkObject + + + + a #gpointer which identifies the object for which the AtkObject was created. + + + + + + + + +Gets a boolean value indicating whether the accessible object +at the specified @row and @column is selected + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a #gint representing a column in @table + + + + a gboolean representing if the cell is selected, or 0 +if value does not implement this interface. + + + + + +Causes every child of the object to be selected if the object +supports multiple selections. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + TRUE if success, FALSE otherwise. + + + + + +Clears the selection in the object so that no children in the object +are selected. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + TRUE if success, FALSE otherwise. + + + + + +Provides a #GType indicating the #AtkObjectFactory subclass +associated with @type. + + + + + + an #AtkRegistry + + + + a #GType with which to look up the associated #AtkObjectFactory +subclass + + + + a #GType associated with type @type + + + + + +Specifies the function to be called for focus tracker initialization. +This function should be called by an implementation of the +ATK interface if any specific work needs to be done to enable +focus tracking. + + + + + Function to be called for focus tracker initialization + + + + + + + + +Gets the number of columns in the table. + + + + + + a GObject instance that implements AtkTableIface + + + + a gint representing the number of columns, or 0 +if value does not implement this interface. + + + + + +Get the ranges of text in the specified bounding box. + + + + + + an #AtkText + + + + An AtkTextRectagle giving the dimensions of the bounding box. + + + + Specify whether coordinates are relative to the screen or widget window. + + + + Specify the horizontal clip type. + + + + Specify the vertical clip type. + + + + Array of AtkTextRange. The last element of the array returned +by this function will be NULL. + + + + + +Gets the number of rows occupied by the accessible object +at a specified @row and @column in the @table. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a #gint representing a column in @table + + + + a gint representing the row extent at specified position, or 0 +if value does not implement this interface. + + + + + +Gets a boolean value indicating whether the specified @column +is selected + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in @table + + + + a gboolean representing if the column is selected, or 0 +if value does not implement this interface. + + + + + +Gets the accessible description of the accessible. + + + + + + an #AtkObject + + + + a character string representing the accessible description +of the accessible. + + + + + + +Returns the item associated with this hyperlinks nth anchor. +For instance, the returned #AtkObject will implement #AtkText +if @link_ is a text hyperlink, #AtkImage if @link_ is an image +hyperlink etc. + +Multiple anchors are primarily used by client-side image maps. + + + + + + an #AtkHyperlink + + + + a (zero-index) integer specifying the desired anchor + + + + an #AtkObject associated with this hyperlinks i-th anchor + + + + + +Gets name string for the GUI toolkit implementing ATK for this application. + + + + + + name string for the GUI toolkit implementing ATK for this application + + + + + +Get the #AtkRelationType type corresponding to a relation name. + + + + + + a string which is the (non-localized) name of an ATK relation type. + + + + the #AtkRelationType enumerated type corresponding to the specified name, +or #ATK_RELATION_NULL if no matching relation type is found. + + + + + +Gets the selected columns of the table by initializing **selected with +the selected column numbers. This array should be freed by the caller. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint** that is to contain the selected columns numbers + + + + a gint representing the number of selected columns, +or %0 if value does not implement this interface. + + + + + +Gets the zorder of the accessible. The value G_MININT will be returned +if the layer of the accessible is not ATK_LAYER_MDI. + + + + + + an #AtkObject + + + + a gint which is the zorder of the accessible, i.e. the depth at +which the component is shown in relation to other components in the same +container. + +@Deprecated: Use atk_component_get_mdi_zorder instead. + + + + + +Gets the position of @component in the form of +a point specifying @component's top-left corner. + + + + + an #AtkComponent + + + + address of #gint to put x coordinate position + + + + address of #gint to put y coordinate position + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + + + + + +Gets the content in the specified mime type. + + + + + + a GObject instance that implements AtkStreamableContentIface + + + + a gchar* representing the mime type + + + + A #GIOChannel which contains the content in the specified mime +type. + + + + + +Determines whether the relation set contains a relation that matches the +specified type. + + + + + + an #AtkRelationSet + + + + an #AtkRelationType + + + + %TRUE if @relationship is the relationship type of a relation +in @set, %FALSE otherwise + + + + + +Returns the name of the specified action of the object. + + + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a name string, or %NULL +if @action does not implement this interface. + + + + + +Creates a new empty state set. + + + + + + a new #AtkStateSet + + + + + +Sets the caption for the table. + + + + + a GObject instance that implements AtkTableIface + + + + a #AtkObject representing the caption to set for @table + + + + + + + + +Associate @name with a new #AtkTextAttribute + + + + + + a name string + + + + an #AtkTextAttribute associated with @name + + + + + +Perform the specified action on the object. + + + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + + %TRUE if success, %FALSE otherwise + + + + + + +Indicates whether the link currently displays some or all of its +content inline. Ordinary HTML links will usually return +%FALSE, but an inline &lt;src&gt; HTML element will return +%TRUE. +a * + + + + + an #AtkHyperlink + + + + whether or not this link displays its content inline. + + + + + + +Gets the localized description string describing the #AtkRole @role. + + + + + + The #AtkRole whose localized name is required + + + + the localized string describing the AtkRole + + + + + +Get the #AtkRole type corresponding to a rolew name. + + + + + + a string which is the (non-localized) name of an ATK role. + + + + the #AtkRole enumerated type corresponding to the specified +name, +or #ATK_ROLE_INVALID if no matching role is found. + + + + + +Removes the specified child of the object from the object's selection. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + a #gint specifying the index in the selection set. (e.g. the +ith selection as opposed to the ith child). + + + + TRUE if success, FALSE otherwise. + + + + + +Frees the memory associated with an array of AtkTextRange. It is assumed +that the array was returned by the function atk_text_get_bounded_ranges +and is NULL terminated. + + + + + A pointer to an array of #AtkTextRange which is to be freed. + + + + + + + + +Sets the description text for the specified @column of the @table. + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in @table + + + + a #gchar representing the description text +to set for the specified @column of the @table + + + + + + + + +Sets the postition of @component. + + + + + + an #AtkComponent + + + + x coordinate + + + + y coordinate + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + %TRUE or %FALSE whether or not the position was set or not + + + + + +Delete text @start_pos up to, but not including @end_pos. + + + + + an #AtkEditableText + + + + start position + + + + end position + + + + + + + + +Gets the number of accessible actions available on the object. +If there are more than one, the first one is considered the +"default" action of the object. + + + + + + a #GObject instance that implements AtkActionIface + + + + a the number of actions, or 0 if @action does not +implement this interface. + + + + + +Removes a relation from the relation set. +This function unref's the #AtkRelation so it will be deleted unless there +is another reference to it. + + + + + an #AtkRelationSet + + + + an #AtkRelation + + + + + + + + +Sets the role of the accessible. + + + + + an #AtkObject + + + + an #AtkRole to be set as the role + + + + + + + + +Registers the role specified by @name. + + + + + + a character string describing the new role. + + + + an #AtkRole for the new role. + + + + + +Get the bounding box containing the glyph representing the character at +a particular text offset. + + + + + an #AtkText + + + + The offset of the text character for which bounding information is required. + + + + Pointer for the x cordinate of the bounding box + + + + Pointer for the y cordinate of the bounding box + + + + Pointer for the width of the bounding box + + + + Pointer for the height of the bounding box + + + + specify whether coordinates are relative to the screen or widget window + + + + + + + + +Gets the specified text. + + + + + + an #AtkText + + + + start position + + + + end position + + + + the text from @start_offset up to, but not including @end_offset. + + + + + +Gets the row header of a specified row in an accessible table. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in the table + + + + a AtkObject* representing the specified row header, or +%NULL if value does not implement this interface. + + + + + +Checks whether the state for the specified type is in the specified set. + + + + + + an #AtkStateSet + + + + an #AtkStateType + + + + %TRUE if @type is the state type is in @set. + + + + + +Gets the index with the hypertext document at which this link ends. + + + + + + an #AtkHyperlink + + + + the index with the hypertext document at which this link ends + + + + + +Returns the localized name of the specified action of the object. + + + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a name string, or %NULL +if @action does not implement this interface. + + + + + +Associate an #AtkObjectFactory subclass with a #GType. Note: +The associated @factory_type will thereafter be responsible for +the creation of new #AtkObject implementations for instances +appropriate for @type. + + + + + the #AtkRegistry in which to register the type association + + + + an #AtkObject type + + + + an #AtkObjectFactory type to associate with @type. Must +implement AtkObject appropriate for @type. + + + + + + + + +Gets the name corresponding to the #AtkTextAttribute + + + + + + The #AtkTextAttribute whose name is required + + + + a string containing the name; this string should not be freed + + + + + +Returns a description of the specified action of the object. + + + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a description string, or %NULL +if @action does not implement this interface. + + + + + +Frees the memory used by an #AtkAttributeSet, including all its +#AtkAttributes. + + + + + The #AtkAttributeSet to free + + + + + + + + +Returns a keybinding associated with this action, if one exists. + + + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a string representing the keybinding, or %NULL +if there is no keybinding for this action. + + + + + + +Gets the specified text. + +If the boundary_type if ATK_TEXT_BOUNDARY_CHAR the character before the +offset is returned. + +If the boundary_type is ATK_TEXT_BOUNDARY_WORD_START the returned string +is from the word start before the word start before the offset to +the word start before the offset. + +The returned string will contain the word before the offset if the offset +is inside a word and will contain the word before the word before the +offset if the offset is not inside a word. + +If the boundary_type is ATK_TEXT_BOUNDARY_WORD_END the returned string +is from the word end before the word end at or before the offset to the +word end at or before the offset. + +The returned string will contain the word before the offset if the offset +is inside a word or if the offset is not inside a word. + +If the boundary type is ATK_TEXT_BOUNDARY_SENTENCE_START the returned +string is from the sentence start before the sentence start before +the offset to the sentence start before the offset. + +The returned string will contain the sentence before the offset if the +offset is inside a sentence and will contain the sentence before the +sentence before the offset if the offset is not inside a sentence. + +If the boundary_type is ATK_TEXT_BOUNDARY_SENTENCE_END the returned string +is from the sentence end before the sentence end at or before the offset to +the sentence end at or before the offset. + +The returned string will contain the sentence before the offset if the +offset is inside a sentence or if the offset is not inside a sentence. + +If the boundary type is ATK_TEXT_BOUNDARY_LINE_START the returned +string is from the line start before the line start ar or before the offset +to the line start ar or before the offset. + +If the boundary_type is ATK_TEXT_BOUNDARY_LINE_END the returned string +is from the line end before the line end before the offset to the +line end before the offset. + + + + + + an #AtkText + + + + position + + + + An #AtkTextBoundary + + + + the start offset of the returned string + + + + the offset of the first character after the +returned substring + + + + the text before @offset bounded by the specified @boundary_type. + + + + + +Gets a #gint representing the index at the specified @row and @column. +The value -1 is returned if the object at row,column is not a child +of table or table does not implement this interface. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a #gint representing a column in @table + + + + a #gint representing the index at specified position + + + + + +Sets the accessible parent of the accessible. + + + + + an #AtkObject + + + + an #AtkObject to be set as the accessible parent + + + + + + + + +Removes the specified selection. + + + + + + an #AtkText + + + + The selection number. The selected regions are +assigned numbers that correspond to how far the region is from the +start of the text. The selected region closest to the beginning +of the text region is assigned the number 0, etc. Note that adding, +moving or deleting a selected region can change the numbering. + + + + %TRUE if success, %FALSE otherwise + + + + + +Gets the number of accessible children currently selected. +Note: callers should not rely on %NULL or on a zero value for +indication of whether AtkSelectionIface is implemented, they should +use type checking/interface checking macros or the +atk_get_accessible_value() convenience method. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + a gint representing the number of items selected, or 0 +if @selection does not implement this interface. + + + + + +Gets version string for the GUI toolkit implementing ATK for this application. + + + + + + version string for the GUI toolkit implementing ATK for this application + + + + + +Gets the rectangle which gives the extent of the @component. + + + + + + an #AtkComponent + + + + address of #gint to put x coordinate + + + + address of #gint to put y coordinate + + + + address of #gint to put width + + + + address of #gint to put height + + + + specifies whether the coordinates are relative to the screen +or to the components top level window + + + + + + + + +Gets a default implementation of the #AtkObjectFactory/type +registry. +Note: For most toolkit maintainers, this will be the correct +registry for registering new #AtkObject factories. Following +a call to this function, maintainers may call atk_registry_set_factory_type() +to associate an #AtkObjectFactory subclass with the GType of objects +for whom accessibility information will be provided. + + + + + + a default implementation of the #AtkObjectFactory/type +registry + + + + + +Gets an #AtkObjectFactory appropriate for creating #AtkObjects +appropriate for @type. + + + + + + an #AtkRegistry + + + + a #GType with which to look up the associated #AtkObjectFactory + + + + an #AtkObjectFactory appropriate for creating #AtkObjects +appropriate for @type. + + + + + +Constructs the exclusive-or of the two sets, returning %NULL is empty. +The set returned by this operation contains the states in exactly +one of the two sets. + + + + + + an #AtkStateSet + + + + another #AtkStateSet + + + + a new #AtkStateSet which contains the states which are +in exactly one of the two sets. + + + + + +Constructs the union of the two sets. + + + + + + an #AtkStateSet + + + + another #AtkStateSet + + + + a new #AtkStateSet which is the union of the two sets, +returning %NULL is empty. + + + + + +Gets the size of the @component in terms of width and height. + + + + + an #AtkComponent + + + + address of #gint to put width of @component + + + + address of #gint to put height of @component + + + + + + + + +Gets the offset position of the caret (cursor). + + + + + + an #AtkText + + + + the offset position of the caret (cursor). + + + + + +Finds a relation that matches the specified type. + + + + + + an #AtkRelationSet + + + + an #AtkRelationType + + + + an #AtkRelation, which is a relation matching the specified type. + + + + + +Inform @factory that it is no longer being used to create +accessibles. When called, @factory may need to inform +#AtkObjects which it has created that they need to be re-instantiated. +Note: primarily used for runtime replacement of #AtkObjectFactorys +in object registries. + + + + + an #AtkObjectFactory to invalidate + + + + + + + + +Gets the description text of the specified row in the table + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a gchar* representing the row description, or %NULL +if value does not implement this interface. + + + + + +Constructs the intersection of the two sets, returning %NULL if the +intersection is empty. + + + + + + an #AtkStateSet + + + + another #AtkStateSet + + + + a new #AtkStateSet which is the intersection of the two sets. + + + + + +Adds the specified @column to the selection. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in @table + + + + a gboolean representing if the column was successfully removed from +the selection, or 0 if value does not implement this interface. + + + + + +Gets a #gint representing the row at the specified @index_, or -1 +if the table does not implement this interface + + + + + + a GObject instance that implements AtkTableInterface + + + + a #gint representing an index in @table + + + + a gint representing the row at the specified index. + + + + + +Sets a description of the specified action of the object. + + + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + + the description to be assigned to this action + + + + a gboolean representing if the description was successfully set; + + + + + +Set the size of the @component in terms of width and height. + + + + + + an #AtkComponent + + + + width to set for @component + + + + height to set for @component + + + + %TRUE or %FALSE whether the size was set or not + + + + + +Sets the value of this object. + + + + + + a GObject instance that implements AtkValueIface + + + + a #GValue which is the desired new accessible value. + + + + %TRUE if new value is successfully set, %FALSE otherwise. + + + + + +Removes the specified event listener + + + + + the id of the event listener to remove + + + + + + + + +Adds the specified function to the list of functions to be called +when an event of type event_type occurs. + + + + + + the listener to notify + + + + the type of event for which notification is requested + + + + added event listener id, or 0 on failure. + + + + + +Get a reference to the table cell at @row, @column. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a #gint representing a column in @table + + + + a AtkObject* representing the referred to accessible + + + + + +Gets the accessible name of the accessible. + + + + + + an #AtkObject + + + + a character string representing the accessible name of the object. + + + + + +Removes a property change handler. + + + + + an #AtkObject + + + + a guint which identifies the handler to be removed. + + + + + + + + +Gets the summary description of the table. + + + + + + a GObject instance that implements AtkTableIface + + + + a AtkObject* representing a summary description of the table, +or zero if value does not implement this interface. + + + + + +Set text contents of @text. + + + + + an #AtkEditableText + + + + string to set for text contents of @text + + + + + + + + +Checks whether the state set is empty, i.e. has no states set. + + + + + + an #AtkStateType + + + + %TRUE if @set has no states set, otherwise %FALSE + + + + + +Gets the maximum value of this object. + + + + + a GObject instance that implements AtkValueIface + + + + a #GValue representing the maximum accessible value + + + + + + + + +Determines the number of relations in a relation set. + + + + + + an #AtkRelationSet + + + + an integer representing the number of relations in the set. + + + + + +Gets the specified text. + +If the boundary_type if ATK_TEXT_BOUNDARY_CHAR the character after the +offset is returned. + +If the boundary_type is ATK_TEXT_BOUNDARY_WORD_START the returned string +is from the word start after the offset to the next word start. + +The returned string will contain the word after the offset if the offset +is inside a word or if the offset is not inside a word. + +If the boundary_type is ATK_TEXT_BOUNDARY_WORD_END the returned string +is from the word end at or after the offset to the next work end. + +The returned string will contain the word after the offset if the offset +is inside a word and will contain the word after the word after the offset +if the offset is not inside a word. + +If the boundary type is ATK_TEXT_BOUNDARY_SENTENCE_START the returned +string is from the sentence start after the offset to the next sentence +start. + +The returned string will contain the sentence after the offset if the offset +is inside a sentence or if the offset is not inside a sentence. + +If the boundary_type is ATK_TEXT_BOUNDARY_SENTENCE_END the returned string +is from the sentence end at or after the offset to the next sentence end. + +The returned string will contain the sentence after the offset if the offset +is inside a sentence and will contain the sentence after the sentence +after the offset if the offset is not inside a sentence. + +If the boundary type is ATK_TEXT_BOUNDARY_LINE_START the returned +string is from the line start after the offset to the next line start. + +If the boundary_type is ATK_TEXT_BOUNDARY_LINE_END the returned string +is from the line end at or after the offset to the next line start. + + + + + + an #AtkText + + + + position + + + + An #AtkTextBoundary + + + + the start offset of the returned string + + + + the offset of the first character after the +returned substring + + + + the text after @offset bounded by the specified @boundary_type. + + + + + +Get the width and height in pixels for the specified image. +The values of @width and @height are returned as -1 if the +values cannot be obtained. + + + + + a #GObject instance that implements AtkImageIface + + + + filled with the image width + + + + filled with the image height + + + + + + + + +Add a new relation to the current relation set if it is not already +present. +This function ref's the AtkRelation so the caller of this function +should unref it to ensure that it will be destroyed when the AtkRelationSet +is destroyed. + + + + + an #AtkRelationSet + + + + an #AtkRelation + + + + + + + + +Sets the attributes for a specified range. See the ATK_ATTRIBUTE +macros (such as #ATK_ATTRIBUTE_LEFT_MARGIN) for examples of attributes +that can be set. Note that other attributes that do not have corresponding +ATK_ATTRIBUTE macros may also be set for certain text widgets. + + + + + + an #AtkEditableText + + + + an #AtkAttributeSet + + + + start of range in which to set attributes + + + + end of range in which to set attributes + + + + %TRUE if attributes successfully set for the specified +range, otherwise %FALSE + + + + + +Gets the number of columns occupied by the accessible object +at the specified @row and @column in the @table. + + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a row in @table + + + + a #gint representing a column in @table + + + + a gint representing the column extent at specified position, or 0 +if value does not implement this interface. + + + + + +Add the states for the specified types to the current state set. + + + + + an #AtkStateSet + + + + an array of #AtkStateType + + + + The number of elements in the array + + + + + + + + +Gets the #AtkStateType corresponding to the description string @name. + + + + + + a character string state name + + + + an #AtkStateType corresponding to @name + + + + + +Gets the index into the array of hyperlinks that is associated with +the character specified by @char_index, or -1 if there is no hyperlink +associated with this character. + + + + + + an #AtkHypertext + + + + a character index + + + + an index into the array of hyperlinks in @hypertext + + + + + +Adds a relationship of the specified type with the specified target. + + + + + + The #AtkObject to which an AtkRelation is to be added. + + + + The #AtkRelationType of the relation + + + + The #AtkObject which is to be the target of the relation. + + + +TRUE if the relationship is added. + + + + + +Sets the specified column header to @header. + + + + + a GObject instance that implements AtkTableIface + + + + a #gint representing a column in @table + + + + an #AtkTable + + + + + + + + +Remove the handler specified by @handler_id from the list of +functions to be executed when this object receives focus events +(in or out). + + + + + the #AtkComponent to remove the focus handler from + + + + the handler id of the focus handler to be removed +from @component + + + + + + + + +Add a new state for the specified type to the current state set if +it is not already present. + + + + + + an #AtkStateSet + + + + an #AtkStateType + + + + %TRUE if the state for @type is not already in @set. + + + + + +Gets the value of this object. + + + + + a GObject instance that implements AtkValueIface + + + + a #GValue representing the current accessible value + + + + + + + + +Checks whether the states for all the specified types are in the +specified set. + + + + + + an #AtkStateSet + + + + an array of #AtkStateType + + + + The number of elements in the array + + + + %TRUE if all the states for @type are in @set. + + + + + +Removes the specified event listener + + + + + the id of the event listener to remove + + + + + + + + +Gets the number of links within this hypertext document. + + + + + + an #AtkHypertext + + + + the number of links within this hypertext document + + + + + +Gets the character string of the specified mime type. The first mime +type is at position 0, the second at position 1, and so on. + + + + + + a GObject instance that implements AtkStreamableContent + + + + a gint representing the position of the mime type starting from 0 + + + +: a gchar* representing the specified mime type; the caller +should not free the character string. + + + + + +Adds the specified accessible child of the object to the +object's selection. + + + + + + a #GObject instance that implements AtkSelectionIface + + + + a #gint specifying the child index. + + + + TRUE if success, FALSE otherwise. + + + + + +Get a the URI associated with the anchor specified +by @i of @link_. + +Multiple anchors are primarily used by client-side image maps. + + + + + + an #AtkHyperlink + + + + a (zero-index) integer specifying the desired anchor + + + + a string specifying the URI + + + + diff --git a/libs/gtkmm2/atk/src/atk_docs_override.xml b/libs/gtkmm2/atk/src/atk_docs_override.xml new file mode 100644 index 0000000000..05a355d3de --- /dev/null +++ b/libs/gtkmm2/atk/src/atk_docs_override.xml @@ -0,0 +1,117 @@ + + + + + +Creates an #AtkAttributeSet which consists of the attributes explicitly +set at the position @offset in the text. @start_offset and @end_offset are +set to the start and end of the range around @offset where the attributes are +invariant. See the enum AtkTextAttribute for types of text attributes that +can be returned. Note that other attributes may also be returned. + + + + + + an #AtkText + + + + the offset at which to get the attributes + + + + the address to put the start offset of the range + + + + the address to put the end offset of the range + + + + an #AtkAttributeSet which contains the attributes explicitly set +at @offset. + + + + + + +Creates an #AtkAttributeSet which consists of the default values of +attributes for the text. See the enum AtkTextAttribute for types of text +attributes that can be returned. Note that other attributes may also be +returned. + + + + + + an #AtkText + + + + an #AtkAttributeSet which contains the default values of attributes. +at @offset. + + + + + +Returns the name of the specified action of the object. + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a name string, or an empty string if @action does not implement this interface. + + + + + +Returns a keybinding associated with this action, if one exists. + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a string representing the keybinding, or an empty string +if there is no keybinding for this action. + + + + + + +Returns the localized name of the specified action of the object. + + + + a #GObject instance that implements AtkActionIface + + + + the action index corresponding to the action to be performed + + + +a name string, or an empty string +if @action does not implement this interface. + + + + + + diff --git a/libs/gtkmm2/atk/src/atk_enums.defs b/libs/gtkmm2/atk/src/atk_enums.defs new file mode 100644 index 0000000000..93d8893cfa --- /dev/null +++ b/libs/gtkmm2/atk/src/atk_enums.defs @@ -0,0 +1,263 @@ +;; From /home/murrayc/cvs/gnome210/atk/atk/atkhyperlink.h + +(define-flags-extended HyperlinkStateFlags + (in-module "Atk") + (c-name "AtkHyperlinkStateFlags") + (values + '("e" "ATK_HYPERLINK_IS_INLINE" "1 << 0") + ) +) + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkobject.h + +(define-enum-extended Role + (in-module "Atk") + (c-name "AtkRole") + (values + '("invalid" "ATK_ROLE_INVALID" "0") + '("accel-label" "ATK_ROLE_ACCEL_LABEL" "1") + '("alert" "ATK_ROLE_ALERT" "2") + '("animation" "ATK_ROLE_ANIMATION" "3") + '("arrow" "ATK_ROLE_ARROW" "4") + '("calendar" "ATK_ROLE_CALENDAR" "5") + '("canvas" "ATK_ROLE_CANVAS" "6") + '("check-box" "ATK_ROLE_CHECK_BOX" "7") + '("check-menu-item" "ATK_ROLE_CHECK_MENU_ITEM" "8") + '("color-chooser" "ATK_ROLE_COLOR_CHOOSER" "9") + '("column-header" "ATK_ROLE_COLUMN_HEADER" "10") + '("combo-box" "ATK_ROLE_COMBO_BOX" "11") + '("date-editor" "ATK_ROLE_DATE_EDITOR" "12") + '("desktop-icon" "ATK_ROLE_DESKTOP_ICON" "13") + '("desktop-frame" "ATK_ROLE_DESKTOP_FRAME" "14") + '("dial" "ATK_ROLE_DIAL" "15") + '("dialog" "ATK_ROLE_DIALOG" "16") + '("directory-pane" "ATK_ROLE_DIRECTORY_PANE" "17") + '("drawing-area" "ATK_ROLE_DRAWING_AREA" "18") + '("file-chooser" "ATK_ROLE_FILE_CHOOSER" "19") + '("filler" "ATK_ROLE_FILLER" "20") + '("font-chooser" "ATK_ROLE_FONT_CHOOSER" "21") + '("frame" "ATK_ROLE_FRAME" "22") + '("glass-pane" "ATK_ROLE_GLASS_PANE" "23") + '("html-container" "ATK_ROLE_HTML_CONTAINER" "24") + '("icon" "ATK_ROLE_ICON" "25") + '("image" "ATK_ROLE_IMAGE" "26") + '("internal-frame" "ATK_ROLE_INTERNAL_FRAME" "27") + '("label" "ATK_ROLE_LABEL" "28") + '("layered-pane" "ATK_ROLE_LAYERED_PANE" "29") + '("list" "ATK_ROLE_LIST" "30") + '("list-item" "ATK_ROLE_LIST_ITEM" "31") + '("menu" "ATK_ROLE_MENU" "32") + '("menu-bar" "ATK_ROLE_MENU_BAR" "33") + '("menu-item" "ATK_ROLE_MENU_ITEM" "34") + '("option-pane" "ATK_ROLE_OPTION_PANE" "35") + '("page-tab" "ATK_ROLE_PAGE_TAB" "36") + '("page-tab-list" "ATK_ROLE_PAGE_TAB_LIST" "37") + '("panel" "ATK_ROLE_PANEL" "38") + '("password-text" "ATK_ROLE_PASSWORD_TEXT" "39") + '("popup-menu" "ATK_ROLE_POPUP_MENU" "40") + '("progress-bar" "ATK_ROLE_PROGRESS_BAR" "41") + '("push-button" "ATK_ROLE_PUSH_BUTTON" "42") + '("radio-button" "ATK_ROLE_RADIO_BUTTON" "43") + '("radio-menu-item" "ATK_ROLE_RADIO_MENU_ITEM" "44") + '("root-pane" "ATK_ROLE_ROOT_PANE" "45") + '("row-header" "ATK_ROLE_ROW_HEADER" "46") + '("scroll-bar" "ATK_ROLE_SCROLL_BAR" "47") + '("scroll-pane" "ATK_ROLE_SCROLL_PANE" "48") + '("separator" "ATK_ROLE_SEPARATOR" "49") + '("slider" "ATK_ROLE_SLIDER" "50") + '("split-pane" "ATK_ROLE_SPLIT_PANE" "51") + '("spin-button" "ATK_ROLE_SPIN_BUTTON" "52") + '("statusbar" "ATK_ROLE_STATUSBAR" "53") + '("table" "ATK_ROLE_TABLE" "54") + '("table-cell" "ATK_ROLE_TABLE_CELL" "55") + '("table-column-header" "ATK_ROLE_TABLE_COLUMN_HEADER" "56") + '("table-row-header" "ATK_ROLE_TABLE_ROW_HEADER" "57") + '("tear-off-menu-item" "ATK_ROLE_TEAR_OFF_MENU_ITEM" "58") + '("terminal" "ATK_ROLE_TERMINAL" "59") + '("text" "ATK_ROLE_TEXT" "60") + '("toggle-button" "ATK_ROLE_TOGGLE_BUTTON" "61") + '("tool-bar" "ATK_ROLE_TOOL_BAR" "62") + '("tool-tip" "ATK_ROLE_TOOL_TIP" "63") + '("tree" "ATK_ROLE_TREE" "64") + '("tree-table" "ATK_ROLE_TREE_TABLE" "65") + '("unknown" "ATK_ROLE_UNKNOWN" "66") + '("viewport" "ATK_ROLE_VIEWPORT" "67") + '("window" "ATK_ROLE_WINDOW" "68") + '("header" "ATK_ROLE_HEADER" "69") + '("footer" "ATK_ROLE_FOOTER" "70") + '("paragraph" "ATK_ROLE_PARAGRAPH" "71") + '("ruler" "ATK_ROLE_RULER" "72") + '("application" "ATK_ROLE_APPLICATION" "73") + '("autocomplete" "ATK_ROLE_AUTOCOMPLETE" "74") + '("editbar" "ATK_ROLE_EDITBAR" "75") + '("embedded" "ATK_ROLE_EMBEDDED" "76") + '("last-defined" "ATK_ROLE_LAST_DEFINED" "77") + ) +) + +(define-enum-extended Layer + (in-module "Atk") + (c-name "AtkLayer") + (values + '("invalid" "ATK_LAYER_INVALID" "0") + '("background" "ATK_LAYER_BACKGROUND" "1") + '("canvas" "ATK_LAYER_CANVAS" "2") + '("widget" "ATK_LAYER_WIDGET" "3") + '("mdi" "ATK_LAYER_MDI" "4") + '("popup" "ATK_LAYER_POPUP" "5") + '("overlay" "ATK_LAYER_OVERLAY" "6") + '("window" "ATK_LAYER_WINDOW" "7") + ) +) + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkrelationtype.h + +(define-enum-extended RelationType + (in-module "Atk") + (c-name "AtkRelationType") + (values + '("null" "ATK_RELATION_NULL" "0") + '("controlled-by" "ATK_RELATION_CONTROLLED_BY" "1") + '("controller-for" "ATK_RELATION_CONTROLLER_FOR" "2") + '("label-for" "ATK_RELATION_LABEL_FOR" "3") + '("labelled-by" "ATK_RELATION_LABELLED_BY" "4") + '("member-of" "ATK_RELATION_MEMBER_OF" "5") + '("node-child-of" "ATK_RELATION_NODE_CHILD_OF" "6") + '("flows-to" "ATK_RELATION_FLOWS_TO" "7") + '("flows-from" "ATK_RELATION_FLOWS_FROM" "8") + '("subwindow-of" "ATK_RELATION_SUBWINDOW_OF" "9") + '("embeds" "ATK_RELATION_EMBEDS" "10") + '("embedded-by" "ATK_RELATION_EMBEDDED_BY" "11") + '("popup-for" "ATK_RELATION_POPUP_FOR" "12") + '("parent-window-of" "ATK_RELATION_PARENT_WINDOW_OF" "13") + '("last-defined" "ATK_RELATION_LAST_DEFINED" "14") + ) +) + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkstate.h + +(define-enum-extended StateType + (in-module "Atk") + (c-name "AtkStateType") + (values + '("invalid" "ATK_STATE_INVALID" "0") + '("active" "ATK_STATE_ACTIVE" "1") + '("armed" "ATK_STATE_ARMED" "2") + '("busy" "ATK_STATE_BUSY" "3") + '("checked" "ATK_STATE_CHECKED" "4") + '("defunct" "ATK_STATE_DEFUNCT" "5") + '("editable" "ATK_STATE_EDITABLE" "6") + '("enabled" "ATK_STATE_ENABLED" "7") + '("expandable" "ATK_STATE_EXPANDABLE" "8") + '("expanded" "ATK_STATE_EXPANDED" "9") + '("focusable" "ATK_STATE_FOCUSABLE" "10") + '("focused" "ATK_STATE_FOCUSED" "11") + '("horizontal" "ATK_STATE_HORIZONTAL" "12") + '("iconified" "ATK_STATE_ICONIFIED" "13") + '("modal" "ATK_STATE_MODAL" "14") + '("multi-line" "ATK_STATE_MULTI_LINE" "15") + '("multiselectable" "ATK_STATE_MULTISELECTABLE" "16") + '("opaque" "ATK_STATE_OPAQUE" "17") + '("pressed" "ATK_STATE_PRESSED" "18") + '("resizable" "ATK_STATE_RESIZABLE" "19") + '("selectable" "ATK_STATE_SELECTABLE" "20") + '("selected" "ATK_STATE_SELECTED" "21") + '("sensitive" "ATK_STATE_SENSITIVE" "22") + '("showing" "ATK_STATE_SHOWING" "23") + '("single-line" "ATK_STATE_SINGLE_LINE" "24") + '("stale" "ATK_STATE_STALE" "25") + '("transient" "ATK_STATE_TRANSIENT" "26") + '("vertical" "ATK_STATE_VERTICAL" "27") + '("visible" "ATK_STATE_VISIBLE" "28") + '("manages-descendants" "ATK_STATE_MANAGES_DESCENDANTS" "29") + '("indeterminate" "ATK_STATE_INDETERMINATE" "30") + '("truncated" "ATK_STATE_TRUNCATED" "31") + '("required" "ATK_STATE_REQUIRED" "32") + '("last-defined" "ATK_STATE_LAST_DEFINED" "33") + ) +) + +;; From /home/murrayc/cvs/gnome210/atk/atk/atktext.h + +(define-enum-extended TextAttribute + (in-module "Atk") + (c-name "AtkTextAttribute") + (values + '("invalid" "ATK_TEXT_ATTR_INVALID" "0") + '("left-margin" "ATK_TEXT_ATTR_LEFT_MARGIN" "1") + '("right-margin" "ATK_TEXT_ATTR_RIGHT_MARGIN" "2") + '("indent" "ATK_TEXT_ATTR_INDENT" "3") + '("invisible" "ATK_TEXT_ATTR_INVISIBLE" "4") + '("editable" "ATK_TEXT_ATTR_EDITABLE" "5") + '("pixels-above-lines" "ATK_TEXT_ATTR_PIXELS_ABOVE_LINES" "6") + '("pixels-below-lines" "ATK_TEXT_ATTR_PIXELS_BELOW_LINES" "7") + '("pixels-inside-wrap" "ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP" "8") + '("bg-full-height" "ATK_TEXT_ATTR_BG_FULL_HEIGHT" "9") + '("rise" "ATK_TEXT_ATTR_RISE" "10") + '("underline" "ATK_TEXT_ATTR_UNDERLINE" "11") + '("strikethrough" "ATK_TEXT_ATTR_STRIKETHROUGH" "12") + '("size" "ATK_TEXT_ATTR_SIZE" "13") + '("scale" "ATK_TEXT_ATTR_SCALE" "14") + '("weight" "ATK_TEXT_ATTR_WEIGHT" "15") + '("language" "ATK_TEXT_ATTR_LANGUAGE" "16") + '("family-name" "ATK_TEXT_ATTR_FAMILY_NAME" "17") + '("bg-color" "ATK_TEXT_ATTR_BG_COLOR" "18") + '("fg-color" "ATK_TEXT_ATTR_FG_COLOR" "19") + '("bg-stipple" "ATK_TEXT_ATTR_BG_STIPPLE" "20") + '("fg-stipple" "ATK_TEXT_ATTR_FG_STIPPLE" "21") + '("wrap-mode" "ATK_TEXT_ATTR_WRAP_MODE" "22") + '("direction" "ATK_TEXT_ATTR_DIRECTION" "23") + '("justification" "ATK_TEXT_ATTR_JUSTIFICATION" "24") + '("stretch" "ATK_TEXT_ATTR_STRETCH" "25") + '("variant" "ATK_TEXT_ATTR_VARIANT" "26") + '("style" "ATK_TEXT_ATTR_STYLE" "27") + '("last-defined" "ATK_TEXT_ATTR_LAST_DEFINED" "28") + ) +) + +(define-enum-extended TextBoundary + (in-module "Atk") + (c-name "AtkTextBoundary") + (values + '("char" "ATK_TEXT_BOUNDARY_CHAR" "0") + '("word-start" "ATK_TEXT_BOUNDARY_WORD_START" "1") + '("word-end" "ATK_TEXT_BOUNDARY_WORD_END" "2") + '("sentence-start" "ATK_TEXT_BOUNDARY_SENTENCE_START" "3") + '("sentence-end" "ATK_TEXT_BOUNDARY_SENTENCE_END" "4") + '("line-start" "ATK_TEXT_BOUNDARY_LINE_START" "5") + '("line-end" "ATK_TEXT_BOUNDARY_LINE_END" "6") + ) +) + +(define-enum-extended TextClipType + (in-module "Atk") + (c-name "AtkTextClipType") + (values + '("none" "ATK_TEXT_CLIP_NONE" "0") + '("min" "ATK_TEXT_CLIP_MIN" "1") + '("max" "ATK_TEXT_CLIP_MAX" "2") + '("both" "ATK_TEXT_CLIP_BOTH" "3") + ) +) + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkutil.h + +(define-enum-extended KeyEventType + (in-module "Atk") + (c-name "AtkKeyEventType") + (values + '("press" "ATK_KEY_EVENT_PRESS" "0") + '("release" "ATK_KEY_EVENT_RELEASE" "1") + '("last-defined" "ATK_KEY_EVENT_LAST_DEFINED" "2") + ) +) + +(define-enum-extended CoordType + (in-module "Atk") + (c-name "AtkCoordType") + (values + '("screen" "ATK_XY_SCREEN" "0") + '("window" "ATK_XY_WINDOW" "1") + ) +) + diff --git a/libs/gtkmm2/atk/src/atk_methods.defs b/libs/gtkmm2/atk/src/atk_methods.defs new file mode 100644 index 0000000000..51cf715a23 --- /dev/null +++ b/libs/gtkmm2/atk/src/atk_methods.defs @@ -0,0 +1,2284 @@ +;; -*- scheme -*- +; object definitions ... +(define-object Action + (in-module "Atk") + (c-name "AtkAction") + (gtype-id "ATK_TYPE_ACTION") +) + +(define-object Component + (in-module "Atk") + (c-name "AtkComponent") + (gtype-id "ATK_TYPE_COMPONENT") +) + +(define-object Document + (in-module "Atk") + (c-name "AtkDocument") + (gtype-id "ATK_TYPE_DOCUMENT") +) + +(define-object EditableText + (in-module "Atk") + (c-name "AtkEditableText") + (gtype-id "ATK_TYPE_EDITABLE_TEXT") +) + +(define-object Hyperlink + (in-module "Atk") + (parent "GObject") + (c-name "AtkHyperlink") + (gtype-id "ATK_TYPE_HYPERLINK") +) + +(define-object Hypertext + (in-module "Atk") + (c-name "AtkHypertext") + (gtype-id "ATK_TYPE_HYPERTEXT") +) + +(define-object Image + (in-module "Atk") + (c-name "AtkImage") + (gtype-id "ATK_TYPE_IMAGE") +) + +(define-object Implementor + (in-module "Atk") + (c-name "AtkImplementor") + (gtype-id "ATK_TYPE_IMPLEMENTOR") +) + +(define-object Object + (in-module "Atk") + (parent "GObject") + (c-name "AtkObject") + (gtype-id "ATK_TYPE_OBJECT") +) + +(define-object NoOpObject + (in-module "Atk") + (parent "AtkObject") + (c-name "AtkNoOpObject") + (gtype-id "ATK_TYPE_NO_OP_OBJECT") +) + +(define-object GObjectAccessible + (in-module "Atk") + (parent "AtkObject") + (c-name "AtkGObjectAccessible") + (gtype-id "ATK_TYPE_GOBJECT_ACCESSIBLE") +) + +(define-object ObjectFactory + (in-module "Atk") + (parent "GObject") + (c-name "AtkObjectFactory") + (gtype-id "ATK_TYPE_OBJECT_FACTORY") +) + +(define-object NoOpObjectFactory + (in-module "Atk") + (parent "AtkObjectFactory") + (c-name "AtkNoOpObjectFactory") + (gtype-id "ATK_TYPE_NO_OP_OBJECT_FACTORY") +) + +(define-object Registry + (in-module "Atk") + (parent "GObject") + (c-name "AtkRegistry") + (gtype-id "ATK_TYPE_REGISTRY") +) + +(define-object Relation + (in-module "Atk") + (parent "GObject") + (c-name "AtkRelation") + (gtype-id "ATK_TYPE_RELATION") +) + +(define-object RelationSet + (in-module "Atk") + (parent "GObject") + (c-name "AtkRelationSet") + (gtype-id "ATK_TYPE_RELATION_SET") +) + +(define-object Selection + (in-module "Atk") + (c-name "AtkSelection") + (gtype-id "ATK_TYPE_SELECTION") +) + +(define-object StateSet + (in-module "Atk") + (parent "GObject") + (c-name "AtkStateSet") + (gtype-id "ATK_TYPE_STATE_SET") +) + +(define-object StreamableContent + (in-module "Atk") + (c-name "AtkStreamableContent") + (gtype-id "ATK_TYPE_STREAMABLE_CONTENT") +) + +(define-object Table + (in-module "Atk") + (c-name "AtkTable") + (gtype-id "ATK_TYPE_TABLE") +) + +(define-object Text + (in-module "Atk") + (c-name "AtkText") + (gtype-id "ATK_TYPE_TEXT") +) + +(define-object Util + (in-module "Atk") + (parent "GObject") + (c-name "AtkUtil") + (gtype-id "ATK_TYPE_UTIL") +) + +(define-object Value + (in-module "Atk") + (c-name "AtkValue") + (gtype-id "ATK_TYPE_VALUE") +) + +;; Enumerations and flags ... + +(define-flags HyperlinkStateFlags + (in-module "Atk") + (c-name "AtkHyperlinkStateFlags") + (gtype-id "ATK_TYPE_HYPERLINK_STATE_FLAGS") + (values + '("e" "ATK_HYPERLINK_IS_INLINE") + ) +) + +(define-enum Role + (in-module "Atk") + (c-name "AtkRole") + (gtype-id "ATK_TYPE_ROLE") + (values + '("invalid" "ATK_ROLE_INVALID") + '("accel-label" "ATK_ROLE_ACCEL_LABEL") + '("alert" "ATK_ROLE_ALERT") + '("animation" "ATK_ROLE_ANIMATION") + '("arrow" "ATK_ROLE_ARROW") + '("calendar" "ATK_ROLE_CALENDAR") + '("canvas" "ATK_ROLE_CANVAS") + '("check-box" "ATK_ROLE_CHECK_BOX") + '("check-menu-item" "ATK_ROLE_CHECK_MENU_ITEM") + '("color-chooser" "ATK_ROLE_COLOR_CHOOSER") + '("column-header" "ATK_ROLE_COLUMN_HEADER") + '("combo-box" "ATK_ROLE_COMBO_BOX") + '("date-editor" "ATK_ROLE_DATE_EDITOR") + '("desktop-icon" "ATK_ROLE_DESKTOP_ICON") + '("desktop-frame" "ATK_ROLE_DESKTOP_FRAME") + '("dial" "ATK_ROLE_DIAL") + '("dialog" "ATK_ROLE_DIALOG") + '("directory-pane" "ATK_ROLE_DIRECTORY_PANE") + '("drawing-area" "ATK_ROLE_DRAWING_AREA") + '("file-chooser" "ATK_ROLE_FILE_CHOOSER") + '("filler" "ATK_ROLE_FILLER") + '("font-chooser" "ATK_ROLE_FONT_CHOOSER") + '("frame" "ATK_ROLE_FRAME") + '("glass-pane" "ATK_ROLE_GLASS_PANE") + '("html-container" "ATK_ROLE_HTML_CONTAINER") + '("icon" "ATK_ROLE_ICON") + '("image" "ATK_ROLE_IMAGE") + '("internal-frame" "ATK_ROLE_INTERNAL_FRAME") + '("label" "ATK_ROLE_LABEL") + '("layered-pane" "ATK_ROLE_LAYERED_PANE") + '("list" "ATK_ROLE_LIST") + '("list-item" "ATK_ROLE_LIST_ITEM") + '("menu" "ATK_ROLE_MENU") + '("menu-bar" "ATK_ROLE_MENU_BAR") + '("menu-item" "ATK_ROLE_MENU_ITEM") + '("option-pane" "ATK_ROLE_OPTION_PANE") + '("page-tab" "ATK_ROLE_PAGE_TAB") + '("page-tab-list" "ATK_ROLE_PAGE_TAB_LIST") + '("panel" "ATK_ROLE_PANEL") + '("password-text" "ATK_ROLE_PASSWORD_TEXT") + '("popup-menu" "ATK_ROLE_POPUP_MENU") + '("progress-bar" "ATK_ROLE_PROGRESS_BAR") + '("push-button" "ATK_ROLE_PUSH_BUTTON") + '("radio-button" "ATK_ROLE_RADIO_BUTTON") + '("radio-menu-item" "ATK_ROLE_RADIO_MENU_ITEM") + '("root-pane" "ATK_ROLE_ROOT_PANE") + '("row-header" "ATK_ROLE_ROW_HEADER") + '("scroll-bar" "ATK_ROLE_SCROLL_BAR") + '("scroll-pane" "ATK_ROLE_SCROLL_PANE") + '("separator" "ATK_ROLE_SEPARATOR") + '("slider" "ATK_ROLE_SLIDER") + '("split-pane" "ATK_ROLE_SPLIT_PANE") + '("spin-button" "ATK_ROLE_SPIN_BUTTON") + '("statusbar" "ATK_ROLE_STATUSBAR") + '("table" "ATK_ROLE_TABLE") + '("table-cell" "ATK_ROLE_TABLE_CELL") + '("table-column-header" "ATK_ROLE_TABLE_COLUMN_HEADER") + '("table-row-header" "ATK_ROLE_TABLE_ROW_HEADER") + '("tear-off-menu-item" "ATK_ROLE_TEAR_OFF_MENU_ITEM") + '("terminal" "ATK_ROLE_TERMINAL") + '("text" "ATK_ROLE_TEXT") + '("toggle-button" "ATK_ROLE_TOGGLE_BUTTON") + '("tool-bar" "ATK_ROLE_TOOL_BAR") + '("tool-tip" "ATK_ROLE_TOOL_TIP") + '("tree" "ATK_ROLE_TREE") + '("tree-table" "ATK_ROLE_TREE_TABLE") + '("unknown" "ATK_ROLE_UNKNOWN") + '("viewport" "ATK_ROLE_VIEWPORT") + '("window" "ATK_ROLE_WINDOW") + '("header" "ATK_ROLE_HEADER") + '("footer" "ATK_ROLE_FOOTER") + '("paragraph" "ATK_ROLE_PARAGRAPH") + '("ruler" "ATK_ROLE_RULER") + '("application" "ATK_ROLE_APPLICATION") + '("autocomplete" "ATK_ROLE_AUTOCOMPLETE") + '("editbar" "ATK_ROLE_EDITBAR") + '("embedded" "ATK_ROLE_EMBEDDED") + '("last-defined" "ATK_ROLE_LAST_DEFINED") + ) +) + +(define-enum Layer + (in-module "Atk") + (c-name "AtkLayer") + (gtype-id "ATK_TYPE_LAYER") + (values + '("invalid" "ATK_LAYER_INVALID") + '("background" "ATK_LAYER_BACKGROUND") + '("canvas" "ATK_LAYER_CANVAS") + '("widget" "ATK_LAYER_WIDGET") + '("mdi" "ATK_LAYER_MDI") + '("popup" "ATK_LAYER_POPUP") + '("overlay" "ATK_LAYER_OVERLAY") + '("window" "ATK_LAYER_WINDOW") + ) +) + +(define-enum RelationType + (in-module "Atk") + (c-name "AtkRelationType") + (gtype-id "ATK_TYPE_RELATION_TYPE") + (values + '("null" "ATK_RELATION_NULL") + '("controlled-by" "ATK_RELATION_CONTROLLED_BY") + '("controller-for" "ATK_RELATION_CONTROLLER_FOR") + '("label-for" "ATK_RELATION_LABEL_FOR") + '("labelled-by" "ATK_RELATION_LABELLED_BY") + '("member-of" "ATK_RELATION_MEMBER_OF") + '("node-child-of" "ATK_RELATION_NODE_CHILD_OF") + '("flows-to" "ATK_RELATION_FLOWS_TO") + '("flows-from" "ATK_RELATION_FLOWS_FROM") + '("subwindow-of" "ATK_RELATION_SUBWINDOW_OF") + '("embeds" "ATK_RELATION_EMBEDS") + '("embedded-by" "ATK_RELATION_EMBEDDED_BY") + '("popup-for" "ATK_RELATION_POPUP_FOR") + '("parent-window-of" "ATK_RELATION_PARENT_WINDOW_OF") + '("last-defined" "ATK_RELATION_LAST_DEFINED") + ) +) + +(define-enum StateType + (in-module "Atk") + (c-name "AtkStateType") + (gtype-id "ATK_TYPE_STATE_TYPE") + (values + '("invalid" "ATK_STATE_INVALID") + '("active" "ATK_STATE_ACTIVE") + '("armed" "ATK_STATE_ARMED") + '("busy" "ATK_STATE_BUSY") + '("checked" "ATK_STATE_CHECKED") + '("defunct" "ATK_STATE_DEFUNCT") + '("editable" "ATK_STATE_EDITABLE") + '("enabled" "ATK_STATE_ENABLED") + '("expandable" "ATK_STATE_EXPANDABLE") + '("expanded" "ATK_STATE_EXPANDED") + '("focusable" "ATK_STATE_FOCUSABLE") + '("focused" "ATK_STATE_FOCUSED") + '("horizontal" "ATK_STATE_HORIZONTAL") + '("iconified" "ATK_STATE_ICONIFIED") + '("modal" "ATK_STATE_MODAL") + '("multi-line" "ATK_STATE_MULTI_LINE") + '("multiselectable" "ATK_STATE_MULTISELECTABLE") + '("opaque" "ATK_STATE_OPAQUE") + '("pressed" "ATK_STATE_PRESSED") + '("resizable" "ATK_STATE_RESIZABLE") + '("selectable" "ATK_STATE_SELECTABLE") + '("selected" "ATK_STATE_SELECTED") + '("sensitive" "ATK_STATE_SENSITIVE") + '("showing" "ATK_STATE_SHOWING") + '("single-line" "ATK_STATE_SINGLE_LINE") + '("stale" "ATK_STATE_STALE") + '("transient" "ATK_STATE_TRANSIENT") + '("vertical" "ATK_STATE_VERTICAL") + '("visible" "ATK_STATE_VISIBLE") + '("manages-descendants" "ATK_STATE_MANAGES_DESCENDANTS") + '("indeterminate" "ATK_STATE_INDETERMINATE") + '("truncated" "ATK_STATE_TRUNCATED") + '("last-defined" "ATK_STATE_LAST_DEFINED") + ) +) + +(define-enum TextAttribute + (in-module "Atk") + (c-name "AtkTextAttribute") + (gtype-id "ATK_TYPE_TEXT_ATTRIBUTE") + (values + '("invalid" "ATK_TEXT_ATTR_INVALID") + '("left-margin" "ATK_TEXT_ATTR_LEFT_MARGIN") + '("right-margin" "ATK_TEXT_ATTR_RIGHT_MARGIN") + '("indent" "ATK_TEXT_ATTR_INDENT") + '("invisible" "ATK_TEXT_ATTR_INVISIBLE") + '("editable" "ATK_TEXT_ATTR_EDITABLE") + '("pixels-above-lines" "ATK_TEXT_ATTR_PIXELS_ABOVE_LINES") + '("pixels-below-lines" "ATK_TEXT_ATTR_PIXELS_BELOW_LINES") + '("pixels-inside-wrap" "ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP") + '("bg-full-height" "ATK_TEXT_ATTR_BG_FULL_HEIGHT") + '("rise" "ATK_TEXT_ATTR_RISE") + '("underline" "ATK_TEXT_ATTR_UNDERLINE") + '("strikethrough" "ATK_TEXT_ATTR_STRIKETHROUGH") + '("size" "ATK_TEXT_ATTR_SIZE") + '("scale" "ATK_TEXT_ATTR_SCALE") + '("weight" "ATK_TEXT_ATTR_WEIGHT") + '("language" "ATK_TEXT_ATTR_LANGUAGE") + '("family-name" "ATK_TEXT_ATTR_FAMILY_NAME") + '("bg-color" "ATK_TEXT_ATTR_BG_COLOR") + '("fg-color" "ATK_TEXT_ATTR_FG_COLOR") + '("bg-stipple" "ATK_TEXT_ATTR_BG_STIPPLE") + '("fg-stipple" "ATK_TEXT_ATTR_FG_STIPPLE") + '("wrap-mode" "ATK_TEXT_ATTR_WRAP_MODE") + '("direction" "ATK_TEXT_ATTR_DIRECTION") + '("justification" "ATK_TEXT_ATTR_JUSTIFICATION") + '("stretch" "ATK_TEXT_ATTR_STRETCH") + '("variant" "ATK_TEXT_ATTR_VARIANT") + '("style" "ATK_TEXT_ATTR_STYLE") + '("last-defined" "ATK_TEXT_ATTR_LAST_DEFINED") + ) +) + +(define-enum TextBoundary + (in-module "Atk") + (c-name "AtkTextBoundary") + (gtype-id "ATK_TYPE_TEXT_BOUNDARY") + (values + '("char" "ATK_TEXT_BOUNDARY_CHAR") + '("word-start" "ATK_TEXT_BOUNDARY_WORD_START") + '("word-end" "ATK_TEXT_BOUNDARY_WORD_END") + '("sentence-start" "ATK_TEXT_BOUNDARY_SENTENCE_START") + '("sentence-end" "ATK_TEXT_BOUNDARY_SENTENCE_END") + '("line-start" "ATK_TEXT_BOUNDARY_LINE_START") + '("line-end" "ATK_TEXT_BOUNDARY_LINE_END") + ) +) + +(define-enum TextClipType + (in-module "Atk") + (c-name "AtkTextClipType") + (gtype-id "ATK_TYPE_TEXT_CLIP_TYPE") + (values + '("none" "ATK_TEXT_CLIP_NONE") + '("min" "ATK_TEXT_CLIP_MIN") + '("max" "ATK_TEXT_CLIP_MAX") + '("both" "ATK_TEXT_CLIP_BOTH") + ) +) + +(define-enum KeyEventType + (in-module "Atk") + (c-name "AtkKeyEventType") + (gtype-id "ATK_TYPE_KEY_EVENT_TYPE") + (values + '("press" "ATK_KEY_EVENT_PRESS") + '("release" "ATK_KEY_EVENT_RELEASE") + '("last-defined" "ATK_KEY_EVENT_LAST_DEFINED") + ) +) + +(define-enum CoordType + (in-module "Atk") + (c-name "AtkCoordType") + (gtype-id "ATK_TYPE_COORD_TYPE") + (values + '("screen" "ATK_XY_SCREEN") + '("window" "ATK_XY_WINDOW") + ) +) + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkaction.h + +(define-function atk_action_get_type + (c-name "atk_action_get_type") + (return-type "GType") +) + +(define-method do_action + (of-object "AtkAction") + (c-name "atk_action_do_action") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-method get_n_actions + (of-object "AtkAction") + (c-name "atk_action_get_n_actions") + (return-type "gint") +) + +(define-method get_description + (of-object "AtkAction") + (c-name "atk_action_get_description") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-method get_name + (of-object "AtkAction") + (c-name "atk_action_get_name") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-method get_keybinding + (of-object "AtkAction") + (c-name "atk_action_get_keybinding") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-method set_description + (of-object "AtkAction") + (c-name "atk_action_set_description") + (return-type "gboolean") + (parameters + '("gint" "i") + '("const-gchar*" "desc") + ) +) + +(define-method get_localized_name + (of-object "AtkAction") + (c-name "atk_action_get_localized_name") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkcomponent.h + +(define-function atk_rectangle_get_type + (c-name "atk_rectangle_get_type") + (return-type "GType") +) + +(define-function atk_component_get_type + (c-name "atk_component_get_type") + (return-type "GType") +) + +(define-method add_focus_handler + (of-object "AtkComponent") + (c-name "atk_component_add_focus_handler") + (return-type "guint") + (parameters + '("AtkFocusHandler" "handler") + ) +) + +(define-method contains + (of-object "AtkComponent") + (c-name "atk_component_contains") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-method ref_accessible_at_point + (of-object "AtkComponent") + (c-name "atk_component_ref_accessible_at_point") + (return-type "AtkObject*") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-method get_extents + (of-object "AtkComponent") + (c-name "atk_component_get_extents") + (return-type "none") + (parameters + '("gint*" "x") + '("gint*" "y") + '("gint*" "width") + '("gint*" "height") + '("AtkCoordType" "coord_type") + ) +) + +(define-method get_position + (of-object "AtkComponent") + (c-name "atk_component_get_position") + (return-type "none") + (parameters + '("gint*" "x") + '("gint*" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-method get_size + (of-object "AtkComponent") + (c-name "atk_component_get_size") + (return-type "none") + (parameters + '("gint*" "width") + '("gint*" "height") + ) +) + +(define-method get_layer + (of-object "AtkComponent") + (c-name "atk_component_get_layer") + (return-type "AtkLayer") +) + +(define-method get_mdi_zorder + (of-object "AtkComponent") + (c-name "atk_component_get_mdi_zorder") + (return-type "gint") +) + +(define-method grab_focus + (of-object "AtkComponent") + (c-name "atk_component_grab_focus") + (return-type "gboolean") +) + +(define-method remove_focus_handler + (of-object "AtkComponent") + (c-name "atk_component_remove_focus_handler") + (return-type "none") + (parameters + '("guint" "handler_id") + ) +) + +(define-method set_extents + (of-object "AtkComponent") + (c-name "atk_component_set_extents") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("AtkCoordType" "coord_type") + ) +) + +(define-method set_position + (of-object "AtkComponent") + (c-name "atk_component_set_position") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-method set_size + (of-object "AtkComponent") + (c-name "atk_component_set_size") + (return-type "gboolean") + (parameters + '("gint" "width") + '("gint" "height") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkdocument.h + +(define-function atk_document_get_type + (c-name "atk_document_get_type") + (return-type "GType") +) + +(define-method get_document_type + (of-object "AtkDocument") + (c-name "atk_document_get_document_type") + (return-type "const-gchar*") +) + +(define-method get_document + (of-object "AtkDocument") + (c-name "atk_document_get_document") + (return-type "gpointer") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkeditabletext.h + +(define-function atk_editable_text_get_type + (c-name "atk_editable_text_get_type") + (return-type "GType") +) + +(define-method set_run_attributes + (of-object "AtkEditableText") + (c-name "atk_editable_text_set_run_attributes") + (return-type "gboolean") + (parameters + '("AtkAttributeSet*" "attrib_set") + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-method set_text_contents + (of-object "AtkEditableText") + (c-name "atk_editable_text_set_text_contents") + (return-type "none") + (parameters + '("const-gchar*" "string") + ) +) + +(define-method insert_text + (of-object "AtkEditableText") + (c-name "atk_editable_text_insert_text") + (return-type "none") + (parameters + '("const-gchar*" "string") + '("gint" "length") + '("gint*" "position") + ) +) + +(define-method copy_text + (of-object "AtkEditableText") + (c-name "atk_editable_text_copy_text") + (return-type "none") + (parameters + '("gint" "start_pos") + '("gint" "end_pos") + ) +) + +(define-method cut_text + (of-object "AtkEditableText") + (c-name "atk_editable_text_cut_text") + (return-type "none") + (parameters + '("gint" "start_pos") + '("gint" "end_pos") + ) +) + +(define-method delete_text + (of-object "AtkEditableText") + (c-name "atk_editable_text_delete_text") + (return-type "none") + (parameters + '("gint" "start_pos") + '("gint" "end_pos") + ) +) + +(define-method paste_text + (of-object "AtkEditableText") + (c-name "atk_editable_text_paste_text") + (return-type "none") + (parameters + '("gint" "position") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atk-enum-types.h + +(define-function atk_hyperlink_state_flags_get_type + (c-name "atk_hyperlink_state_flags_get_type") + (return-type "GType") +) + +(define-function atk_role_get_type + (c-name "atk_role_get_type") + (return-type "GType") +) + +(define-function atk_layer_get_type + (c-name "atk_layer_get_type") + (return-type "GType") +) + +(define-function atk_relation_type_get_type + (c-name "atk_relation_type_get_type") + (return-type "GType") +) + +(define-function atk_state_type_get_type + (c-name "atk_state_type_get_type") + (return-type "GType") +) + +(define-function atk_text_attribute_get_type + (c-name "atk_text_attribute_get_type") + (return-type "GType") +) + +(define-function atk_text_boundary_get_type + (c-name "atk_text_boundary_get_type") + (return-type "GType") +) + +(define-function atk_text_clip_type_get_type + (c-name "atk_text_clip_type_get_type") + (return-type "GType") +) + +(define-function atk_key_event_type_get_type + (c-name "atk_key_event_type_get_type") + (return-type "GType") +) + +(define-function atk_coord_type_get_type + (c-name "atk_coord_type_get_type") + (return-type "GType") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkgobjectaccessible.h + +(define-function atk_gobject_accessible_get_type + (c-name "atk_gobject_accessible_get_type") + (return-type "GType") +) + +(define-function atk_gobject_accessible_for_object + (c-name "atk_gobject_accessible_for_object") + (return-type "AtkObject*") + (parameters + '("GObject*" "obj") + ) +) + +(define-method get_object + (of-object "AtkGObjectAccessible") + (c-name "atk_gobject_accessible_get_object") + (return-type "GObject*") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atk.h + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkhyperlink.h + +(define-function atk_hyperlink_get_type + (c-name "atk_hyperlink_get_type") + (return-type "GType") +) + +(define-method get_uri + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_get_uri") + (return-type "gchar*") + (parameters + '("gint" "i") + ) +) + +(define-method get_object + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_get_object") + (return-type "AtkObject*") + (parameters + '("gint" "i") + ) +) + +(define-method get_end_index + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_get_end_index") + (return-type "gint") +) + +(define-method get_start_index + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_get_start_index") + (return-type "gint") +) + +(define-method is_valid + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_is_valid") + (return-type "gboolean") +) + +(define-method is_inline + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_is_inline") + (return-type "gboolean") +) + +(define-method get_n_anchors + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_get_n_anchors") + (return-type "gint") +) + +(define-method is_selected_link + (of-object "AtkHyperlink") + (c-name "atk_hyperlink_is_selected_link") + (return-type "gboolean") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkhypertext.h + +(define-function atk_hypertext_get_type + (c-name "atk_hypertext_get_type") + (return-type "GType") +) + +(define-method get_link + (of-object "AtkHypertext") + (c-name "atk_hypertext_get_link") + (return-type "AtkHyperlink*") + (parameters + '("gint" "link_index") + ) +) + +(define-method get_n_links + (of-object "AtkHypertext") + (c-name "atk_hypertext_get_n_links") + (return-type "gint") +) + +(define-method get_link_index + (of-object "AtkHypertext") + (c-name "atk_hypertext_get_link_index") + (return-type "gint") + (parameters + '("gint" "char_index") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkimage.h + +(define-function atk_image_get_type + (c-name "atk_image_get_type") + (return-type "GType") +) + +(define-method get_image_description + (of-object "AtkImage") + (c-name "atk_image_get_image_description") + (return-type "const-gchar*") +) + +(define-method get_image_size + (of-object "AtkImage") + (c-name "atk_image_get_image_size") + (return-type "none") + (parameters + '("gint*" "width") + '("gint*" "height") + ) +) + +(define-method set_image_description + (of-object "AtkImage") + (c-name "atk_image_set_image_description") + (return-type "gboolean") + (parameters + '("const-gchar*" "description") + ) +) + +(define-method get_image_position + (of-object "AtkImage") + (c-name "atk_image_get_image_position") + (return-type "none") + (parameters + '("gint*" "x") + '("gint*" "y") + '("AtkCoordType" "coord_type") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkintl.h + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkmarshal.h + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atknoopobjectfactory.h + +(define-function atk_no_op_object_factory_get_type + (c-name "atk_no_op_object_factory_get_type") + (return-type "GType") +) + +(define-function atk_no_op_object_factory_new + (c-name "atk_no_op_object_factory_new") + (is-constructor-of "AtkNoOpObjectFactory") + (return-type "AtkObjectFactory*") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atknoopobject.h + +(define-function atk_no_op_object_get_type + (c-name "atk_no_op_object_get_type") + (return-type "GType") +) + +(define-function atk_no_op_object_new + (c-name "atk_no_op_object_new") + (is-constructor-of "AtkNoOpObject") + (return-type "AtkObject*") + (parameters + '("GObject*" "obj") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkobjectfactory.h + +(define-function atk_object_factory_get_type + (c-name "atk_object_factory_get_type") + (return-type "GType") +) + +(define-method create_accessible + (of-object "AtkObjectFactory") + (c-name "atk_object_factory_create_accessible") + (return-type "AtkObject*") + (parameters + '("GObject*" "obj") + ) +) + +(define-method invalidate + (of-object "AtkObjectFactory") + (c-name "atk_object_factory_invalidate") + (return-type "none") +) + +(define-method get_accessible_type + (of-object "AtkObjectFactory") + (c-name "atk_object_factory_get_accessible_type") + (return-type "GType") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkobject.h + +(define-function atk_role_register + (c-name "atk_role_register") + (return-type "AtkRole") + (parameters + '("const-gchar*" "name") + ) +) + +(define-function atk_object_get_type + (c-name "atk_object_get_type") + (return-type "GType") +) + +(define-function atk_implementor_get_type + (c-name "atk_implementor_get_type") + (return-type "GType") +) + +(define-method ref_accessible + (of-object "AtkImplementor") + (c-name "atk_implementor_ref_accessible") + (return-type "AtkObject*") +) + +(define-method get_name + (of-object "AtkObject") + (c-name "atk_object_get_name") + (return-type "const-gchar*") +) + +(define-method get_description + (of-object "AtkObject") + (c-name "atk_object_get_description") + (return-type "const-gchar*") +) + +(define-method get_parent + (of-object "AtkObject") + (c-name "atk_object_get_parent") + (return-type "AtkObject*") +) + +(define-method get_n_accessible_children + (of-object "AtkObject") + (c-name "atk_object_get_n_accessible_children") + (return-type "gint") +) + +(define-method ref_accessible_child + (of-object "AtkObject") + (c-name "atk_object_ref_accessible_child") + (return-type "AtkObject*") + (parameters + '("gint" "i") + ) +) + +(define-method ref_relation_set + (of-object "AtkObject") + (c-name "atk_object_ref_relation_set") + (return-type "AtkRelationSet*") +) + +(define-method get_role + (of-object "AtkObject") + (c-name "atk_object_get_role") + (return-type "AtkRole") +) + +(define-method get_layer + (of-object "AtkObject") + (c-name "atk_object_get_layer") + (return-type "AtkLayer") +) + +(define-method get_mdi_zorder + (of-object "AtkObject") + (c-name "atk_object_get_mdi_zorder") + (return-type "gint") +) + +(define-method ref_state_set + (of-object "AtkObject") + (c-name "atk_object_ref_state_set") + (return-type "AtkStateSet*") +) + +(define-method get_index_in_parent + (of-object "AtkObject") + (c-name "atk_object_get_index_in_parent") + (return-type "gint") +) + +(define-method set_name + (of-object "AtkObject") + (c-name "atk_object_set_name") + (return-type "none") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method set_description + (of-object "AtkObject") + (c-name "atk_object_set_description") + (return-type "none") + (parameters + '("const-gchar*" "description") + ) +) + +(define-method set_parent + (of-object "AtkObject") + (c-name "atk_object_set_parent") + (return-type "none") + (parameters + '("AtkObject*" "parent") + ) +) + +(define-method set_role + (of-object "AtkObject") + (c-name "atk_object_set_role") + (return-type "none") + (parameters + '("AtkRole" "role") + ) +) + +(define-method connect_property_change_handler + (of-object "AtkObject") + (c-name "atk_object_connect_property_change_handler") + (return-type "guint") + (parameters + '("AtkPropertyChangeHandler*" "handler") + ) +) + +(define-method remove_property_change_handler + (of-object "AtkObject") + (c-name "atk_object_remove_property_change_handler") + (return-type "none") + (parameters + '("guint" "handler_id") + ) +) + +(define-method notify_state_change + (of-object "AtkObject") + (c-name "atk_object_notify_state_change") + (return-type "none") + (parameters + '("AtkState" "state") + '("gboolean" "value") + ) +) + +(define-method initialize + (of-object "AtkObject") + (c-name "atk_object_initialize") + (return-type "none") + (parameters + '("gpointer" "data") + ) +) + +(define-method get_name + (of-object "AtkRole") + (c-name "atk_role_get_name") + (return-type "const-gchar*") +) + +(define-function atk_role_for_name + (c-name "atk_role_for_name") + (return-type "AtkRole") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method add_relationship + (of-object "AtkObject") + (c-name "atk_object_add_relationship") + (return-type "gboolean") + (parameters + '("AtkRelationType" "relationship") + '("AtkObject*" "target") + ) +) + +(define-method remove_relationship + (of-object "AtkObject") + (c-name "atk_object_remove_relationship") + (return-type "gboolean") + (parameters + '("AtkRelationType" "relationship") + '("AtkObject*" "target") + ) +) + +(define-method get_localized_name + (of-object "AtkRole") + (c-name "atk_role_get_localized_name") + (return-type "const-gchar*") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkregistry.h + +(define-function atk_registry_get_type + (c-name "atk_registry_get_type") + (return-type "GType") +) + +(define-method set_factory_type + (of-object "AtkRegistry") + (c-name "atk_registry_set_factory_type") + (return-type "none") + (parameters + '("GType" "type") + '("GType" "factory_type") + ) +) + +(define-method get_factory_type + (of-object "AtkRegistry") + (c-name "atk_registry_get_factory_type") + (return-type "GType") + (parameters + '("GType" "type") + ) +) + +(define-method get_factory + (of-object "AtkRegistry") + (c-name "atk_registry_get_factory") + (return-type "AtkObjectFactory*") + (parameters + '("GType" "type") + ) +) + +(define-function atk_get_default_registry + (c-name "atk_get_default_registry") + (return-type "AtkRegistry*") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkrelation.h + +(define-function atk_relation_get_type + (c-name "atk_relation_get_type") + (return-type "GType") +) + +(define-function atk_relation_type_register + (c-name "atk_relation_type_register") + (return-type "AtkRelationType") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method get_name + (of-object "AtkRelationType") + (c-name "atk_relation_type_get_name") + (return-type "const-gchar*") +) + +(define-function atk_relation_type_for_name + (c-name "atk_relation_type_for_name") + (return-type "AtkRelationType") + (parameters + '("const-gchar*" "name") + ) +) + +(define-function atk_relation_new + (c-name "atk_relation_new") + (is-constructor-of "AtkRelation") + (return-type "AtkRelation*") + (parameters + '("AtkObject**" "targets") + '("gint" "n_targets") + '("AtkRelationType" "relationship") + ) +) + +(define-method get_relation_type + (of-object "AtkRelation") + (c-name "atk_relation_get_relation_type") + (return-type "AtkRelationType") +) + +(define-method get_target + (of-object "AtkRelation") + (c-name "atk_relation_get_target") + (return-type "GPtrArray*") +) + +(define-method add_target + (of-object "AtkRelation") + (c-name "atk_relation_add_target") + (return-type "none") + (parameters + '("AtkObject*" "target") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkrelationset.h + +(define-function atk_relation_set_get_type + (c-name "atk_relation_set_get_type") + (return-type "GType") +) + +(define-function atk_relation_set_new + (c-name "atk_relation_set_new") + (is-constructor-of "AtkRelationSet") + (return-type "AtkRelationSet*") +) + +(define-method contains + (of-object "AtkRelationSet") + (c-name "atk_relation_set_contains") + (return-type "gboolean") + (parameters + '("AtkRelationType" "relationship") + ) +) + +(define-method remove + (of-object "AtkRelationSet") + (c-name "atk_relation_set_remove") + (return-type "none") + (parameters + '("AtkRelation*" "relation") + ) +) + +(define-method add + (of-object "AtkRelationSet") + (c-name "atk_relation_set_add") + (return-type "none") + (parameters + '("AtkRelation*" "relation") + ) +) + +(define-method get_n_relations + (of-object "AtkRelationSet") + (c-name "atk_relation_set_get_n_relations") + (return-type "gint") +) + +(define-method get_relation + (of-object "AtkRelationSet") + (c-name "atk_relation_set_get_relation") + (return-type "AtkRelation*") + (parameters + '("gint" "i") + ) +) + +(define-method get_relation_by_type + (of-object "AtkRelationSet") + (c-name "atk_relation_set_get_relation_by_type") + (return-type "AtkRelation*") + (parameters + '("AtkRelationType" "relationship") + ) +) + +(define-method add_relation_by_type + (of-object "AtkRelationSet") + (c-name "atk_relation_set_add_relation_by_type") + (return-type "none") + (parameters + '("AtkRelationType" "relationship") + '("AtkObject*" "target") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkrelationtype.h + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkselection.h + +(define-function atk_selection_get_type + (c-name "atk_selection_get_type") + (return-type "GType") +) + +(define-method add_selection + (of-object "AtkSelection") + (c-name "atk_selection_add_selection") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-method clear_selection + (of-object "AtkSelection") + (c-name "atk_selection_clear_selection") + (return-type "gboolean") +) + +(define-method ref_selection + (of-object "AtkSelection") + (c-name "atk_selection_ref_selection") + (return-type "AtkObject*") + (parameters + '("gint" "i") + ) +) + +(define-method get_selection_count + (of-object "AtkSelection") + (c-name "atk_selection_get_selection_count") + (return-type "gint") +) + +(define-method is_child_selected + (of-object "AtkSelection") + (c-name "atk_selection_is_child_selected") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-method remove_selection + (of-object "AtkSelection") + (c-name "atk_selection_remove_selection") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-method select_all_selection + (of-object "AtkSelection") + (c-name "atk_selection_select_all_selection") + (return-type "gboolean") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkstate.h + +(define-function atk_state_type_register + (c-name "atk_state_type_register") + (return-type "AtkStateType") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method get_name + (of-object "AtkStateType") + (c-name "atk_state_type_get_name") + (return-type "const-gchar*") +) + +(define-function atk_state_type_for_name + (c-name "atk_state_type_for_name") + (return-type "AtkStateType") + (parameters + '("const-gchar*" "name") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkstateset.h + +(define-function atk_state_set_get_type + (c-name "atk_state_set_get_type") + (return-type "GType") +) + +(define-function atk_state_set_new + (c-name "atk_state_set_new") + (is-constructor-of "AtkStateSet") + (return-type "AtkStateSet*") +) + +(define-method is_empty + (of-object "AtkStateSet") + (c-name "atk_state_set_is_empty") + (return-type "gboolean") +) + +(define-method add_state + (of-object "AtkStateSet") + (c-name "atk_state_set_add_state") + (return-type "gboolean") + (parameters + '("AtkStateType" "type") + ) +) + +(define-method add_states + (of-object "AtkStateSet") + (c-name "atk_state_set_add_states") + (return-type "none") + (parameters + '("AtkStateType*" "types") + '("gint" "n_types") + ) +) + +(define-method clear_states + (of-object "AtkStateSet") + (c-name "atk_state_set_clear_states") + (return-type "none") +) + +(define-method contains_state + (of-object "AtkStateSet") + (c-name "atk_state_set_contains_state") + (return-type "gboolean") + (parameters + '("AtkStateType" "type") + ) +) + +(define-method contains_states + (of-object "AtkStateSet") + (c-name "atk_state_set_contains_states") + (return-type "gboolean") + (parameters + '("AtkStateType*" "types") + '("gint" "n_types") + ) +) + +(define-method remove_state + (of-object "AtkStateSet") + (c-name "atk_state_set_remove_state") + (return-type "gboolean") + (parameters + '("AtkStateType" "type") + ) +) + +(define-method and_sets + (of-object "AtkStateSet") + (c-name "atk_state_set_and_sets") + (return-type "AtkStateSet*") + (parameters + '("AtkStateSet*" "compare_set") + ) +) + +(define-method or_sets + (of-object "AtkStateSet") + (c-name "atk_state_set_or_sets") + (return-type "AtkStateSet*") + (parameters + '("AtkStateSet*" "compare_set") + ) +) + +(define-method xor_sets + (of-object "AtkStateSet") + (c-name "atk_state_set_xor_sets") + (return-type "AtkStateSet*") + (parameters + '("AtkStateSet*" "compare_set") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkstreamablecontent.h + +(define-function atk_streamable_content_get_type + (c-name "atk_streamable_content_get_type") + (return-type "GType") +) + +(define-method get_n_mime_types + (of-object "AtkStreamableContent") + (c-name "atk_streamable_content_get_n_mime_types") + (return-type "gint") +) + +(define-method get_mime_type + (of-object "AtkStreamableContent") + (c-name "atk_streamable_content_get_mime_type") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-method get_stream + (of-object "AtkStreamableContent") + (c-name "atk_streamable_content_get_stream") + (return-type "GIOChannel*") + (parameters + '("const-gchar*" "mime_type") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atktable.h + +(define-function atk_table_get_type + (c-name "atk_table_get_type") + (return-type "GType") +) + +(define-method ref_at + (of-object "AtkTable") + (c-name "atk_table_ref_at") + (return-type "AtkObject*") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-method get_index_at + (of-object "AtkTable") + (c-name "atk_table_get_index_at") + (return-type "gint") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-method get_column_at_index + (of-object "AtkTable") + (c-name "atk_table_get_column_at_index") + (return-type "gint") + (parameters + '("gint" "index_") + ) +) + +(define-method get_row_at_index + (of-object "AtkTable") + (c-name "atk_table_get_row_at_index") + (return-type "gint") + (parameters + '("gint" "index_") + ) +) + +(define-method get_n_columns + (of-object "AtkTable") + (c-name "atk_table_get_n_columns") + (return-type "gint") +) + +(define-method get_n_rows + (of-object "AtkTable") + (c-name "atk_table_get_n_rows") + (return-type "gint") +) + +(define-method get_column_extent_at + (of-object "AtkTable") + (c-name "atk_table_get_column_extent_at") + (return-type "gint") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-method get_row_extent_at + (of-object "AtkTable") + (c-name "atk_table_get_row_extent_at") + (return-type "gint") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-method get_caption + (of-object "AtkTable") + (c-name "atk_table_get_caption") + (return-type "AtkObject*") +) + +(define-method get_column_description + (of-object "AtkTable") + (c-name "atk_table_get_column_description") + (return-type "const-gchar*") + (parameters + '("gint" "column") + ) +) + +(define-method get_column_header + (of-object "AtkTable") + (c-name "atk_table_get_column_header") + (return-type "AtkObject*") + (parameters + '("gint" "column") + ) +) + +(define-method get_row_description + (of-object "AtkTable") + (c-name "atk_table_get_row_description") + (return-type "const-gchar*") + (parameters + '("gint" "row") + ) +) + +(define-method get_row_header + (of-object "AtkTable") + (c-name "atk_table_get_row_header") + (return-type "AtkObject*") + (parameters + '("gint" "row") + ) +) + +(define-method get_summary + (of-object "AtkTable") + (c-name "atk_table_get_summary") + (return-type "AtkObject*") +) + +(define-method set_caption + (of-object "AtkTable") + (c-name "atk_table_set_caption") + (return-type "none") + (parameters + '("AtkObject*" "caption") + ) +) + +(define-method set_column_description + (of-object "AtkTable") + (c-name "atk_table_set_column_description") + (return-type "none") + (parameters + '("gint" "column") + '("const-gchar*" "description") + ) +) + +(define-method set_column_header + (of-object "AtkTable") + (c-name "atk_table_set_column_header") + (return-type "none") + (parameters + '("gint" "column") + '("AtkObject*" "header") + ) +) + +(define-method set_row_description + (of-object "AtkTable") + (c-name "atk_table_set_row_description") + (return-type "none") + (parameters + '("gint" "row") + '("const-gchar*" "description") + ) +) + +(define-method set_row_header + (of-object "AtkTable") + (c-name "atk_table_set_row_header") + (return-type "none") + (parameters + '("gint" "row") + '("AtkObject*" "header") + ) +) + +(define-method set_summary + (of-object "AtkTable") + (c-name "atk_table_set_summary") + (return-type "none") + (parameters + '("AtkObject*" "accessible") + ) +) + +(define-method get_selected_columns + (of-object "AtkTable") + (c-name "atk_table_get_selected_columns") + (return-type "gint") + (parameters + '("gint**" "selected") + ) +) + +(define-method get_selected_rows + (of-object "AtkTable") + (c-name "atk_table_get_selected_rows") + (return-type "gint") + (parameters + '("gint**" "selected") + ) +) + +(define-method is_column_selected + (of-object "AtkTable") + (c-name "atk_table_is_column_selected") + (return-type "gboolean") + (parameters + '("gint" "column") + ) +) + +(define-method is_row_selected + (of-object "AtkTable") + (c-name "atk_table_is_row_selected") + (return-type "gboolean") + (parameters + '("gint" "row") + ) +) + +(define-method is_selected + (of-object "AtkTable") + (c-name "atk_table_is_selected") + (return-type "gboolean") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-method add_row_selection + (of-object "AtkTable") + (c-name "atk_table_add_row_selection") + (return-type "gboolean") + (parameters + '("gint" "row") + ) +) + +(define-method remove_row_selection + (of-object "AtkTable") + (c-name "atk_table_remove_row_selection") + (return-type "gboolean") + (parameters + '("gint" "row") + ) +) + +(define-method add_column_selection + (of-object "AtkTable") + (c-name "atk_table_add_column_selection") + (return-type "gboolean") + (parameters + '("gint" "column") + ) +) + +(define-method remove_column_selection + (of-object "AtkTable") + (c-name "atk_table_remove_column_selection") + (return-type "gboolean") + (parameters + '("gint" "column") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atktext.h + +(define-function atk_text_attribute_register + (c-name "atk_text_attribute_register") + (return-type "AtkTextAttribute") + (parameters + '("const-gchar*" "name") + ) +) + +(define-function atk_text_get_type + (c-name "atk_text_get_type") + (return-type "GType") +) + +(define-method get_text + (of-object "AtkText") + (c-name "atk_text_get_text") + (return-type "gchar*") + (parameters + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-method get_character_at_offset + (of-object "AtkText") + (c-name "atk_text_get_character_at_offset") + (return-type "gunichar") + (parameters + '("gint" "offset") + ) +) + +(define-method get_text_after_offset + (of-object "AtkText") + (c-name "atk_text_get_text_after_offset") + (return-type "gchar*") + (parameters + '("gint" "offset") + '("AtkTextBoundary" "boundary_type") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-method get_text_at_offset + (of-object "AtkText") + (c-name "atk_text_get_text_at_offset") + (return-type "gchar*") + (parameters + '("gint" "offset") + '("AtkTextBoundary" "boundary_type") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-method get_text_before_offset + (of-object "AtkText") + (c-name "atk_text_get_text_before_offset") + (return-type "gchar*") + (parameters + '("gint" "offset") + '("AtkTextBoundary" "boundary_type") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-method get_caret_offset + (of-object "AtkText") + (c-name "atk_text_get_caret_offset") + (return-type "gint") +) + +(define-method get_character_extents + (of-object "AtkText") + (c-name "atk_text_get_character_extents") + (return-type "none") + (parameters + '("gint" "offset") + '("gint*" "x") + '("gint*" "y") + '("gint*" "width") + '("gint*" "height") + '("AtkCoordType" "coords") + ) +) + +(define-method get_run_attributes + (of-object "AtkText") + (c-name "atk_text_get_run_attributes") + (return-type "AtkAttributeSet*") + (parameters + '("gint" "offset") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-method get_default_attributes + (of-object "AtkText") + (c-name "atk_text_get_default_attributes") + (return-type "AtkAttributeSet*") +) + +(define-method get_character_count + (of-object "AtkText") + (c-name "atk_text_get_character_count") + (return-type "gint") +) + +(define-method get_offset_at_point + (of-object "AtkText") + (c-name "atk_text_get_offset_at_point") + (return-type "gint") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coords") + ) +) + +(define-method get_n_selections + (of-object "AtkText") + (c-name "atk_text_get_n_selections") + (return-type "gint") +) + +(define-method get_selection + (of-object "AtkText") + (c-name "atk_text_get_selection") + (return-type "gchar*") + (parameters + '("gint" "selection_num") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-method add_selection + (of-object "AtkText") + (c-name "atk_text_add_selection") + (return-type "gboolean") + (parameters + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-method remove_selection + (of-object "AtkText") + (c-name "atk_text_remove_selection") + (return-type "gboolean") + (parameters + '("gint" "selection_num") + ) +) + +(define-method set_selection + (of-object "AtkText") + (c-name "atk_text_set_selection") + (return-type "gboolean") + (parameters + '("gint" "selection_num") + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-method set_caret_offset + (of-object "AtkText") + (c-name "atk_text_set_caret_offset") + (return-type "gboolean") + (parameters + '("gint" "offset") + ) +) + +(define-method get_range_extents + (of-object "AtkText") + (c-name "atk_text_get_range_extents") + (return-type "none") + (parameters + '("gint" "start_offset") + '("gint" "end_offset") + '("AtkCoordType" "coord_type") + '("AtkTextRectangle*" "rect") + ) +) + +(define-method get_bounded_ranges + (of-object "AtkText") + (c-name "atk_text_get_bounded_ranges") + (return-type "AtkTextRange**") + (parameters + '("AtkTextRectangle*" "rect") + '("AtkCoordType" "coord_type") + '("AtkTextClipType" "x_clip_type") + '("AtkTextClipType" "y_clip_type") + ) +) + +(define-function atk_text_free_ranges + (c-name "atk_text_free_ranges") + (return-type "none") + (parameters + '("AtkTextRange**" "ranges") + ) +) + +(define-method free + (of-object "AtkAttributeSet") + (c-name "atk_attribute_set_free") + (return-type "none") +) + +(define-method get_name + (of-object "AtkTextAttribute") + (c-name "atk_text_attribute_get_name") + (return-type "const-gchar*") +) + +(define-function atk_text_attribute_for_name + (c-name "atk_text_attribute_for_name") + (return-type "AtkTextAttribute") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method get_value + (of-object "AtkTextAttribute") + (c-name "atk_text_attribute_get_value") + (return-type "const-gchar*") + (parameters + '("gint" "index_") + ) +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkutil.h + +(define-function atk_util_get_type + (c-name "atk_util_get_type") + (return-type "GType") +) + +(define-function atk_add_focus_tracker + (c-name "atk_add_focus_tracker") + (return-type "guint") + (parameters + '("AtkEventListener" "focus_tracker") + ) +) + +(define-function atk_remove_focus_tracker + (c-name "atk_remove_focus_tracker") + (return-type "none") + (parameters + '("guint" "tracker_id") + ) +) + +(define-function atk_focus_tracker_init + (c-name "atk_focus_tracker_init") + (return-type "none") + (parameters + '("AtkEventListenerInit" "add_function") + ) +) + +(define-function atk_focus_tracker_notify + (c-name "atk_focus_tracker_notify") + (return-type "none") + (parameters + '("AtkObject*" "object") + ) +) + +(define-function atk_add_global_event_listener + (c-name "atk_add_global_event_listener") + (return-type "guint") + (parameters + '("GSignalEmissionHook" "listener") + '("const-gchar*" "event_type") + ) +) + +(define-function atk_remove_global_event_listener + (c-name "atk_remove_global_event_listener") + (return-type "none") + (parameters + '("guint" "listener_id") + ) +) + +(define-function atk_add_key_event_listener + (c-name "atk_add_key_event_listener") + (return-type "guint") + (parameters + '("AtkKeySnoopFunc" "listener") + '("gpointer" "data") + ) +) + +(define-function atk_remove_key_event_listener + (c-name "atk_remove_key_event_listener") + (return-type "none") + (parameters + '("guint" "listener_id") + ) +) + +(define-function atk_get_root + (c-name "atk_get_root") + (return-type "AtkObject*") +) + +(define-function atk_get_focus_object + (c-name "atk_get_focus_object") + (return-type "AtkObject*") +) + +(define-function atk_get_toolkit_name + (c-name "atk_get_toolkit_name") + (return-type "const-gchar*") +) + +(define-function atk_get_toolkit_version + (c-name "atk_get_toolkit_version") + (return-type "const-gchar*") +) + + + +;; From /home/murrayc/cvs/gnome210/atk/atk/atkvalue.h + +(define-function atk_value_get_type + (c-name "atk_value_get_type") + (return-type "GType") +) + +(define-method get_current_value + (of-object "AtkValue") + (c-name "atk_value_get_current_value") + (return-type "none") + (parameters + '("GValue*" "value") + ) +) + +(define-method get_maximum_value + (of-object "AtkValue") + (c-name "atk_value_get_maximum_value") + (return-type "none") + (parameters + '("GValue*" "value") + ) +) + +(define-method get_minimum_value + (of-object "AtkValue") + (c-name "atk_value_get_minimum_value") + (return-type "none") + (parameters + '("GValue*" "value") + ) +) + +(define-method set_current_value + (of-object "AtkValue") + (c-name "atk_value_set_current_value") + (return-type "gboolean") + (parameters + '("const-GValue*" "value") + ) +) + + diff --git a/libs/gtkmm2/atk/src/atk_signals.defs b/libs/gtkmm2/atk/src/atk_signals.defs new file mode 100644 index 0000000000..a2e32472a0 --- /dev/null +++ b/libs/gtkmm2/atk/src/atk_signals.defs @@ -0,0 +1,390 @@ +;; From AtkObject + +(define-signal children-changed + (of-object "AtkObject") + (return-type "void") + (when "last") + (parameters + '("guint" "p0") + '("gpointer" "p1") + ) +) + +(define-signal focus-event + (of-object "AtkObject") + (return-type "void") + (when "last") + (parameters + '("gboolean" "p0") + ) +) + +(define-signal property-change + (of-object "AtkObject") + (return-type "void") + (when "last") + (parameters + '("AtkPropertyValues*" "p0") + ) +) + +(define-signal state-change + (of-object "AtkObject") + (return-type "void") + (when "last") + (parameters + '("const-gchar*" "p0") + '("gboolean" "p1") + ) +) + +(define-signal visible-data-changed + (of-object "AtkObject") + (return-type "void") + (when "last") +) + +(define-signal active-descendant-changed + (of-object "AtkObject") + (return-type "void") + (when "last") + (parameters + '("gpointer*" "p0") + ) +) + +(define-property accessible-name + (of-object "AtkObject") + (prop-type "GParamString") + (docs "Object instance's name formatted for assistive technology access") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-description + (of-object "AtkObject") + (prop-type "GParamString") + (docs "Description of an object, formatted for assistive technology access") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-parent + (of-object "AtkObject") + (prop-type "GParamObject") + (docs "Is used to notify that the parent has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-value + (of-object "AtkObject") + (prop-type "GParamDouble") + (docs "Is used to notify that the value has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-role + (of-object "AtkObject") + (prop-type "GParamInt") + (docs "The accessible role of this object") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-component-layer + (of-object "AtkObject") + (prop-type "GParamInt") + (docs "The accessible layer of this object") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property accessible-component-mdi-zorder + (of-object "AtkObject") + (prop-type "GParamInt") + (docs "The accessible MDI value of this object") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property accessible-table-caption + (of-object "AtkObject") + (prop-type "GParamString") + (docs "Is used to notify that the table caption has changed; this property should not be used. accessible-table-caption-object should be used instead") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-table-column-description + (of-object "AtkObject") + (prop-type "GParamString") + (docs "Is used to notify that the table column description has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-table-column-header + (of-object "AtkObject") + (prop-type "GParamObject") + (docs "Is used to notify that the table column header has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-table-row-description + (of-object "AtkObject") + (prop-type "GParamString") + (docs "Is used to notify that the table row description has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-table-row-header + (of-object "AtkObject") + (prop-type "GParamObject") + (docs "Is used to notify that the table row header has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-table-summary + (of-object "AtkObject") + (prop-type "GParamObject") + (docs "Is used to notify that the table summary has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-table-caption-object + (of-object "AtkObject") + (prop-type "GParamObject") + (docs "Is used to notify that the table caption has changed") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property accessible-hypertext-nlinks + (of-object "AtkObject") + (prop-type "GParamInt") + (docs "The number of links which the current AtkHypertext has") + (readable #t) + (writable #f) + (construct-only #f) +) + +;; From AtkComponent + +(define-signal bounds-changed + (of-object "AtkComponent") + (return-type "void") + (when "last") + (parameters + '("AtkRectangle*" "p0") + ) +) + +;; From AtkAction + +;; From AtkEditableText + +;; From AtkHyperlink + +(define-signal link-activated + (of-object "AtkHyperlink") + (return-type "void") + (when "last") +) + +(define-property selected-link + (of-object "AtkHyperlink") + (prop-type "GParamBoolean") + (docs "Specifies whether the AtkHyperlink object is selected") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property number-of-anchors + (of-object "AtkHyperlink") + (prop-type "GParamInt") + (docs "The number of anchors associated with the AtkHyperlink object") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property end-index + (of-object "AtkHyperlink") + (prop-type "GParamInt") + (docs "The end index of the AtkHyperlink object") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property start-index + (of-object "AtkHyperlink") + (prop-type "GParamInt") + (docs "The start index of the AtkHyperlink object") + (readable #t) + (writable #f) + (construct-only #f) +) + +;; From AtkHypertext + +(define-signal link-selected + (of-object "AtkHypertext") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + ) +) + +;; From AtkImage + +;; From AtkSelection + +(define-signal selection-changed + (of-object "AtkSelection") + (return-type "void") + (when "last") +) + +;; From AtkTable + +(define-signal row-inserted + (of-object "AtkTable") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + ) +) + +(define-signal column-inserted + (of-object "AtkTable") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + ) +) + +(define-signal row-deleted + (of-object "AtkTable") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + ) +) + +(define-signal column-deleted + (of-object "AtkTable") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + ) +) + +(define-signal row-reordered + (of-object "AtkTable") + (return-type "void") + (when "last") +) + +(define-signal column-reordered + (of-object "AtkTable") + (return-type "void") + (when "last") +) + +(define-signal model-changed + (of-object "AtkTable") + (return-type "void") + (when "last") +) + +;; From AtkText + +(define-signal text-changed + (of-object "AtkText") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + ) +) + +(define-signal text-caret-moved + (of-object "AtkText") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + ) +) + +(define-signal text-selection-changed + (of-object "AtkText") + (return-type "void") + (when "last") +) + +(define-signal text-attributes-changed + (of-object "AtkText") + (return-type "void") + (when "last") +) + +;; From AtkValue + +;; From AtkRegistry + +;; From AtkRelation + +(define-property relation-type + (of-object "AtkRelation") + (prop-type "GParamEnum") + (docs "The type of the relation") + (readable #t) + (writable #t) + (construct-only #f) +) + +(define-property target + (of-object "AtkRelation") + (prop-type "GParamValueArray") + (docs "An array of the targets for the relation") + (readable #t) + (writable #t) + (construct-only #f) +) + +;; From AtkRelationSet + +;; From AtkStateSet diff --git a/libs/gtkmm2/atk/src/atk_vfuncs.defs b/libs/gtkmm2/atk/src/atk_vfuncs.defs new file mode 100644 index 0000000000..07b10559a6 --- /dev/null +++ b/libs/gtkmm2/atk/src/atk_vfuncs.defs @@ -0,0 +1,855 @@ +;; -*- scheme -*- +; virtual function definitions +; define-vfunc is gtkmm-specific + +; AtkAction + +(define-vfunc do_action + (of-object "AtkAction") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_n_actions + (of-object "AtkAction") + (return-type "gint") +) + +(define-vfunc get_description + (of-object "AtkAction") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_name + (of-object "AtkAction") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_keybinding + (of-object "AtkAction") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc set_description + (of-object "AtkAction") + (return-type "gboolean") + (parameters + '("gint" "i") + '("const-gchar*" "desc") + ) +) + +(define-vfunc get_localized_name + (of-object "AtkAction") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +; AtkComponent + +(define-vfunc add_focus_handler + (of-object "AtkComponent") + (return-type "guint") + (parameters + '("AtkFocusHandler" "handler") + ) +) + +(define-vfunc contains + (of-object "AtkComponent") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-vfunc ref_accessible_at_point + (of-object "AtkComponent") + (return-type "AtkObject*") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coord_type") + ) +) + + +(define-vfunc get_extents + (of-object "AtkComponent") + (return-type "void") + (parameters + '("gint*" "x") + '("gint*" "y") + '("gint*" "width") + '("gint*" "height") + '("AtkCoordType" "coord_type") + ) +) + +(define-vfunc get_position + (of-object "AtkComponent") + (return-type "void") + (parameters + '("gint*" "x") + '("gint*" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-vfunc get_size + (of-object "AtkComponent") + (return-type "void") + (parameters + '("gint*" "width") + '("gint*" "height") + ) +) + +(define-vfunc grab_focus + (of-object "AtkComponent") + (return-type "gboolean") +) + +(define-vfunc remove_focus_handler + (of-object "AtkComponent") + (return-type "void") + (parameters + '("guint" "handler_id") + ) +) + +(define-vfunc set_extents + (of-object "AtkComponent") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("AtkCoordType" "coord_type") + ) +) + +(define-vfunc set_position + (of-object "AtkComponent") + (return-type "gboolean") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coord_type") + ) +) + +(define-vfunc set_size + (of-object "AtkComponent") + (return-type "gboolean") + (parameters + '("gint" "width") + '("gint" "height") + ) +) + +(define-vfunc get_layer + (of-object "AtkComponent") + (return-type "AtkLayer") +) + +(define-vfunc get_mdi_zorder + (of-object "AtkComponent") + (return-type "gint") +) + +;; AtkDocument + +(define-vfunc get_document_type + (of-object "AtkDocument") + (return-type "const-gchar*") +) + +(define-vfunc get_document + (of-object "AtkDocument") + (return-type "gpointer") +) + +;; AtkText + +(define-vfunc get_text + (of-object "AtkText") + (return-type "gchar*") + (parameters + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-vfunc get_character_at_offset + (of-object "AtkText") + (return-type "gunichar") + (parameters + '("gint" "offset") + ) +) + +(define-vfunc get_text_after_offset + (of-object "AtkText") + (return-type "gchar*") + (parameters + '("gint" "offset") + '("AtkTextBoundary" "boundary_type") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-vfunc get_text_at_offset + (of-object "AtkText") + (return-type "gchar*") + (parameters + '("gint" "offset") + '("AtkTextBoundary" "boundary_type") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-vfunc get_text_before_offset + (of-object "AtkText") + (return-type "gchar*") + (parameters + '("gint" "offset") + '("AtkTextBoundary" "boundary_type") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-vfunc get_caret_offset + (of-object "AtkText") + (return-type "gint") +) + +(define-vfunc get_character_extents + (of-object "AtkText") + (return-type "none") + (parameters + '("gint" "offset") + '("gint*" "x") + '("gint*" "y") + '("gint*" "width") + '("gint*" "height") + '("AtkCoordType" "coords") + ) +) + +(define-vfunc get_run_attributes + (of-object "AtkText") + (return-type "AtkAttributeSet*") + (parameters + '("gint" "offset") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-vfunc get_default_attributes + (of-object "AtkText") + (return-type "AtkAttributeSet*") +) + +(define-vfunc get_character_count + (of-object "AtkText") + (return-type "gint") +) + +(define-vfunc get_offset_at_point + (of-object "AtkText") + (return-type "gint") + (parameters + '("gint" "x") + '("gint" "y") + '("AtkCoordType" "coords") + ) +) + +(define-vfunc get_n_selections + (of-object "AtkText") + (return-type "gint") +) + +(define-vfunc get_selection + (of-object "AtkText") + (return-type "gchar*") + (parameters + '("gint" "selection_num") + '("gint*" "start_offset") + '("gint*" "end_offset") + ) +) + +(define-vfunc add_selection + (of-object "AtkText") + (return-type "gboolean") + (parameters + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-vfunc remove_selection + (of-object "AtkText") + (return-type "gboolean") + (parameters + '("gint" "selection_num") + ) +) + +(define-vfunc set_selection + (of-object "AtkText") + (return-type "gboolean") + (parameters + '("gint" "selection_num") + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-vfunc set_caret_offset + (of-object "AtkText") + (return-type "gboolean") + (parameters + '("gint" "offset") + ) +) + +;; AtkEditableText + +(define-vfunc set_run_attributes + (of-object "AtkEditableText") + (return-type "gboolean") + (parameters + '("AtkAttributeSet*" "attrib_set") + '("gint" "start_offset") + '("gint" "end_offset") + ) +) + +(define-vfunc set_text_contents + (of-object "AtkEditableText") + (return-type "none") + (parameters + '("const-gchar*" "string") + ) +) + +(define-vfunc insert_text + (of-object "AtkEditableText") + (return-type "none") + (parameters + '("const-gchar*" "string") + '("gint" "length") + '("gint*" "position") + ) +) + +(define-vfunc copy_text + (of-object "AtkEditableText") + (return-type "none") + (parameters + '("gint" "start_pos") + '("gint" "end_pos") + ) +) + +(define-vfunc cut_text + (of-object "AtkEditableText") + (return-type "none") + (parameters + '("gint" "start_pos") + '("gint" "end_pos") + ) +) + +(define-vfunc delete_text + (of-object "AtkEditableText") + (return-type "none") + (parameters + '("gint" "start_pos") + '("gint" "end_pos") + ) +) + +(define-vfunc paste_text + (of-object "AtkEditableText") + (return-type "none") + (parameters + '("gint" "position") + ) +) + +;; AtkImage + +(define-vfunc set_image_description + (of-object "AtkImage") + (return-type "gboolean") + (parameters + '("const-gchar*" "description") + ) +) + +(define-vfunc get_image_description + (of-object "AtkImage") + (return-type "const-gchar*") +) + +(define-vfunc get_image_size + (of-object "AtkImage") + (return-type "void") + (parameters + '("gint*" "width") + '("gint*" "height") + ) +) + +(define-vfunc get_image_position + (of-object "AtkImage") + (return-type "void") + (parameters + '("gint*" "x") + '("gint*" "y") + '("AtkCoordType" "coord_type") + ) +) + +;; AtkImplmentor + +(define-vfunc ref_accessible + (of-object "AtkImplementor") + (return-type "AtkObject*") +) + +;; AtkSelection + +(define-vfunc add_selection + (of-object "AtkSelection") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-vfunc clear_selection + (of-object "AtkSelection") + (return-type "gboolean") +) + +(define-vfunc ref_selection + (of-object "AtkSelection") + (return-type "AtkObject*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_selection_count + (of-object "AtkSelection") + (return-type "gint") +) + +(define-vfunc is_child_selected + (of-object "AtkSelection") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-vfunc remove_selection + (of-object "AtkSelection") + (return-type "gboolean") + (parameters + '("gint" "i") + ) +) + +(define-vfunc select_all_selection + (of-object "AtkSelection") + (return-type "gboolean") +) + +;; AtkTable + +(define-vfunc ref_at + (of-object "AtkTable") + (return-type "AtkObject*") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-vfunc get_index_at + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-vfunc get_column_at_index + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint" "index_") + ) +) + +(define-vfunc get_row_at_index + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint" "index_") + ) +) + +(define-vfunc get_n_columns + (of-object "AtkTable") + (return-type "gint") +) + +(define-vfunc get_n_rows + (of-object "AtkTable") + (return-type "gint") +) + +(define-vfunc get_column_extent_at + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-vfunc get_row_extent_at + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-vfunc get_caption + (of-object "AtkTable") + (return-type "AtkObject*") +) + +(define-vfunc get_column_description + (of-object "AtkTable") + (return-type "const-gchar*") + (parameters + '("gint" "column") + ) +) + +(define-vfunc get_column_header + (of-object "AtkTable") + (return-type "AtkObject*") + (parameters + '("gint" "column") + ) +) + +(define-vfunc get_row_description + (of-object "AtkTable") + (return-type "const-gchar*") + (parameters + '("gint" "row") + ) +) + +(define-vfunc get_row_header + (of-object "AtkTable") + (return-type "AtkObject*") + (parameters + '("gint" "row") + ) +) + +(define-vfunc get_summary + (of-object "AtkTable") + (return-type "AtkObject*") +) + +(define-vfunc set_caption + (of-object "AtkTable") + (return-type "none") + (parameters + '("AtkObject*" "caption") + ) +) + +(define-vfunc set_column_description + (of-object "AtkTable") + (return-type "none") + (parameters + '("gint" "column") + '("const-gchar*" "description") + ) +) + +(define-vfunc set_column_header + (of-object "AtkTable") + (return-type "none") + (parameters + '("gint" "column") + '("AtkObject*" "header") + ) +) + +(define-vfunc set_row_description + (of-object "AtkTable") + (return-type "none") + (parameters + '("gint" "row") + '("const-gchar*" "description") + ) +) + +(define-vfunc set_row_header + (of-object "AtkTable") + (return-type "none") + (parameters + '("gint" "row") + '("AtkObject*" "header") + ) +) + +(define-vfunc set_summary + (of-object "AtkTable") + (return-type "none") + (parameters + '("AtkObject*" "accessible") + ) +) + +(define-vfunc get_selected_columns + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint**" "selected") + ) +) + +(define-vfunc get_selected_rows + (of-object "AtkTable") + (return-type "gint") + (parameters + '("gint**" "selected") + ) +) + +(define-vfunc is_column_selected + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "column") + ) +) + +(define-vfunc is_row_selected + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "row") + ) +) + +(define-vfunc is_selected + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "row") + '("gint" "column") + ) +) + +(define-vfunc add_row_selection + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "row") + ) +) + +(define-vfunc remove_row_selection + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "row") + ) +) + +(define-vfunc add_column_selection + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "column") + ) +) + +(define-vfunc remove_column_selection + (of-object "AtkTable") + (return-type "gboolean") + (parameters + '("gint" "column") + ) +) + +;; AtkValue + +(define-vfunc get_current_value + (of-object "AtkValue") + (return-type "none") + (parameters + '("GValue*" "value") + ) +) + +(define-vfunc get_maximum_value + (of-object "AtkValue") + (return-type "none") + (parameters + '("GValue*" "value") + ) +) + +(define-vfunc get_minimum_value + (of-object "AtkValue") + (return-type "none") + (parameters + '("GValue*" "value") + ) +) + +(define-vfunc set_current_value + (of-object "AtkValue") + (return-type "gboolean") + (parameters + '("const-GValue*" "value") + ) +) + +;; AtkHyperlink + +(define-vfunc get_uri + (of-object "AtkHyperlink") + (return-type "gchar*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_object + (of-object "AtkHyperlink") + (return-type "AtkObject*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_end_index + (of-object "AtkHyperlink") + (return-type "gint") +) + +(define-vfunc get_start_index + (of-object "AtkHyperlink") + (return-type "gint") +) + +(define-vfunc is_valid + (of-object "AtkHyperlink") + (return-type "gboolean") +) + +(define-vfunc get_n_anchors + (of-object "AtkHyperlink") + (return-type "gint") +) + +(define-vfunc link_state + (of-object "AtkHyperlink") + (return-type "guint") +) + +(define-vfunc is_selected_link + (of-object "AtkHyperlink") + (return-type "gboolean") +) + +;; AtkHypertext + +(define-vfunc get_link + (of-object "AtkHypertext") + (return-type "AtkHyperlink*") + (parameters + '("gint" "link_index") + ) +) + +(define-vfunc get_n_links + (of-object "AtkHypertext") + (return-type "gint") +) + +(define-vfunc get_link_index + (of-object "AtkHypertext") + (return-type "gint") + (parameters + '("gint" "char_index") + ) +) + +;; AtkStreamableContent + +(define-vfunc get_n_mime_types + (of-object "AtkStreamableContent") + (return-type "int") +) + +(define-vfunc get_mime_type + (of-object "AtkStreamableContent") + (return-type "const-gchar*") + (parameters + '("gint" "i") + ) +) + +(define-vfunc get_stream + (of-object "AtkStreamableContent") + (return-type "GIOChannel*") + (parameters + '("const-gchar*" "mime_type") + ) +) + + + + diff --git a/libs/gtkmm2/atk/src/component.ccg b/libs/gtkmm2/atk/src/component.ccg new file mode 100644 index 0000000000..0d60b145f9 --- /dev/null +++ b/libs/gtkmm2/atk/src/component.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: component.ccg,v 1.1 2003/01/21 13:37:05 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + diff --git a/libs/gtkmm2/atk/src/component.hg b/libs/gtkmm2/atk/src/component.hg new file mode 100644 index 0000000000..0d78890415 --- /dev/null +++ b/libs/gtkmm2/atk/src/component.hg @@ -0,0 +1,91 @@ +/* $Id: component.hg,v 1.5 2004/03/12 20:35:53 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(atk/atkcomponent.h) + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkComponentIface AtkComponentIface; + typedef struct _AtkObject AtkObject; + typedef void (* AtkFocusHandler) (AtkObject*, gboolean); +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +_CC_INCLUDE(atk/atk-enum-types.h) +_WRAP_ENUM(CoordType, AtkCoordType) +_WRAP_ENUM(Layer, AtkLayer) + +class Object; + + +/** The ATK interface provided by UI components which occupy a physical area on the screen. + * This should be implemented by most if not all UI elements with an actual on-screen presence, i.e. components which + * can be said to have a screen-coordinate bounding box. Virtually all widgets will need to have Atk::Component + * implementations provided for their corresponding Atk::Object class. In short, only UI elements which are *not* GUI + * elements will omit this ATK interface. + * + * A possible exception might be textual information with a transparent background, in which case text glyph bounding + * box information is provided by Atk::Text. + */ +class Component : public Glib::Interface +{ + _CLASS_INTERFACE(Component, AtkComponent, ATK_COMPONENT, AtkComponentIface) + +public: + _WRAP_METHOD(guint add_focus_handler(AtkFocusHandler handler), atk_component_add_focus_handler) + _WRAP_METHOD(bool contains(int x, int y, CoordType coord_type) const, atk_component_contains) + _WRAP_METHOD(Glib::RefPtr get_accessible_at_point(int x, int y, CoordType coord_type), atk_component_ref_accessible_at_point) + _WRAP_METHOD(void get_extents(int& x, int& y, int& width, int& height, CoordType coord_type) const, atk_component_get_extents) + _WRAP_METHOD(void get_position(int& x, int& y, CoordType coord_type) const, atk_component_get_position) + _WRAP_METHOD(void get_size(int& width, int& height) const, atk_component_get_size) + _WRAP_METHOD(Layer get_layer() const, atk_component_get_layer) + _WRAP_METHOD(int get_mdi_zorder() const, atk_component_get_mdi_zorder) + _WRAP_METHOD(bool grab_focus(), atk_component_grab_focus) + _WRAP_METHOD(void remove_focus_handler(guint handler_id), atk_component_remove_focus_handler) + _WRAP_METHOD(bool set_extents(int x, int y, int width, int height, CoordType coord_type), atk_component_set_extents) + _WRAP_METHOD(bool set_position(int x, int y, CoordType coord_type), atk_component_set_position) + _WRAP_METHOD(bool set_size(int width, int height), atk_component_set_size) + +protected: + _WRAP_VFUNC(guint add_focus_handler(AtkFocusHandler handler), add_focus_handler) + _WRAP_VFUNC(bool contains(int x, int y, CoordType coord_type) const, contains) + + _WRAP_VFUNC(Glib::RefPtr get_accessible_at_point(int x, int y, CoordType coord_type), ref_accessible_at_point, refreturn_ctype) + + _WRAP_VFUNC(void get_extents(int& x, int& y, int& width, int& height, CoordType coord_type) const, get_extents) + _WRAP_VFUNC(void get_position(int& x, int& y, CoordType coord_type) const, get_position) + _WRAP_VFUNC(void get_size(int& width, int& height) const, get_size) + _WRAP_VFUNC(Layer get_layer() const, get_layer) + _WRAP_VFUNC(int get_mdi_zorder() const, get_mdi_zorder) + _WRAP_VFUNC(bool grab_focus(), grab_focus) + _WRAP_VFUNC(void remove_focus_handler(guint handler_id), remove_focus_handler) + _WRAP_VFUNC(bool set_extents(int x, int y, int width, int height, CoordType coord_type), set_extents) + _WRAP_VFUNC(bool set_position(int x, int y, CoordType coord_type), set_position) + _WRAP_VFUNC(bool set_size(int width, int height), set_size) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/document.ccg b/libs/gtkmm2/atk/src/document.ccg new file mode 100644 index 0000000000..2a5925a1fb --- /dev/null +++ b/libs/gtkmm2/atk/src/document.ccg @@ -0,0 +1,30 @@ +// -*- c++ -*- +/* $Id: document.ccg,v 1.1 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace Atk +{ + + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/document.hg b/libs/gtkmm2/atk/src/document.hg new file mode 100644 index 0000000000..e2b7dc9d1e --- /dev/null +++ b/libs/gtkmm2/atk/src/document.hg @@ -0,0 +1,55 @@ +/* $Id: document.hg,v 1.3 2004/01/19 19:48:36 murrayc Exp $ */ + +/* Copyright (C) 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkDocumentIface AtkDocumentIface; + typedef struct _AtkDocument AtkDocument; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +namespace Atk +{ + +class Object; + +/** The ATK interface which allows access to a DOM associated with on object. + * This interface should be supported by any object that has an associated document object model (DOM). This interface + * provides the standard mechanism allowing an assistive technology access to the DOM. + */ +class Document : public Glib::Interface +{ + _CLASS_INTERFACE(Document, AtkDocument, ATK_DOCUMENT, AtkDocumentIface) +public: + + _WRAP_METHOD(Glib::ustring get_document_type() const, atk_document_get_document_type) + _WRAP_METHOD(gpointer get_document(), atk_document_get_document) + +protected: + _WRAP_VFUNC(const gchar* get_document_type(), get_document_type) + _WRAP_VFUNC(gpointer get_document() const, get_document) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/editabletext.ccg b/libs/gtkmm2/atk/src/editabletext.ccg new file mode 100644 index 0000000000..0bfd285836 --- /dev/null +++ b/libs/gtkmm2/atk/src/editabletext.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: editabletext.ccg,v 1.1 2003/01/21 13:37:05 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + diff --git a/libs/gtkmm2/atk/src/editabletext.hg b/libs/gtkmm2/atk/src/editabletext.hg new file mode 100644 index 0000000000..c47f9983f8 --- /dev/null +++ b/libs/gtkmm2/atk/src/editabletext.hg @@ -0,0 +1,67 @@ +/* $Id: editabletext.hg,v 1.2 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) + +#include + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkEditableTextIface AtkEditableTextIface; + typedef struct _AtkEditableText AtkEditableText; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +//TODO: I see no evidence that AtkEditableText is actually a subclass of AtkText, as the C docs say. murrayc. +/* The ATK interface implemented by components containing user-editable text content. + * This should be implemented by UI components which contain text which the user can edit, via the Atk::Object + * corresponding to that component (see Atk::Object). + * EditableText is a subclass of AtkText, and as such, an object which implements EditableText is by definition + * an Atk::Text implementor as well. + */ +class EditableText : public Glib::Interface +{ + _CLASS_INTERFACE(EditableText, AtkEditableText, ATK_EDITABLE_TEXT, AtkEditableTextIface) + +public: + _WRAP_METHOD(bool set_run_attributes(const AttributeSet& attrib_set, int start_offset, int end_offset), atk_editable_text_set_run_attributes) + _WRAP_METHOD(void set_text_contents(const Glib::ustring& string), atk_editable_text_set_text_contents) + _WRAP_METHOD(void insert_text(const Glib::ustring& string, int length, int& position), atk_editable_text_insert_text) + _WRAP_METHOD(void copy_text(int start_pos, int end_pos), atk_editable_text_copy_text) + _WRAP_METHOD(void cut_text(int start_pos, int end_pos), atk_editable_text_cut_text) + _WRAP_METHOD(void delete_text(int start_pos, int end_pos), atk_editable_text_delete_text) + _WRAP_METHOD(void paste_text(int position), atk_editable_text_paste_text) + +protected: + _WRAP_VFUNC(bool set_run_attributes(AtkAttributeSet* attrib_set, int start_offset, int end_offset), set_run_attributes) + _WRAP_VFUNC(void set_text_contents(const Glib::ustring& string), set_text_contents) + _WRAP_VFUNC(void insert_text(const Glib::ustring& string, int length, int& position), insert_text) + _WRAP_VFUNC(void copy_text(int start_pos, int end_pos), copy_text) + _WRAP_VFUNC(void cut_text(int start_pos, int end_pos), cut_text) + _WRAP_VFUNC(void delete_text(int start_pos, int end_pos), delete_text) + _WRAP_VFUNC(void paste_text(int position), paste_text) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/hyperlink.ccg b/libs/gtkmm2/atk/src/hyperlink.ccg new file mode 100644 index 0000000000..c7b4323264 --- /dev/null +++ b/libs/gtkmm2/atk/src/hyperlink.ccg @@ -0,0 +1,30 @@ +// -*- c++ -*- +/* $Id: hyperlink.ccg,v 1.1 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +namespace Atk +{ + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/hyperlink.hg b/libs/gtkmm2/atk/src/hyperlink.hg new file mode 100644 index 0000000000..59d961206a --- /dev/null +++ b/libs/gtkmm2/atk/src/hyperlink.hg @@ -0,0 +1,81 @@ +/* $Id: hyperlink.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */ + +/* Copyright (C) 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) +_PINCLUDE(atk/atkobject.h) + + +namespace Atk +{ + +class Object; + +/* An ATK object which encapsulates a link or set of links in a hypertext document. + * It implements the AtkAction interface. + */ +class Hyperlink + : public Glib::Object, + public Atk::Action +{ + _CLASS_GOBJECT(Hyperlink, AtkHyperlink, ATK_HYPERLINK, Glib::Object, GObject) + _IMPLEMENTS_INTERFACE(Action) + +protected: + +public: + + _WRAP_METHOD(Glib::ustring get_uri(int i) const, atk_hyperlink_get_uri) + + _WRAP_METHOD(Glib::RefPtr get_object(int i), atk_hyperlink_get_object, refreturn) + _WRAP_METHOD(Glib::RefPtr get_object(int i) const, atk_hyperlink_get_object, refreturn, constversion) + + _WRAP_METHOD(int get_end_index() const, atk_hyperlink_get_end_index) + + _WRAP_METHOD(int get_start_index() const, atk_hyperlink_get_start_index) + + _WRAP_METHOD(bool is_valid() const, atk_hyperlink_is_valid) + + _WRAP_METHOD(bool is_inline() const, atk_hyperlink_is_inline) + + _WRAP_METHOD(int get_n_anchors() const, atk_hyperlink_get_n_anchors) + _WRAP_METHOD(bool is_selected_link() const, atk_hyperlink_is_selected_link) + + _WRAP_SIGNAL(void link_activated(), "link_activated") + + _WRAP_PROPERTY("selected-link", bool) + _WRAP_PROPERTY("number-of-anchors", int) + _WRAP_PROPERTY("end-index", int) + _WRAP_PROPERTY("start-index", int) + +protected: + _WRAP_VFUNC(gchar* get_uri(int i) const, get_uri) + _WRAP_VFUNC(Glib::RefPtr get_object(int i), get_object) + _WRAP_VFUNC(int get_end_index() const, get_end_index) + _WRAP_VFUNC(int get_start_index() const, get_start_index) + _WRAP_VFUNC(bool is_valid() const, is_valid) + _WRAP_VFUNC(int get_n_anchors() const, get_n_anchors) + _WRAP_VFUNC(guint link_state() const, link_state) + _WRAP_VFUNC(bool is_selected_link() const, is_selected_link) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/hypertext.ccg b/libs/gtkmm2/atk/src/hypertext.ccg new file mode 100644 index 0000000000..3b2219556e --- /dev/null +++ b/libs/gtkmm2/atk/src/hypertext.ccg @@ -0,0 +1,30 @@ +// -*- c++ -*- +/* $Id: hypertext.ccg,v 1.1 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace Atk +{ + + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/hypertext.hg b/libs/gtkmm2/atk/src/hypertext.hg new file mode 100644 index 0000000000..315730143e --- /dev/null +++ b/libs/gtkmm2/atk/src/hypertext.hg @@ -0,0 +1,61 @@ +/* $Id: hypertext.hg,v 1.3 2006/04/12 11:11:24 murrayc Exp $ */ + +/* Copyright (C) 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + +#include + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkHypertextIface AtkHypertextIface; + typedef struct _AtkHypertext AtkHypertext; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +/** The ATK interface which provides standard mechanism for manipulating hyperlinks. + */ +namespace Atk +{ + +class Object; + + +class Hypertext : public Glib::Interface +{ + _CLASS_INTERFACE(Hypertext, AtkHypertext, ATK_HYPERTEXT, AtkHypertextIface) +public: + + _WRAP_METHOD(Glib::RefPtr get_link(int link_index), atk_hypertext_get_link) + _WRAP_METHOD(Glib::RefPtr get_link(int link_index) const, atk_hypertext_get_link, constversion) + _WRAP_METHOD(int get_n_links() const, atk_hypertext_get_n_links) + _WRAP_METHOD(int get_link_index(int char_index) const, atk_hypertext_get_link_index) + + _WRAP_SIGNAL(void link_selected(int link_index), "link_selected") + +#m4 _CONVERSION(`Glib::RefPtr',`AtkHyperlink*',`Glib::unwrap($3)') + _WRAP_VFUNC(Glib::RefPtr get_link(int link_index), get_link) + _WRAP_VFUNC(int get_n_links() const, get_n_links) + _WRAP_VFUNC(int get_link_index(int char_index) const, get_link_index) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/image.ccg b/libs/gtkmm2/atk/src/image.ccg new file mode 100644 index 0000000000..f3110292b6 --- /dev/null +++ b/libs/gtkmm2/atk/src/image.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: image.ccg,v 1.1 2003/01/21 13:37:05 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + diff --git a/libs/gtkmm2/atk/src/image.hg b/libs/gtkmm2/atk/src/image.hg new file mode 100644 index 0000000000..eab8e1e740 --- /dev/null +++ b/libs/gtkmm2/atk/src/image.hg @@ -0,0 +1,66 @@ +/* $Id: image.hg,v 1.2 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(atk/atkimage.h) + +#include /* for Atk::CoordType */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkImageIface AtkImageIface; + typedef struct _AtkImage AtkImage; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +/** The ATK Interface implemented by components which expose image or pixmap content on-screen. + * This should be implemented by Atk::Object subtypes on behalf of components which display image/pixmap information + * onscreen, and which provide information (other than just widget borders, etc.) via that image content. For instance, + * icons, buttons with icons, toolbar elements, and image viewing panes typically should implement AtkImage. + * + * Atk::Image primarily provides two types of information: coordinate information (useful for screen review mode of + * screenreaders, and for use by onscreen magnifiers), and descriptive information. The descriptive information is + * provided for alternative, text-only presentation of the most significant information present in the image. + */ +class Image : public Glib::Interface +{ + _CLASS_INTERFACE(Image, AtkImage, ATK_IMAGE, AtkImageIface) + +public: + _WRAP_METHOD(bool set_image_description(const Glib::ustring& description), atk_image_set_image_description) + _WRAP_METHOD(Glib::ustring get_image_description() const, atk_image_get_image_description) + + _WRAP_METHOD(void get_image_size(int& width, int& height) const, atk_image_get_image_size) + _WRAP_METHOD(void get_image_position(int& x, int& y, CoordType coord_type) const, atk_image_get_image_position) + +protected: + _WRAP_VFUNC(bool set_image_description(const Glib::ustring& description), set_image_description) + _WRAP_VFUNC(const char* get_image_description() const, get_image_description) + + _WRAP_VFUNC(void get_image_position(int& x, int& y, CoordType coord_type) const, get_image_position) + _WRAP_VFUNC(void get_image_size(int& width, int& height) const, get_image_size) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/implementor.ccg b/libs/gtkmm2/atk/src/implementor.ccg new file mode 100644 index 0000000000..7fe9b5635e --- /dev/null +++ b/libs/gtkmm2/atk/src/implementor.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: implementor.ccg,v 1.1 2004/04/11 21:00:53 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + diff --git a/libs/gtkmm2/atk/src/implementor.hg b/libs/gtkmm2/atk/src/implementor.hg new file mode 100644 index 0000000000..9e892a0f67 --- /dev/null +++ b/libs/gtkmm2/atk/src/implementor.hg @@ -0,0 +1,45 @@ +/* $Id: implementor.hg,v 1.1 2004/04/11 21:00:53 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) + +#include + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkImplementorIface AtkImplementorIface; + typedef struct _AtkImplementor AtkImplementor; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +class Implementor : public Glib::Interface +{ + _CLASS_INTERFACE(Implementor, AtkImplementor, ATK_IMPLEMENTOR, AtkImplementorIface) + +protected: + _WRAP_VFUNC(Glib::RefPtr ref_accessibile(), ref_accessible, refreturn) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/noopobject.ccg b/libs/gtkmm2/atk/src/noopobject.ccg new file mode 100644 index 0000000000..86e45a5387 --- /dev/null +++ b/libs/gtkmm2/atk/src/noopobject.ccg @@ -0,0 +1,22 @@ +// -*- c++ -*- +/* $Id: noopobject.ccg,v 1.1 2003/01/21 13:37:06 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + diff --git a/libs/gtkmm2/atk/src/noopobject.hg b/libs/gtkmm2/atk/src/noopobject.hg new file mode 100644 index 0000000000..ce1cf9653d --- /dev/null +++ b/libs/gtkmm2/atk/src/noopobject.hg @@ -0,0 +1,71 @@ +/* $Id: noopobject.hg,v 1.2 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +_DEFS(atkmm,atk) +_PINCLUDE(atkmm/private/object_p.h) + + +namespace Atk +{ + +/** An Atk::NoOpObject is an Atk::Object which purports to implement all ATK interfaces. + * It is the type of Atk::Object which is created if an accessible object is requested for an object type for which no + * factory type is specified. + */ +class NoOpObject +: + public Atk::Object, + public Atk::Component, + public Atk::Action, + public Atk::EditableText, + public Atk::Image, + public Atk::Selection, + public Atk::Table, + public Atk::Text, + public Atk::Hypertext, + public Atk::Value +{ + _CLASS_GOBJECT(NoOpObject, AtkNoOpObject, ATK_NO_OP_OBJECT, Atk::Object, AtkObject) + _IMPLEMENTS_INTERFACE(Component) + _IMPLEMENTS_INTERFACE(Action) + _IMPLEMENTS_INTERFACE(EditableText) + _IMPLEMENTS_INTERFACE(Image) + _IMPLEMENTS_INTERFACE(Selection) + _IMPLEMENTS_INTERFACE(Table) + _IMPLEMENTS_INTERFACE(Text) + _IMPLEMENTS_INTERFACE(Hypertext) + _IMPLEMENTS_INTERFACE(Value) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS + friend class Atk::Object_Class; +#endif +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/object.ccg b/libs/gtkmm2/atk/src/object.ccg new file mode 100644 index 0000000000..2ddfcb8046 --- /dev/null +++ b/libs/gtkmm2/atk/src/object.ccg @@ -0,0 +1,61 @@ +// -*- c++ -*- +/* $Id: object.ccg,v 1.1 2003/01/21 13:37:06 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include + + +namespace Atk +{ + +/* AtkObject is actually an abstract base class. So if this wrap_new() + * function is called, it means that no wrapper exists for the real C object. + * The problem is that gail (the real accessibility implementation) is + * currently not wrapped and will probably never be. Therefore, code like + * in the following example is doomed to fail: + * + * Gtk::Image image ("icon.png"); + * Glib::RefPtr accessible = Glib::RefPtr::cast_dynamic(image.get_accessible()); + * accessible->set_image_description("my icon"); + * + * This would segfault, even though the accessible object _does_ implement + * AtkImage. But Atk::Image is an interface class that can't be instantiated + * as is. It needs an object. + * + * The solution is to instantiate a dummy object that implements all of the + * ATK interfaces. Fortunately, ATK already provides us with such a thing, + * AtkNoOpObject. All widget accessible objects are of this type if the gail + * module is not loaded (which is the default). + * + * So what we do here is abusing Atk::NoOpObject to get around the lack of + * C++ wrappers for gail. Instead of instantiating a useless instance of an + * abstract base class, we just create a Atk::NoOpObject instance which can + * be casted to any of the Atk interface classes. + */ +Glib::ObjectBase* Object_Class::wrap_new(GObject* object) +{ + return new Atk::NoOpObject((AtkNoOpObject*) object); +} + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/object.hg b/libs/gtkmm2/atk/src/object.hg new file mode 100644 index 0000000000..a1f42883b2 --- /dev/null +++ b/libs/gtkmm2/atk/src/object.hg @@ -0,0 +1,105 @@ +/* $Id: object.hg,v 1.5 2004/11/30 21:41:44 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + +#include +#include + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { typedef struct _AtkPropertyValues AtkPropertyValues; } +#endif + + +namespace Atk +{ + +_CC_INCLUDE(atk/atk-enum-types.h) +_WRAP_ENUM(Role, AtkRole) + +class RelationSet; +class Relation; +class StateSet; + +typedef guint64 State; + +/** The base object class for the Accessibility Toolkit API. + * This class is the primary class for accessibility support via the Accessibility ToolKit (ATK). Objects which are + * instances of Atk::Object (or instances of Atk::Object-derived types) are queried for properties which relate basic + * (and generic) properties of a UI component such as name and description. Instances of Atk::Object may also be queried + * as to whether they implement other ATK interfaces (e.g. Atk::Action, Atk::Component, etc.), as appropriate to the role + * which a given UI component plays in a user interface. + * + * All UI components in an application which provide useful information or services to the user must provide corresponding + * Atk::Object instances on request (in GTK+, for instance, usually on a call to Gtk::Widget::get_accessible()), either via + * ATK support built into the toolkit for the widget class or ancestor class, or in the case of custom widgets, if the + * inherited Atk::Object implementation is insufficient, via instances of a new Atk::Object subclass. + */ +class Object : public Glib::Object +{ + _CLASS_GOBJECT(Object, AtkObject, ATK_OBJECT, Glib::Object, GObject) + _CUSTOM_WRAP_NEW() // see wrap_new() implementation in object.ccg + _IGNORE(atk_object_initialize, atk_object_get_layer, atk_object_get_mdi_zorder) +public: + + _WRAP_METHOD(Glib::ustring get_name() const, atk_object_get_name) + _WRAP_METHOD(Glib::ustring get_description() const, atk_object_get_description) + _WRAP_METHOD(Glib::RefPtr get_parent(), atk_object_get_parent, refreturn) + _WRAP_METHOD(int get_n_accessible_children() const, atk_object_get_n_accessible_children) + _WRAP_METHOD(Glib::RefPtr get_accessible_child(int i), atk_object_ref_accessible_child) + _WRAP_METHOD(Glib::RefPtr get_relation_set(), atk_object_ref_relation_set, refreturn) + _WRAP_METHOD(Role get_role() const, atk_object_get_role) + _WRAP_METHOD(Glib::RefPtr get_state_set(), atk_object_ref_state_set) + _WRAP_METHOD(int get_index_in_parent(), atk_object_get_index_in_parent) + _WRAP_METHOD(void set_name(const Glib::ustring& name), atk_object_set_name) + _WRAP_METHOD(void set_description(const Glib::ustring& description), atk_object_set_description) + _WRAP_METHOD(void set_parent(const Glib::RefPtr& parent), atk_object_set_parent) + _WRAP_METHOD(void set_role(Role role), atk_object_set_role) + //_WRAP_METHOD(guint connect_property_change_handler(AtkPropertyChangeHandler* handler), atk_object_connect_property_change_handler) + //_WRAP_METHOD(void remove_property_change_handler(guint handler_id), atk_object_remove_property_change_handler) + _WRAP_METHOD(void notify_state_change(State state, bool value), atk_object_notify_state_change) + + _WRAP_METHOD(bool add_relationship(RelationType relationship, const Glib::RefPtr& target), atk_object_add_relationship) + _WRAP_METHOD(bool remove_relationship(RelationType relationship, const Glib::RefPtr& target), atk_object_remove_relationship) + + _WRAP_SIGNAL(void children_changed(guint change_index, gpointer changed_child), "children_changed") + _WRAP_SIGNAL(void focus_event(bool focus_in), "focus_event") + _WRAP_SIGNAL(void property_change(AtkPropertyValues* values), "property_change") + _WRAP_SIGNAL(void state_change(const Glib::ustring& name, bool state_set), "state_change") + _WRAP_SIGNAL(void visible_data_changed(), "visible_data_changed") + _WRAP_SIGNAL(void active_descendant_changed(void** child), "active_descendant_changed") + + _WRAP_PROPERTY("accessible-name", Glib::ustring) + _WRAP_PROPERTY("accessible-description", Glib::ustring) + _WRAP_PROPERTY("accessible-parent", Glib::RefPtr) + _WRAP_PROPERTY("accessible-value", double) + _WRAP_PROPERTY("accessible-role", int) + _WRAP_PROPERTY("accessible-component-layer", int) + _WRAP_PROPERTY("accessible-component-mdi-zorder", int) + _WRAP_PROPERTY("accessible-table-caption", Glib::ustring) + _WRAP_PROPERTY("accessible-table-column-description", Glib::ustring) + _WRAP_PROPERTY("accessible-table-column-header", Glib::RefPtr) + _WRAP_PROPERTY("accessible-table-row-description", Glib::ustring) + _WRAP_PROPERTY("accessible-table-row-header", Glib::RefPtr) + _WRAP_PROPERTY("accessible-table-summary", Glib::RefPtr) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/objectaccessible.ccg b/libs/gtkmm2/atk/src/objectaccessible.ccg new file mode 100644 index 0000000000..4a08c0e321 --- /dev/null +++ b/libs/gtkmm2/atk/src/objectaccessible.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: objectaccessible.ccg,v 1.1 2003/01/21 13:37:06 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include \ No newline at end of file diff --git a/libs/gtkmm2/atk/src/objectaccessible.hg b/libs/gtkmm2/atk/src/objectaccessible.hg new file mode 100644 index 0000000000..c6cd3f8410 --- /dev/null +++ b/libs/gtkmm2/atk/src/objectaccessible.hg @@ -0,0 +1,46 @@ +/* $Id: objectaccessible.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + + +_DEFS(atkmm,atk) +_PINCLUDE(atkmm/private/object_p.h) + +namespace Atk +{ + +/** This object class is derived from AtkObject and can be used as a basis implementing accessible objects. + * This can be used as a basis for implementing accessible objects for Glib::Objects which are not derived from + * Gtk::Widget. One example of its use is in providing an accessible object for GnomeCanvasItem in the GAIL library. + */ +class ObjectAccessible : public Atk::Object +{ + _CLASS_GOBJECT(ObjectAccessible, AtkGObjectAccessible, ATK_GOBJECT_ACCESSIBLE, Atk::Object, AtkObject) +protected: + + _WRAP_METHOD(Glib::RefPtr get_object(), atk_gobject_accessible_get_object, refreturn) + _WRAP_METHOD(Glib::RefPtr get_object() const, atk_gobject_accessible_get_object, refreturn, constversion) + + _WRAP_METHOD(static Glib::RefPtr for_object(const Glib::RefPtr& obj), atk_gobject_accessible_for_object, refreturn) + _WRAP_METHOD(static Glib::RefPtr for_object(const Glib::RefPtr& obj), atk_gobject_accessible_for_object, refreturn) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/relation.ccg b/libs/gtkmm2/atk/src/relation.ccg new file mode 100644 index 0000000000..b0a5e05718 --- /dev/null +++ b/libs/gtkmm2/atk/src/relation.ccg @@ -0,0 +1,54 @@ +// -*- c++ -*- +/* $Id: relation.ccg,v 1.2 2003/09/30 14:28:09 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +namespace Atk +{ + +//TODO: Implement this with the new GValue array thingy. See bug #74246. +Relation::Relation(const Glib::ArrayHandle< Glib::RefPtr >& targets, + RelationType relationship) +: + Glib::Object((GObject*) atk_relation_new(const_cast(targets.data()), targets.size(), + (AtkRelationType) relationship)) +{} + +Glib::ArrayHandle< Glib::RefPtr > Relation::get_target() +{ + GPtrArray *const parray = atk_relation_get_target(gobj()); + + return Glib::ArrayHandle< Glib::RefPtr > + (reinterpret_cast(parray->pdata), parray->len, Glib::OWNERSHIP_NONE); +} + +Glib::ArrayHandle< Glib::RefPtr > Relation::get_target() const +{ + GPtrArray *const parray = atk_relation_get_target(const_cast(gobj())); + + return Glib::ArrayHandle< Glib::RefPtr > + (reinterpret_cast(parray->pdata), parray->len, Glib::OWNERSHIP_NONE); +} + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/relation.hg b/libs/gtkmm2/atk/src/relation.hg new file mode 100644 index 0000000000..f6e386cf29 --- /dev/null +++ b/libs/gtkmm2/atk/src/relation.hg @@ -0,0 +1,59 @@ +/* $Id: relation.hg,v 1.3 2005/01/05 18:21:30 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Atk +{ + +_CC_INCLUDE(atk/atk-enum-types.h) +_WRAP_ENUM(RelationType, AtkRelationType) + +class Object; + +/** An Atk::Relation describes a relation between an object and one or more other objects. + * The actual relations that an object has with other objects are defined as an Atk::RelationSet, + * which is a set of Atk::Relations. + */ +class Relation : public Glib::Object +{ + _CLASS_GOBJECT(Relation, AtkRelation, ATK_RELATION, Glib::Object, GObject) + +protected: + explicit Relation(const Glib::ArrayHandle< Glib::RefPtr >& targets, + RelationType relationship); + +public: + _WRAP_CREATE(const Glib::ArrayHandle< Glib::RefPtr >& targets, + RelationType relationship = RELATION_NULL) + + _WRAP_METHOD(RelationType get_relation_type() const, atk_relation_get_relation_type) + + Glib::ArrayHandle< Glib::RefPtr > get_target(); + Glib::ArrayHandle< Glib::RefPtr > get_target() const; + _IGNORE(atk_relation_get_target) + + _WRAP_METHOD(void add_target(const Glib::RefPtr& target), atk_relation_add_target) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/relationset.ccg b/libs/gtkmm2/atk/src/relationset.ccg new file mode 100644 index 0000000000..ed7a849510 --- /dev/null +++ b/libs/gtkmm2/atk/src/relationset.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: relationset.ccg,v 1.1 2003/01/21 13:37:06 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + diff --git a/libs/gtkmm2/atk/src/relationset.hg b/libs/gtkmm2/atk/src/relationset.hg new file mode 100644 index 0000000000..563870995b --- /dev/null +++ b/libs/gtkmm2/atk/src/relationset.hg @@ -0,0 +1,52 @@ +/* $Id: relationset.hg,v 1.3 2005/01/05 18:21:30 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +#include +#include + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + +namespace Atk +{ + +/** A set of Atk::Relations, normally the set of AtkRelations which an Atk::Object has. + */ +class RelationSet : public Glib::Object +{ + _CLASS_GOBJECT(RelationSet, AtkRelationSet, ATK_RELATION_SET, Glib::Object, GObject) +protected: + _CTOR_DEFAULT + +public: + _WRAP_CREATE() + + _WRAP_METHOD(bool set_contains(RelationType relationship), atk_relation_set_contains) + _WRAP_METHOD(void set_remove(const Glib::RefPtr& relation), atk_relation_set_remove) + _WRAP_METHOD(void set_add(const Glib::RefPtr& relation), atk_relation_set_add) + _WRAP_METHOD(int get_n_relations() const, atk_relation_set_get_n_relations) + _WRAP_METHOD(Glib::RefPtr get_relation(gint i), atk_relation_set_get_relation, refreturn) + _WRAP_METHOD(Glib::RefPtr get_relation(RelationType relationship), atk_relation_set_get_relation_by_type, refreturn) + + _WRAP_METHOD(void add_relation_by_type(RelationType relationship, const Glib::RefPtr& target), atk_relation_set_add_relation_by_type) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/selection.ccg b/libs/gtkmm2/atk/src/selection.ccg new file mode 100644 index 0000000000..7509443f41 --- /dev/null +++ b/libs/gtkmm2/atk/src/selection.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: selection.ccg,v 1.1 2003/01/21 13:37:07 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + diff --git a/libs/gtkmm2/atk/src/selection.hg b/libs/gtkmm2/atk/src/selection.hg new file mode 100644 index 0000000000..3da815e24a --- /dev/null +++ b/libs/gtkmm2/atk/src/selection.hg @@ -0,0 +1,71 @@ +/* $Id: selection.hg,v 1.2 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(atk/atkobject.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkSelectionIface AtkSelectionIface; + typedef struct _AtkSelection AtkSelection; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +class Object; + +/** The ATK interface implemented by container objects whose Atk::Object children can be selected. + * This should be implemented by UI components with children which are exposed by Atk::Object::ref_child and + * Atk::Object::get_n_children, if the use of the parent UI component ordinarily involves selection of one or + * more of the objects corresponding to those AtkObject children - for example, selectable lists. + * + * Note that other types of "selection" (for instance text selection) are accomplished a other ATK interfaces - + * Atk::Selection is limited to the selection/deselection of children. + */ +class Selection : public Glib::Interface +{ + _CLASS_INTERFACE(Selection, AtkSelection, ATK_SELECTION, AtkSelectionIface) + +public: + _WRAP_METHOD(bool add_selection(int i), atk_selection_add_selection) + _WRAP_METHOD(bool clear_selection(), atk_selection_clear_selection) + _WRAP_METHOD(Glib::RefPtr get_selection(int i), atk_selection_ref_selection) + _WRAP_METHOD(int get_selection_count() const, atk_selection_get_selection_count) + _WRAP_METHOD(bool is_child_selected(int i) const, atk_selection_is_child_selected) + _WRAP_METHOD(bool remove_selection(int i), atk_selection_remove_selection) + _WRAP_METHOD(bool select_all_selection(), atk_selection_select_all_selection) + + _WRAP_SIGNAL(void selection_changed(), "selection_changed") + +protected: + _WRAP_VFUNC(bool add_selection(int i), add_selection) + _WRAP_VFUNC(bool clear_selection(), clear_selection) + _WRAP_VFUNC(Glib::RefPtr get_selection(int i), ref_selection, refreturn_ctype) + _WRAP_VFUNC(int get_selection_count() const, get_selection_count) + _WRAP_VFUNC(bool is_child_selected(int i) const, is_child_selected) + _WRAP_VFUNC(bool remove_selection(int i), remove_selection) + _WRAP_VFUNC(bool select_all_selection(), select_all_selection) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/stateset.ccg b/libs/gtkmm2/atk/src/stateset.ccg new file mode 100644 index 0000000000..4b03b7f647 --- /dev/null +++ b/libs/gtkmm2/atk/src/stateset.ccg @@ -0,0 +1,40 @@ +// -*- c++ -*- +/* $Id: stateset.ccg,v 1.1 2003/01/21 13:37:07 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace Atk +{ + +void StateSet::add_states(const Glib::ArrayHandle& types) +{ + atk_state_set_add_states(gobj(), (AtkStateType*) types.data(), types.size()); +} + +bool StateSet::contains_states(const Glib::ArrayHandle& types) const +{ + return atk_state_set_contains_states( + const_cast(gobj()), (AtkStateType*) types.data(), types.size()); +} + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/stateset.hg b/libs/gtkmm2/atk/src/stateset.hg new file mode 100644 index 0000000000..2660d44424 --- /dev/null +++ b/libs/gtkmm2/atk/src/stateset.hg @@ -0,0 +1,60 @@ +/* $Id: stateset.hg,v 1.3 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Atk +{ + +_CC_INCLUDE(atk/atk-enum-types.h) +_WRAP_ENUM(StateType, AtkStateType) + +/** An AtkStateSet determines a component's state set. + * It is composed of a set of Atk::States. + */ +class StateSet : public Glib::Object +{ + _CLASS_GOBJECT(StateSet, AtkStateSet, ATK_STATE_SET, Glib::Object, GObject) + +protected: + _CTOR_DEFAULT() + +public: + _WRAP_CREATE() + + _WRAP_METHOD(bool is_empty() const, atk_state_set_is_empty) + + //Note that we use Atk::StateType instead of StateType, because there is a Gtk::StateType too, and Doxygen gets confused. + _WRAP_METHOD(bool add_state(Atk::StateType type), atk_state_set_add_state) + void add_states(const Glib::ArrayHandle& types); + _IGNORE(atk_state_set_add_states) + _WRAP_METHOD(void clear_states(),atk_state_set_clear_states) + _WRAP_METHOD(bool contains_state(Atk::StateType type), atk_state_set_contains_state) + bool contains_states(const Glib::ArrayHandle& types) const; + _IGNORE(atk_state_set_contains_states) + _WRAP_METHOD(bool remove_state(Atk::StateType type), atk_state_set_remove_state) + _WRAP_METHOD(Glib::RefPtr and_sets(const Glib::RefPtr& compare_set), atk_state_set_and_sets) + _WRAP_METHOD(Glib::RefPtr or_sets(const Glib::RefPtr& compare_set), atk_state_set_or_sets) + _WRAP_METHOD(Glib::RefPtr xor_sets(const Glib::RefPtr& compare_set), atk_state_set_xor_sets) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/streamablecontent.ccg b/libs/gtkmm2/atk/src/streamablecontent.ccg new file mode 100644 index 0000000000..569dd6fe5f --- /dev/null +++ b/libs/gtkmm2/atk/src/streamablecontent.ccg @@ -0,0 +1,30 @@ +// -*- c++ -*- +/* $Id: streamablecontent.ccg,v 1.1 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace Atk +{ + + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/streamablecontent.hg b/libs/gtkmm2/atk/src/streamablecontent.hg new file mode 100644 index 0000000000..bd41801aa8 --- /dev/null +++ b/libs/gtkmm2/atk/src/streamablecontent.hg @@ -0,0 +1,56 @@ +/* $Id: streamablecontent.hg,v 1.3 2004/01/19 19:48:36 murrayc Exp $ */ + +/* Copyright (C) 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + +_DEFS(atkmm,atk) +_PINCLUDE(glibmm/private/object_p.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkStreamableContentIface AtkStreamableContentIface; + typedef struct _AtkStreamableContent AtkStreamableContent; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +class Object; + +/** The ATK interface which provides access to streamable content. + */ +class StreamableContent : public Glib::Interface +{ + _CLASS_INTERFACE(StreamableContent, AtkStreamableContent, ATK_STREAMABLE_CONTENT, AtkStreamableContentIface) +public: + + _WRAP_METHOD(int get_n_mime_types() const, atk_streamable_content_get_n_mime_types) + _WRAP_METHOD(Glib::ustring get_mime_type(int i) const, atk_streamable_content_get_mime_type) + _WRAP_METHOD(Glib::RefPtr get_stream(const Glib::ustring& mime_type), atk_streamable_content_get_stream) + +protected: + _WRAP_VFUNC(int get_n_mime_types() const, get_n_mime_types) + _WRAP_VFUNC(const gchar* get_mime_type(int i) const, get_mime_type) + _WRAP_VFUNC(GIOChannel* get_stream(const Glib::ustring& mime_type), get_stream) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/table.ccg b/libs/gtkmm2/atk/src/table.ccg new file mode 100644 index 0000000000..b6f5c9a220 --- /dev/null +++ b/libs/gtkmm2/atk/src/table.ccg @@ -0,0 +1,45 @@ +// -*- c++ -*- +/* $Id: table.ccg,v 1.1 2003/01/21 13:37:07 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace Atk +{ + +Glib::ArrayHandle Table::get_selected_columns() const +{ + int* selected = 0; + const int n_selected = atk_table_get_selected_columns(const_cast(gobj()), &selected); + + return Glib::ArrayHandle(selected, n_selected, Glib::OWNERSHIP_SHALLOW); +} + +Glib::ArrayHandle Table::get_selected_rows() const +{ + int* selected = 0; + const int n_selected = atk_table_get_selected_rows(const_cast(gobj()), &selected); + + return Glib::ArrayHandle(selected, n_selected, Glib::OWNERSHIP_SHALLOW); +} + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/table.hg b/libs/gtkmm2/atk/src/table.hg new file mode 100644 index 0000000000..6d4032493b --- /dev/null +++ b/libs/gtkmm2/atk/src/table.hg @@ -0,0 +1,142 @@ +/* $Id: table.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) +_PINCLUDE(atk/atkobject.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkTableIface AtkTableIface; + typedef struct _AtkTable AtkTable; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +class Object; + +/** The ATK interface implemented for UI components which contain tabular or row/column information. + * This should be implemented by components which present elements ordered via rows and columns. It may also be used to + * present tree-structured information if the nodes of the trees can be said to contain multiple "columns". Individual + * elements of an Atk::Table are typically referred to as "cells", and these cells are exposed by Atk::Table as child + * Atk::Objects of the Atk::Table. Both row/column and child-index-based access to these children is provided. + * + * Children of Atk::Table are frequently "lightweight" objects, that is, they may not have backing widgets in the host UI + * toolkit. They are therefore often transient. + * + * Since tables are often very complex, Atk::Table includes provision for offering simplified summary information, as + * well as row and column headers and captions. Headers and captions are AtkObjects which may implement other interfaces + * (Atk::Text, Atk::Image, etc.) as appropriate. Atk::Table summaries may themselves be (simplified) Atk::Tables, etc. + */ +class Table : public Glib::Interface +{ + _CLASS_INTERFACE(Table, AtkTable, ATK_TABLE, AtkTableIface) + +public: + _WRAP_METHOD(Glib::RefPtr get_at(int row, int column), atk_table_ref_at) + _WRAP_METHOD(int get_index_at(int row, int column) const, atk_table_get_index_at) + _WRAP_METHOD(int get_column_at_index(int index) const, atk_table_get_column_at_index) + _WRAP_METHOD(int get_row_at_index(int index) const, atk_table_get_row_at_index) + _WRAP_METHOD(int get_n_columns() const, atk_table_get_n_columns) + _WRAP_METHOD(int get_n_rows() const, atk_table_get_n_rows) + _WRAP_METHOD(int get_column_extent_at(int row, int column) const, atk_table_get_column_extent_at) + _WRAP_METHOD(int get_row_extent_at(int row, int column) const, atk_table_get_row_extent_at) + + _WRAP_METHOD(Glib::RefPtr get_caption(), atk_table_get_caption, refreturn) + _WRAP_METHOD(Glib::RefPtr get_caption() const, atk_table_get_caption, refreturn, constversion) + + _WRAP_METHOD(Glib::ustring get_column_description(int column) const, atk_table_get_column_description) + + _WRAP_METHOD(Glib::RefPtr get_column_header(int column), atk_table_get_column_header, refreturn) + _WRAP_METHOD(Glib::RefPtr get_column_header(int column) const, atk_table_get_column_header, refreturn, constversion) + + + _WRAP_METHOD(Glib::ustring get_row_description(int row) const, atk_table_get_row_description) + + _WRAP_METHOD(Glib::RefPtr get_row_header(int row), atk_table_get_row_header, refreturn) + _WRAP_METHOD(Glib::RefPtr get_row_header(int row) const, atk_table_get_row_header, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_summary(), atk_table_get_summary, refreturn) + _WRAP_METHOD(Glib::RefPtr get_summary() const, atk_table_get_summary, refreturn, constversion) + + _WRAP_METHOD(void set_caption(const Glib::RefPtr& caption), atk_table_set_caption) + _WRAP_METHOD(void set_column_description(int column, const Glib::ustring& description), atk_table_set_column_description) + _WRAP_METHOD(void set_column_header(int column, const Glib::RefPtr& header), atk_table_set_column_header) + _WRAP_METHOD(void set_row_description(int row, const Glib::ustring& description), atk_table_set_row_description) + _WRAP_METHOD(void set_row_header(int row, const Glib::RefPtr& header), atk_table_set_row_header) + _WRAP_METHOD(void set_summary(const Glib::RefPtr& accessible), atk_table_set_summary) + + _IGNORE(atk_table_get_selected_columns, atk_table_get_selected_rows) + Glib::ArrayHandle get_selected_columns() const; + Glib::ArrayHandle get_selected_rows() const; + + _WRAP_METHOD(bool is_column_selected(int column) const, atk_table_is_column_selected) + _WRAP_METHOD(bool is_row_selected(int row) const, atk_table_is_row_selected) + _WRAP_METHOD(bool is_selected(int row, int column) const, atk_table_is_selected) + _WRAP_METHOD(bool add_row_selection(int row), atk_table_add_row_selection) + _WRAP_METHOD(bool remove_row_selection(int row), atk_table_remove_row_selection) + _WRAP_METHOD(bool add_column_selection(int column), atk_table_add_column_selection) + _WRAP_METHOD(bool remove_column_selection(int column), atk_table_remove_column_selection) + + _WRAP_SIGNAL(void row_inserted(int row, int num_inserted), "row_inserted") + _WRAP_SIGNAL(void column_inserted(int column, int num_inserted), "column_inserted") + _WRAP_SIGNAL(void row_deleted(int row, int num_deleted), "row_deleted") + _WRAP_SIGNAL(void column_deleted(int column, int num_deleted), "column_deleted") + _WRAP_SIGNAL(void row_reordered(), "row_reordered") + _WRAP_SIGNAL(void column_reordered(), "column_reordered") + _WRAP_SIGNAL(void model_changed(), "model_changed") + +protected: +#m4 _CONVERSION(`AtkObject*',`const Glib::RefPtr&',`Glib::wrap($3, true)') + _WRAP_VFUNC(Glib::RefPtr get_at(int row, int column), ref_at, refreturn_ctype) + _WRAP_VFUNC(int get_index_at(int row, int column) const, get_index_at) + _WRAP_VFUNC(int get_column_at_index(int index) const, get_column_at_index) + _WRAP_VFUNC(int get_row_at_index(int index) const, get_row_at_index) + _WRAP_VFUNC(int get_n_columns() const, get_n_columns) + _WRAP_VFUNC(int get_n_rows() const, get_n_rows) + _WRAP_VFUNC(int get_column_extent_at(int row, int column) const, get_column_extent_at) + _WRAP_VFUNC(int get_row_extent_at(int row, int column) const, get_row_extent_at) + _WRAP_VFUNC(Glib::RefPtr get_caption(), get_caption, refreturn) + _WRAP_VFUNC(const char* get_column_description(int column) const, get_column_description) + _WRAP_VFUNC(Glib::RefPtr get_column_header(int column), get_column_header, refreturn) + _WRAP_VFUNC(const char* get_row_description(int row) const, get_row_description) + _WRAP_VFUNC(Glib::RefPtr get_row_header(int row), get_row_header, refreturn) + _WRAP_VFUNC(Glib::RefPtr get_summary(), get_summary, refreturn) + _WRAP_VFUNC(void set_caption(const Glib::RefPtr& caption), set_caption) + _WRAP_VFUNC(void set_column_description(int column, const char* description), set_column_description) + _WRAP_VFUNC(void set_column_header(int column, const Glib::RefPtr& header), set_column_header) + _WRAP_VFUNC(void set_row_description(int row, const char* description), set_row_description) + _WRAP_VFUNC(void set_row_header(int row, const Glib::RefPtr& header), set_row_header) + _WRAP_VFUNC(void set_summary(const Glib::RefPtr& accessible), set_summary) + _WRAP_VFUNC(bool is_column_selected(int column) const, is_column_selected) + _WRAP_VFUNC(bool is_row_selected(int row) const, is_row_selected) + _WRAP_VFUNC(bool is_selected(int row, int column) const, is_selected) + _WRAP_VFUNC(bool add_row_selection(int row), add_row_selection) + _WRAP_VFUNC(bool remove_row_selection(int row), remove_row_selection) + _WRAP_VFUNC(bool add_column_selection(int column), add_column_selection) + _WRAP_VFUNC(bool remove_column_selection(int column), remove_column_selection) + _WRAP_VFUNC(int get_selected_columns(int** selected) const, get_selected_columns) + _WRAP_VFUNC(int get_selected_rows(int** selected) const, get_selected_rows) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/text.ccg b/libs/gtkmm2/atk/src/text.ccg new file mode 100644 index 0000000000..2caa773bfd --- /dev/null +++ b/libs/gtkmm2/atk/src/text.ccg @@ -0,0 +1,111 @@ +// -*- c++ -*- +/* $Id: text.ccg,v 1.1 2003/01/21 13:37:07 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include /* for std::swap() */ + + +// static +GType Glib::Value::value_type() +{ + return atk_text_attribute_get_type(); +} + + +namespace Atk +{ + +/**** Atk::Attribute *******************************************************/ + +Attribute::Attribute() +{ + gobject_.name = 0; + gobject_.value = 0; +} + +Attribute::Attribute(const Glib::ustring& name, const Glib::ustring& value) +{ + gobject_.name = g_strndup(name .data(), name .bytes()); + gobject_.value = g_strndup(value.data(), value.bytes()); +} + +Attribute::Attribute(const AtkAttribute* gobject) +{ + g_return_if_fail(gobject != 0); + + gobject_.name = g_strdup(gobject->name); + gobject_.value = g_strdup(gobject->value); +} + +Attribute::~Attribute() +{ + g_free(gobject_.name); + g_free(gobject_.value); +} + +Attribute::Attribute(const Attribute& other) +{ + gobject_.name = g_strdup(other.gobject_.name); + gobject_.value = g_strdup(other.gobject_.value); +} + +Attribute& Attribute::operator=(const Attribute& other) +{ + Attribute temp (other); + swap(temp); + return *this; +} + +void Attribute::swap(Attribute& other) +{ + std::swap(gobject_.name, other.gobject_.name); + std::swap(gobject_.value, other.gobject_.value); +} + + +/**** Atk::TextAttribute ***************************************************/ + +// static +TextAttribute TextAttribute::for_name(const Glib::ustring& name) +{ + return TextAttribute(int(atk_text_attribute_for_name(name.c_str()))); +} + +// static +Glib::ustring TextAttribute::get_name(TextAttribute attribute) +{ + if(const char *const name = atk_text_attribute_get_name(AtkTextAttribute(int(attribute)))) + return Glib::ustring(name); + else + return Glib::ustring(); +} + +// static +Glib::ustring TextAttribute::get_value(TextAttribute attribute, int index) +{ + if(const char *const value = atk_text_attribute_get_value(AtkTextAttribute(int(attribute)), index)) + return Glib::ustring(value); + else + return Glib::ustring(); +} + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/text.hg b/libs/gtkmm2/atk/src/text.hg new file mode 100644 index 0000000000..ba9d0f41f6 --- /dev/null +++ b/libs/gtkmm2/atk/src/text.hg @@ -0,0 +1,194 @@ +/* $Id: text.hg,v 1.7 2005/01/05 18:21:30 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) + +#include /* for Atk::CoordType */ +#include + + +namespace Atk +{ + +class Attribute +{ + _CLASS_GENERIC(Attribute, AtkAttribute) + +public: + Attribute(); + Attribute(const Glib::ustring& name, const Glib::ustring& value); + explicit Attribute(const AtkAttribute* gobject); + ~Attribute(); + + Attribute(const Attribute& other); + Attribute& operator=(const Attribute& other); + + void swap(Attribute& other); + + _MEMBER_GET(name, name, Glib::ustring, const char*) + _MEMBER_GET(value, value, Glib::ustring, const char*) + + /// Provides access to the underlying C GObject. + AtkAttribute* gobj() { return &gobject_; } + + /// Provides access to the underlying C GObject. + const AtkAttribute* gobj() const { return &gobject_; } + +protected: + AtkAttribute gobject_; +}; + +/** @relates Atk::Attribute */ +inline void swap(Attribute& lhs, Attribute& rhs) + { lhs.swap(rhs); } + +struct AttributeTraits +{ + typedef Atk::Attribute CppType; + typedef const AtkAttribute* CType; + typedef AtkAttribute* CTypeNonConst; + + static CType to_c_type(CType item) { return item; } + static CType to_c_type(const CppType& item) { return item.gobj(); } + static CppType to_cpp_type(CType item) { return CppType(item); } + static void release_c_type(CType item) { g_free(const_cast(item)); } +}; + +typedef Glib::SListHandle AttributeSet; + + +_CC_INCLUDE(atk/atk-enum-types.h) +_WRAP_ENUM(BuiltinTextAttribute, AtkTextAttribute) + +class TextAttribute +{ +private: + int attribute_; + +public: + TextAttribute() : attribute_ (0) {} + TextAttribute(BuiltinTextAttribute attribute) : attribute_ (attribute) {} + + // Behave like an ordinary enum. + explicit TextAttribute(int attribute) : attribute_ (attribute) {} + operator int() const { return attribute_; } + + static TextAttribute for_name(const Glib::ustring& name); + static Glib::ustring get_name(TextAttribute attribute); + static Glib::ustring get_value(TextAttribute attribute, int index); +}; + +} // namespace Atk + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +namespace Glib +{ + +template <> +class Value : public Glib::Value_Enum +{ +public: + static GType value_type() G_GNUC_CONST; +}; + +} // namespace Glib +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +namespace Atk +{ + +_WRAP_ENUM(TextBoundary, AtkTextBoundary) +_WRAP_ENUM(TextClipType, AtkTextClipType) + +/** The ATK interface implemented by components with text content. + * This should be implemented by Atk::Objects on behalf of widgets that have text content which is either attributed + * or otherwise non-trivial. Atk::Objects whose text content is simple, unattributed, and very brief may expose that + * content via Atk::Object::get_name() instead; however if the text is editable, multi-line, typically longer than + * three or four words, attributed, selectable, or if the object already uses the 'name' ATK property for other + * information, this Text interface should be used to expose the text content. In the case of editable text content, + * Atk::EditableText (a subtype of the Atk::Text interface) should be implemented instead. + * + * Atk::Text provides not only traversal facilities and change notification for text content, but also caret tracking + * and glyph bounding box calculations. Note that the text strings are exposed as UTF-8, and are therefore potentially + * multi-byte, and caret-to-byte offset mapping makes no assumptions about the character length; also bounding box + * glyph-to-offset mapping may be complex for languages which use ligatures. + */ +class Text : public Glib::Interface +{ + _CLASS_INTERFACE(Text, AtkText, ATK_TEXT, AtkTextIface) + +public: + _WRAP_METHOD(Glib::ustring get_text(int start_offset, int end_offset) const, atk_text_get_text) + _WRAP_METHOD(gunichar get_character_at_offset(int offset) const, atk_text_get_character_at_offset) + _WRAP_METHOD(Glib::ustring get_text_after_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const, atk_text_get_text_after_offset) + _WRAP_METHOD(Glib::ustring get_text_at_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const, atk_text_get_text_at_offset) + _WRAP_METHOD(Glib::ustring get_text_before_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const, atk_text_get_text_before_offset) + _WRAP_METHOD(int get_caret_offset() const, atk_text_get_caret_offset) + _WRAP_METHOD(void get_character_extents(int offset, int& x, int& y, int& width, int& height, CoordType coords) const, atk_text_get_character_extents) + _WRAP_METHOD(AttributeSet get_run_attributes(int offset, int& start_offset, int& end_offset) const, atk_text_get_run_attributes) + _WRAP_METHOD(AttributeSet get_default_attributes() const, atk_text_get_default_attributes) + _WRAP_METHOD(int get_character_count() const, atk_text_get_character_count) + _WRAP_METHOD(int get_offset_at_point(int x, int y, CoordType coords) const, atk_text_get_offset_at_point) + _WRAP_METHOD(int get_n_selections() const, atk_text_get_n_selections) + _WRAP_METHOD(Glib::ustring get_selection(int selection_num, int& start_offset, int& end_offset) const, atk_text_get_selection) + _WRAP_METHOD(bool add_selection(int start_offset, int end_offset), atk_text_add_selection) + _WRAP_METHOD(bool remove_selection(int selection_num), atk_text_remove_selection) + _WRAP_METHOD(bool set_selection(int selection_num, int start_offset, int end_offset), atk_text_set_selection) + _WRAP_METHOD(bool set_caret_offset(int offset), atk_text_set_caret_offset) + + typedef AtkTextRectangle Rectangle; + + _WRAP_METHOD(void get_range_extents(int start_offset, int end_offset, + CoordType coord_type, + Rectangle& rect), atk_text_get_range_extents) + _WRAP_METHOD(AtkTextRange** get_bounded_ranges(const Rectangle& rect, CoordType coord_type, + TextClipType x_clip_type, TextClipType y_clip_type), atk_text_get_bounded_ranges) + + + _WRAP_SIGNAL(void text_changed(int position, int length), "text_changed") + _WRAP_SIGNAL(void text_caret_moved(int location), "text_caret_moved") + _WRAP_SIGNAL(void text_selection_changed(), "text_selection_changed") + _WRAP_SIGNAL(void text_attributes_changed(), "text_attributes_changed") + +protected: +#m4 _CONVERSION(`Glib::ustring', `gchar*', `g_strdup(($3).c_str())') + + _WRAP_VFUNC(Glib::ustring get_text(int start_offset, int end_offset) const, get_text) + _WRAP_VFUNC(gunichar get_character_at_offset(int offset) const, get_character_at_offset) + _WRAP_VFUNC(Glib::ustring get_text_after_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const, get_text_after_offset) + _WRAP_VFUNC(Glib::ustring get_text_at_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const, get_text_at_offset) + _WRAP_VFUNC(Glib::ustring get_text_before_offset(int offset, TextBoundary boundary_type, int& start_offset, int& end_offset) const, get_text_before_offset) + _WRAP_VFUNC(int get_caret_offset() const, get_caret_offset) + _WRAP_VFUNC(void get_character_extents(int offset, int& x, int& y, int& width, int& height, CoordType coords) const, get_character_extents) + _WRAP_VFUNC(AtkAttributeSet* get_run_attributes(int offset, int& start_offset, int& end_offset) const, get_run_attributes) + _WRAP_VFUNC(AtkAttributeSet* get_default_attributes() const, get_default_attributes) + _WRAP_VFUNC(int get_character_count() const, get_character_count) + _WRAP_VFUNC(int get_offset_at_point(int x, int y, CoordType coords) const, get_offset_at_point) + _WRAP_VFUNC(int get_n_selections() const, get_n_selections) + _WRAP_VFUNC(Glib::ustring get_selection(int selection_num, int& start_offset, int& end_offset) const, get_selection) + _WRAP_VFUNC(bool add_selection(int start_offset, int end_offset), add_selection) + _WRAP_VFUNC(bool remove_selection(int selection_num), remove_selection) + _WRAP_VFUNC(bool set_selection(int selection_num, int start_offset, int end_offset), set_selection) + _WRAP_VFUNC(bool set_caret_offset(int offset), set_caret_offset) + + //TODO: Add get_range_extents(), and get_bounded_ranges() vfuncs when we can break ABI. +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/atk/src/value.ccg b/libs/gtkmm2/atk/src/value.ccg new file mode 100644 index 0000000000..5389ef15cf --- /dev/null +++ b/libs/gtkmm2/atk/src/value.ccg @@ -0,0 +1,22 @@ +// -*- c++ -*- +/* $Id: value.ccg,v 1.1 2003/01/21 13:37:08 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + diff --git a/libs/gtkmm2/atk/src/value.hg b/libs/gtkmm2/atk/src/value.hg new file mode 100644 index 0000000000..fa61790a2a --- /dev/null +++ b/libs/gtkmm2/atk/src/value.hg @@ -0,0 +1,58 @@ +/* $Id: value.hg,v 1.2 2004/01/02 09:56:43 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(atkmm,atk) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" +{ + typedef struct _AtkValueIface AtkValueIface; + typedef struct _AtkValue AtkValue; +} +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Atk +{ + +/** The ATK interface implemented by valuators and components which display or select a value from a bounded range of values. + * This should be implemented for components which either display a value from a bounded range, or which allow the user + * to specify a value from a bounded range, or both. For instance, most sliders and range controls, as well as dials, + * should have Atk::Object representations which implement Atk::Value on the component's behalf. Atk::Values may be + * read-only, in which case attempts to alter the value return false to indicate failure. + */ +class Value : public Glib::Interface +{ + _CLASS_INTERFACE(Value, AtkValue, ATK_VALUE, AtkValueIface) + +public: + _WRAP_METHOD(void get_current_value(Glib::ValueBase& value) const, atk_value_get_current_value) + _WRAP_METHOD(void get_maximum_value(Glib::ValueBase& value) const, atk_value_get_maximum_value) + _WRAP_METHOD(void get_minimum_value(Glib::ValueBase& value) const, atk_value_get_minimum_value) + _WRAP_METHOD(bool set_current_value(const Glib::ValueBase& value), atk_value_set_current_value) + +protected: + _WRAP_VFUNC(void get_current_value(Glib::ValueBase& value) const, get_current_value) + _WRAP_VFUNC(void get_maximum_value(Glib::ValueBase& value) const, get_maximum_value) + _WRAP_VFUNC(void get_minimum_value(Glib::ValueBase& value) const, get_minimum_value) + _WRAP_VFUNC(bool set_current_value(const Glib::ValueBase& value), set_current_value) +}; + +} // namespace Atk + diff --git a/libs/gtkmm2/autogen.sh b/libs/gtkmm2/autogen.sh new file mode 100755 index 0000000000..68577f7c67 --- /dev/null +++ b/libs/gtkmm2/autogen.sh @@ -0,0 +1,114 @@ +#! /bin/sh + +# Copyright (c) 2006, The gtkmm Development Team +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +# Be Bourne compatible. (stolen from autoconf) +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +PROJECT=gtkmm +MIN_AUTOMAKE_VERSION=1.9 + +srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. + +origdir=`pwd` +cd "$srcdir" + +LIBTOOLIZE_FLAGS="--automake $LIBTOOLIZE_FLAGS" +ACLOCAL_FLAGS="-I scripts $ACLOCAL_FLAGS" +AUTOMAKE_FLAGS="--add-missing $AUTOMAKE_FLAGS" + +if test "x$*$AUTOGEN_SUBDIR_MODE" = x +then + echo "I am going to run ./configure with no arguments -- if you wish" + echo "to pass any to it, please specify them on the $0 command line." +fi + +libtoolize=libtoolize +autoconf=autoconf +autoheader=autoheader +aclocal= +automake= +auto_version=0 + +# awk program to transform the output of automake --version +# into an integer value suitable for numeric comparison. +extract_version='{ printf "%.0f", 1000000 * v[split($1, v, " ")] + 1000 * $2 + $3; exit }' + +for suffix in -1.7 -1.8 -1.9 "" +do + aclocal_version=`aclocal$suffix --version /dev/null | awk -F. "$extract_version"` + automake_version=`automake$suffix --version /dev/null | awk -F. "$extract_version"` + + if test "$aclocal_version" -eq "$automake_version" 2>/dev/null \ + && test "$automake_version" -ge "$auto_version" 2>/dev/null + then + auto_version=$automake_version + aclocal=aclocal$suffix + automake=automake$suffix + fi +done + +min_version=`echo "$MIN_AUTOMAKE_VERSION" | awk -F. "$extract_version"` + +if test "$auto_version" -ge "$min_version" 2>/dev/null +then :; else + echo "Sorry, at least automake $MIN_AUTOMAKE_VERSION is required to configure $PROJECT." + exit 1 +fi + +rm -f config.guess config.sub depcomp install-sh missing mkinstalldirs +rm -f config.cache acconfig.h +rm -rf autom4te.cache + +#WARNINGS=all +#export WARNINGS + +if (set -x && set +x) >/dev/null 2>&1 +then + set_xtrace=set +else + set_xtrace=: +fi + +$set_xtrace -x + +"$libtoolize" $LIBTOOLIZE_FLAGS || exit 1 +"$aclocal" $ACLOCAL_FLAGS || exit 1 +#"$autoheader" || exit 1 +"$automake" $AUTOMAKE_FLAGS || exit 1 +"$autoconf" || exit 1 +cd "$origdir" || exit 1 + +if test -z "$AUTOGEN_SUBDIR_MODE" +then + "$srcdir/configure" --enable-maintainer-mode ${1+"$@"} || exit 1 + $set_xtrace +x + echo + echo "Now type 'make' to compile $PROJECT." +fi + +exit 0 diff --git a/libs/gtkmm2/build_shared/Makefile_build.am_fragment b/libs/gtkmm2/build_shared/Makefile_build.am_fragment new file mode 100644 index 0000000000..9867674561 --- /dev/null +++ b/libs/gtkmm2/build_shared/Makefile_build.am_fragment @@ -0,0 +1,52 @@ +## Copyright (c) 2001 +## The gtkmm development team. +## +## **** Common rules for inclusion in Makefile.am **** +## Included by Makefile_build_gensrc.am_fragment +## + +include $(srcdir)/../src/Makefile_list_of_hg.am_fragment + +# Support for DLL on mingw using libtool > 1.4 +# When creating DLLs on win32, we need to explicitly add a few extra +# libraries at link time to resolve symbols (remember a dll is like an +# executable). +if PLATFORM_WIN32 +extra_win32_defines = \ + -D$(shell echo $(sublib_name) | tr [:lower:] [:upper:])_BUILD +no_undefined = -no-undefined -Wl,--export-all-symbols +win32_dlls_extra_libs = $(sublib_win32_dlls_libs) +else +extra_win32_defines = +no_undefined = +win32_dlls_extra_libs = +endif + +common_ldflags = -version-info $(sublib_libversion) $(no_undefined) + +# All modules can include all other modules, +# for instance, so that gdkmm can use headers in pangomm. +all_includes = -I$(top_builddir)/$(sublib_topdir) -I$(top_srcdir)/$(sublib_topdir) \ + -I$(top_builddir)/pango -I$(top_srcdir)/pango \ + -I$(top_builddir)/atk -I$(top_srcdir)/atk \ + -I$(top_builddir)/gdk -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gtk -I$(top_srcdir)/gtk \ + $(sublib_cflags) $(GTHREAD_CFLAGS) + +dist_sources = $(files_all_built_cc) $(files_all_extra_cc) $(files_all_built_h) $(files_all_extra_h) +DISTFILES = $(DIST_COMMON) $(dist_sources) $(TEXINFOS) $(EXTRA_DIST) + + +DEFS = @DEFS@ -DG_LOG_DOMAIN=\"$(sublib_name)\" $(extra_win32_defines) +DEFAULT_INCLUDES = + +# DISABLE_DEPRECATED_CFLAGS and DISABLE_DEPRECATED_API_CFLAGS are empty unless the appropriate --enable-*=no options are specified to configure: +INCLUDES = $(strip $(all_includes)) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) + +sublib_includedir = $(includedir)/$(sublib_libname)/$(sublib_name) +sublib_include_HEADERS = $(files_all_built_h) $(files_all_extra_h) + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_all_built_cc) $(files_all_built_h)) + + diff --git a/libs/gtkmm2/build_shared/Makefile_build_gensrc.am_fragment b/libs/gtkmm2/build_shared/Makefile_build_gensrc.am_fragment new file mode 100644 index 0000000000..22ee8c45f5 --- /dev/null +++ b/libs/gtkmm2/build_shared/Makefile_build_gensrc.am_fragment @@ -0,0 +1,86 @@ +## Copyright (c) 2001-2004 +## The gtkmm development team. +## +## Included by src/Makefile_list_of_hg.am_fragment +## +## This Makefile.am helper transforms lists of source files that are +## specific to a sublibrary (atkmm, pangomm, gdkmm or gtkmm) into more +## generic lists. These lists of files are processed by the automake +## rules contained in Makefile_build.am_fragment (sublib/sublibmm +## directory) and Makefile_gensrc.am_fragment (sublib/src directory). +## +## The input variables are: +## * defined in sublib/src/Makefile_list_of_hg.am_fragment: +## files_posix_hg, files_win32_hg, files_general_hg, +## files_general_deprecated_hg. +## * defined sublib/sublibmm/Makefile.am: +## sublib_files_extra_posix_[cc|h], +## sublib_files_extra_win32_[cc|h], +## sublib_files_extra_general_[cc|h], +## sublib_files_extra_general_deprecated_[cc|h] +## +## The output variables are: +## files_all_hg: all .hg files (general, all platforms, deprecated) +## files_hg: general and platform-specific .hg files +## files_built_cc, files_built_h: generated source files that +## will be compiled on the target platform +## + corresponding headers. +## files_all_built_cc, files_all_built_h: all generated source +## files + corresponding headers. +## files_extra_cc, files_extra_h : general and platform-specific +## source files and corresponding headers +## files_all_extra_cc, files_all_extra_h: all extra source files +## and corresponding headers. +## !!! deprecated files not included !!! + +# Built files + +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +if OS_WIN32 +files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +else +files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +endif + +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) + +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files + +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = \ + $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) \ + $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) +files_all_extra_h += wrap_init.h + +if OS_WIN32 +files_extra_cc = \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) +files_extra_h = \ + $(sublib_files_extra_win32_h) \ + $(sublib_files_extra_general_h) +else +files_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_general_cc) +files_extra_h = \ + $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_general_h) +endif +files_extra_h += wrap_init.h diff --git a/libs/gtkmm2/build_shared/Makefile_conditional.am_fragment b/libs/gtkmm2/build_shared/Makefile_conditional.am_fragment new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/gtkmm2/build_shared/Makefile_gensrc.am_fragment b/libs/gtkmm2/build_shared/Makefile_gensrc.am_fragment new file mode 100644 index 0000000000..45930e130f --- /dev/null +++ b/libs/gtkmm2/build_shared/Makefile_gensrc.am_fragment @@ -0,0 +1,67 @@ +## Copyright (c) 2001 +## The gtkmm development team. +## +## **** Common rules for inclusion in Makefile.am **** +## Included from something/src/Makefile.am +## +## Used variable: Example content: +## +## sublib_name = gdkmm +## sublib_namespace = Gdk + +## files_defs = gdk.defs gdk_pixbuf.defs + + +tools_dir = $(top_srcdir)/tools +tools_dir_m4= $(top_srcdir)/tools/m4 +tools_dir_pm= $(top_srcdir)/tools/pm + +gensrc_destdir = $(srcdir)/../$(sublib_name) +stamp_dir = $(srcdir)/.stamps + +include $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment +tools_m4 = $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4) +# tools_pm = $(files_tools_pm:%.pm=$(tools_dir_pm)/%.pm) + +include $(srcdir)/../src/Makefile_list_of_hg.am_fragment +files_all_ccg = $(files_all_hg:%.hg=%.ccg) +files_h = $(files_all_hg:%.hg=$(gensrc_destdir)/%.h) +files_cc = $(files_all_hg:%.hg=$(gensrc_destdir)/%.cc) +files_stamp = $(files_all_hg:%.hg=$(stamp_dir)/stamp-%) + +#Installed gmmproc stuff, from glibmm: +gmmproc_path = $(GMMPROC) +gmmproc_dir = $(GMMPROC_DIR) + +# We use our own m4 and pm files as well as the ones installed by gtkmm: +# Our override m4 include seems to need to be before the default one. +gmmproc_args = -I $(tools_dir_m4) --defs $(srcdir) +run_gmmproc = $(gmmproc_path) $(gmmproc_args) + +gen_wrap_init_path = $(gmmproc_dir)/generate_wrap_init.pl +gen_wrap_init_args = --namespace=$(sublib_namespace) --parent_dir=$(sublib_parentdir) +run_gen_wrap_init = $(gen_wrap_init_path) $(gen_wrap_init_args) + +EXTRA_DIST = Makefile_list_of_hg.am_fragment \ + $(files_defs) $(files_all_hg) $(files_all_ccg) + + +$(stamp_dir)/stamp-%: %.hg %.ccg $(tools_m4) $(files_defs) + $(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir) + @echo 'timestamp' > $@ + +sublib_srcdir = $(srcdir)/../src +files_hg_with_path = $(patsubst %.hg,$(sublib_srcdir)/%.hg,$(files_all_hg)) + +$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_path) $(files_hg_with_path) + $(run_gen_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) >$@ + +create-stamp-dir: + @(test -d $(stamp_dir) || mkdir $(stamp_dir)) + +if MAINTAINER_MODE +all-local: create-stamp-dir $(files_stamp) $(gensrc_destdir)/wrap_init.cc +endif + +maintainer-clean-local: + rm -rf $(stamp_dir) diff --git a/libs/gtkmm2/config.h.in b/libs/gtkmm2/config.h.in new file mode 100644 index 0000000000..3ea4ed7e19 --- /dev/null +++ b/libs/gtkmm2/config.h.in @@ -0,0 +1,7 @@ +#undef HAVE_FLOCKFILE +#undef HAVE_FUNLOCKFILE + +#undef NEED_FLOCKFILE_PROTO +#undef NEED_FUNLOCKFILE_PROTO +#undef NEED_GETC_UNLOCKED_PROTO +#undef HAVE_GETC_UNLOCKED diff --git a/libs/gtkmm2/configure b/libs/gtkmm2/configure new file mode 100755 index 0000000000..b2ff7f8a33 --- /dev/null +++ b/libs/gtkmm2/configure @@ -0,0 +1,23746 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.61 for gtkmm 2.12.3. +# +# Report bugs to . +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + case $as_dir in + /*) + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + + +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +echo=${ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + + +tagnames=${tagnames+${tagnames},}CXX + +tagnames=${tagnames+${tagnames},}F77 + +exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Identity of this package. +PACKAGE_NAME='gtkmm' +PACKAGE_TARNAME='gtkmm' +PACKAGE_VERSION='2.12.3' +PACKAGE_STRING='gtkmm 2.12.3' +PACKAGE_BUGREPORT='gtkmm-list@gnome.org' + +ac_unique_file="gtk/gtkmmconfig.h.in" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +GTKMM_MAJOR_VERSION +GTKMM_MINOR_VERSION +GTKMM_MICRO_VERSION +GTKMM_VERSION +GTKMM_RELEASE +LIBGTKMM_SO_VERSION +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +am__isrc +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +MAINTAINER_MODE_TRUE +MAINTAINER_MODE_FALSE +MAINT +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +CPP +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +PLATFORM_WIN32_TRUE +PLATFORM_WIN32_FALSE +OS_WIN32_TRUE +OS_WIN32_FALSE +GREP +EGREP +LN_S +ECHO +AR +RANLIB +DLLTOOL +AS +OBJDUMP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +CXXCPP +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +M4 +PERL_PATH +GMMPROC_DIR +GMMPROC +PKG_CONFIG +ATKMM_CFLAGS +ATKMM_LIBS +PANGOMM_CFLAGS +PANGOMM_LIBS +GDKMM_CFLAGS +GDKMM_LIBS +GTKMM_CFLAGS +GTKMM_LIBS +GTHREAD_CFLAGS +GTHREAD_LIBS +GTKMM_DOXYGEN_INPUT +DISABLE_DEPRECATED_CFLAGS +DISABLE_DEPRECATED_API_CFLAGS +EXAMPLE_SUBDIR +DEMO_SUBDIR +GTKMM_PC_ATKMM_DEP +GTKMM_ATKMM_ENABLED_TRUE +GTKMM_ATKMM_ENABLED_FALSE +DOCS_SUBDIR +GTKMM_FALSE_TRUE +GTKMM_FALSE_FALSE +LIBOBJS +LTLIBOBJS' +ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS +PKG_CONFIG +ATKMM_CFLAGS +ATKMM_LIBS +PANGOMM_CFLAGS +PANGOMM_LIBS +GDKMM_CFLAGS +GDKMM_LIBS +GTKMM_CFLAGS +GTKMM_LIBS +GTHREAD_CFLAGS +GTHREAD_LIBS' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } +fi + +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +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 gtkmm 2.12.3 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/gtkmm] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of gtkmm 2.12.3:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-static[=PKGS] build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-warnings=[none|minimum|maximum|hardcore] + Control compiler pickyness. [default=minimum] + --enable-use-deprecations + warn about deprecated usages [default=no] + --enable-deprecated-api include (build) deprecated API in the libraries + [default=yes] + --enable-examples build the included examples [default=yes] + --enable-demos build the included demos [default=yes] + --enable-api-atkmm Build atkmm API. + [default=yes] + --enable-api-maemo-extensions Build Maemo Extensions API. + [default=no] + --enable-docs build the included docs [default=yes] + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-tags[=TAGS] include additional configurations [automatic] + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + CXX C++ compiler command + CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor + F77 Fortran 77 compiler command + FFLAGS Fortran 77 compiler flags + PKG_CONFIG path to pkg-config utility + ATKMM_CFLAGS + C compiler flags for ATKMM, overriding pkg-config + ATKMM_LIBS linker flags for ATKMM, overriding pkg-config + PANGOMM_CFLAGS + C compiler flags for PANGOMM, overriding pkg-config + PANGOMM_LIBS + linker flags for PANGOMM, overriding pkg-config + GDKMM_CFLAGS + C compiler flags for GDKMM, overriding pkg-config + GDKMM_LIBS linker flags for GDKMM, overriding pkg-config + GTKMM_CFLAGS + C compiler flags for GTKMM, overriding pkg-config + GTKMM_LIBS linker flags for GTKMM, overriding pkg-config + GTHREAD_CFLAGS + C compiler flags for GTHREAD, overriding pkg-config + GTHREAD_LIBS + linker flags for GTHREAD, overriding pkg-config + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +gtkmm configure 2.12.3 +generated by GNU Autoconf 2.61 + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi +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 gtkmm $as_me 2.12.3, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer explicitly selected file to automatically selected ones. +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" +fi +shift +for ac_site_file +do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +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 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } +fi + + + + + + + + + + + + + + + + + + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + +######################################################################### +# Version and initialization +######################################################################### +GTKMM_MAJOR_VERSION=2 +GTKMM_MINOR_VERSION=12 +GTKMM_MICRO_VERSION=3 +GTKMM_EXTRA_VERSION= +GTKMM_VERSION=2.12.3 + + + + + +GTKMM_RELEASE=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION + +cat >>confdefs.h <<_ACEOF +#define GTKMM_MAJOR_VERSION $GTKMM_MAJOR_VERSION +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define GTKMM_MINOR_VERSION $GTKMM_MINOR_VERSION +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define GTKMM_MICRO_VERSION $GTKMM_MICRO_VERSION +_ACEOF + + + + + + + +# +# +1 : ? : +1 == new interface that does not break old one +# +1 : ? : 0 == new interface that breaks old one +# ? : ? : 0 == no new interfaces, but breaks apps +# ? :+1 : ? == just some internal changes, nothing breaks but might work +# better +# CURRENT : REVISION : AGE +LIBGTKMM_SO_VERSION=1:30:0 + + +ac_aux_dir= +for ac_dir in scripts "$srcdir"/scripts; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;} + { (exit 1); exit 1; }; } +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + +# Initialize automake stuff +# tar-ustar asks it to use a sensible tar format that can handle long filenames. +am__api_version='1.10' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + done + done + ;; +esac +done +IFS=$as_save_IFS + + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL 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. + INSTALL=$ac_install_sh + fi +fi +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } +fi +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # 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 +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + SET_MAKE= +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='gtkmm' + VERSION='2.12.3' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + + +{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5 +echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; } +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +if test "${am_cv_prog_tar_ustar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + +{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5 +echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; } + + + + + + +ac_config_headers="$ac_config_headers config.h gdk/gdkmmconfig.h gtk/gtkmmconfig.h" + +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi + + MAINT=$MAINTAINER_MODE_TRUE + + + + test "x$ACLOCAL_FLAGS" = "x" || ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + for dir in scripts + do + ACLOCAL="$ACLOCAL -I $srcdir/$dir" + done + + + +######################################################################### +# Configure arguments +######################################################################### + +######################################################################### +# Environment Checks +######################################################################### +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out 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. +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } +fi + +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. +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# 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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +rm -f a.out 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. +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest$ac_cv_exeext +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi + + +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + +depcc="$CC" am_compiler_list= + +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + SET_MAKE= +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + +{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } +case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; + *) + platform_win32=no + ;; +esac +{ echo "$as_me:$LINENO: result: $platform_win32" >&5 +echo "${ECHO_T}$platform_win32" >&6; } + if test "$platform_win32" = "yes"; then + PLATFORM_WIN32_TRUE= + PLATFORM_WIN32_FALSE='#' +else + PLATFORM_WIN32_TRUE='#' + PLATFORM_WIN32_FALSE= +fi + + +{ echo "$as_me:$LINENO: checking for native Win32" >&5 +echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +{ echo "$as_me:$LINENO: result: $os_win32" >&5 +echo "${ECHO_T}$os_win32" >&6; } + if test "$os_win32" = "yes"; then + OS_WIN32_TRUE= + OS_WIN32_FALSE='#' +else + OS_WIN32_TRUE='#' + OS_WIN32_FALSE= +fi + + +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no +fi + + + + + +# Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi + + +# Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi + + +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } +if test "${lt_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done + +fi + +SED=$lt_cv_path_SED +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } +else + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } +fi +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +echo "${ECHO_T}$LD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } +if test "${lt_cv_ld_reload_flag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } +if test "${lt_cv_path_NM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm +fi +fi +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } +NM="$lt_cv_path_NM" + +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } +fi + +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } +if test "${lt_cv_deplibs_check_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# which responds to the $file_magic_cmd with a given extended regex. +# If you have `file' or equivalent on your system and you're not sure +# whether `pass_all' will *always* work, you probably want this one. + +case $host_os in +aix4* | aix5*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | kfreebsd*-gnu | dragonfly*) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix3*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be Linux ELF. +linux*) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + 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 + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +nto-qnx*) + lt_cv_deplibs_check_method=unknown + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line 4865 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } +if test "${lt_cv_cc_needs_belf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + lt_cv_cc_needs_belf=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + lt_cv_cc_needs_belf=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-cygwin* | *-*-mingw* | *-*-pw32*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +echo "${ECHO_T}$DLLTOOL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AS="${ac_tool_prefix}as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AS=$ac_cv_prog_AS +if test -n "$AS"; then + { echo "$as_me:$LINENO: result: $AS" >&5 +echo "${ECHO_T}$AS" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +echo "${ECHO_T}$ac_ct_AS" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi +else + AS="$ac_cv_prog_AS" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +echo "${ECHO_T}$OBJDUMP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + + ;; + +esac + +need_locks="$enable_libtool_lock" + + + +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_header in dlfcn.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------- ## +## Report this to gtkmm-list@gnome.org ## +## ----------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + + + +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +fi + + +ac_ext=f +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_f77_compiler_gnu +if test -n "$ac_tool_prefix"; then + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$F77"; then + ac_cv_prog_F77="$F77" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_F77="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +F77=$ac_cv_prog_F77 +if test -n "$F77"; then + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$F77" && break + done +fi +if test -z "$F77"; then + ac_ct_F77=$F77 + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_F77"; then + ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_F77="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_F77=$ac_cv_prog_ac_ct_F77 +if test -n "$ac_ct_F77"; then + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_F77" && break +done + + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi +fi + + +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +rm -f a.out + +# If we don't use `.F' as extension, the preprocessor is not run on the +# input file. (Note that this only needs to work for GNU compilers.) +ac_save_ext=$ac_ext +ac_ext=F +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } +if test "${ac_cv_f77_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF + program main +#ifndef __GNUC__ + choke me +#endif + + end +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_f77_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } +ac_ext=$ac_save_ext +ac_test_FFLAGS=${FFLAGS+set} +ac_save_FFLAGS=$FFLAGS +FFLAGS= +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_f77_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + FFLAGS=-g +cat >conftest.$ac_ext <<_ACEOF + program main + + end +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_f77_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_prog_f77_g=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } +if test "$ac_test_FFLAGS" = set; then + FFLAGS=$ac_save_FFLAGS +elif test $ac_cv_prog_f77_g = yes; then + if test "x$ac_cv_f77_compiler_gnu" = xyes; then + FFLAGS="-g -O2" + else + FFLAGS="-g" + fi +else + if test "x$ac_cv_f77_compiler_gnu" = xyes; then + FFLAGS="-O2" + else + FFLAGS= + fi +fi + +G77=`test $ac_compiler_gnu = yes && echo yes` +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + +# find the maximum length of command line arguments +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +if test "${lt_cv_sys_max_cmd_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + ;; + esac + +fi + +if test -n $lt_cv_sys_max_cmd_len ; then + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } +else + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } +fi + + + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Transform an extracted symbol line into a proper C declaration +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32*) + symcode='[ABCDGISTW]' + ;; +hpux*) # Its linker distinguishes data from code symbols + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + ;; +linux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDGIRSTW]' + lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +# Try without a prefix undercore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if grep ' nm_test_var$' "$nlist" >/dev/null; then + if grep ' nm_test_func$' "$nlist" >/dev/null; then + cat < conftest.$ac_ext +#ifdef __cplusplus +extern "C" { +#endif + +EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' + + cat <> conftest.$ac_ext +#if defined (__STDC__) && __STDC__ +# define lt_ptr_t void * +#else +# define lt_ptr_t char * +# define const +#endif + +/* The mapping between symbol names and symbols. */ +const struct { + const char *name; + lt_ptr_t address; +} +lt_preloaded_symbols[] = +{ +EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext + cat <<\EOF >> conftest.$ac_ext + {0, (lt_ptr_t) 0} +}; + +#ifdef __cplusplus +} +#endif +EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } +else + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } +fi + +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } +if test "${lt_cv_objdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir + + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +else + AR="$ac_cv_prog_AR" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/${ac_tool_prefix}file; then + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/file; then + lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi + +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +enable_dlopen=no +enable_win32_dll=yes + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then + enableval=$enable_libtool_lock; +fi + +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then + withval=$with_pic; pic_mode="$withval" +else + pic_mode=default +fi + +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}\n' + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + + +lt_prog_compiler_no_builtin_flag= + +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag=' -fno-builtin' + + +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:7656: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:7660: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + +lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic='-qnocommon' + lt_prog_compiler_wl='-Wl,' + ;; + esac + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + linux*) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_pic_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:7924: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:7928: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works=yes + fi + fi + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } + +if test x"$lt_prog_compiler_pic_works" = xyes; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works=yes + fi + else + lt_prog_compiler_static_works=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } + +if test x"$lt_prog_compiler_static_works" = xyes; then + : +else + lt_prog_compiler_static= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:8028: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:8032: \$? = $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 + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag= + enable_shared_with_static_runtimes=no + archive_cmds= + archive_expsym_cmds= + old_archive_From_new_cmds= + old_archive_from_expsyms_cmds= + export_dynamic_flag_spec= + whole_archive_flag_spec= + thread_safe_flag_spec= + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= + hardcode_libdir_separator= + hardcode_direct=no + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + link_all_deplibs=unknown + hardcode_automatic=no + module_cmds= + module_expsym_cmds= + always_export_symbols=no + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + ld_shlibs=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + interix3*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + ld_shlibs=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct=yes + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + archive_cmds_need_lc=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + # see comment about different semantics on the GNU ld section + ld_shlibs=no + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes + ;; + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + whole_archive_flag_spec='' + link_all_deplibs=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs=no + ;; + esac + fi + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + freebsd1*) + ld_shlibs=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | kfreebsd*-gnu | dragonfly*) + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld='+b $libdir' + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + export_dynamic_flag_spec='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_ld='-rpath $libdir' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + link_all_deplibs=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + openbsd*) + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z text' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + wlarc='' + archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='${wl}-z,text' + allow_undefined_flag='${wl}-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } + ;; + esac + fi + ;; +esac + +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + 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}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 9493 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +knetbsd*-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='GNU ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx*) + 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=yes + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ + test "X$hardcode_automatic" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } + +if test "$hardcode_action" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + +striplib= +old_striplib= +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + ;; + *) + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + ;; + esac +fi + +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + *) + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } +if test "${ac_cv_func_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shl_load to an innocuous variant, in case declares shl_load. + For example, HP-UX 11i declares gettimeofday. */ +#define shl_load innocuous_shl_load + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shl_load (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef shl_load + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_shl_load || defined __stub___shl_load +choke me +#endif + +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_shl_load=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } +if test $ac_cv_func_shl_load = yes; then + lt_cv_dlopen="shl_load" +else + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } +if test "${ac_cv_lib_dld_shl_load+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_shl_load=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_shl_load=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } +if test $ac_cv_lib_dld_shl_load = yes; then + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" +else + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } +if test "${ac_cv_func_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define dlopen to an innocuous variant, in case declares dlopen. + For example, HP-UX 11i declares gettimeofday. */ +#define dlopen innocuous_dlopen + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char dlopen (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef dlopen + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_dlopen || defined __stub___dlopen +choke me +#endif + +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_dlopen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } +if test $ac_cv_func_dlopen = yes; then + lt_cv_dlopen="dlopen" +else + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +if test $ac_cv_lib_dl_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +else + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } +if test "${ac_cv_lib_svld_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_svld_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_svld_dlopen=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } +if test $ac_cv_lib_svld_dlopen = yes; then + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +else + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } +if test "${ac_cv_lib_dld_dld_link+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dld_dld_link=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dld_dld_link=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } +if test $ac_cv_lib_dld_dld_link = yes; then + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } +if test "${lt_cv_dlopen_self+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } +if test "${lt_cv_dlopen_self_static+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + exit (status); +} +EOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + +# Report which library types will actually be built +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } + +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case $host_os in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } + +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler \ + CC \ + LD \ + lt_prog_compiler_wl \ + lt_prog_compiler_pic \ + lt_prog_compiler_static \ + lt_prog_compiler_no_builtin_flag \ + export_dynamic_flag_spec \ + thread_safe_flag_spec \ + whole_archive_flag_spec \ + enable_shared_with_static_runtimes \ + old_archive_cmds \ + old_archive_from_new_cmds \ + predep_objects \ + postdep_objects \ + predeps \ + postdeps \ + compiler_lib_search_path \ + archive_cmds \ + archive_expsym_cmds \ + postinstall_cmds \ + postuninstall_cmds \ + old_archive_from_expsyms_cmds \ + allow_undefined_flag \ + no_undefined_flag \ + export_symbols_cmds \ + hardcode_libdir_flag_spec \ + hardcode_libdir_flag_spec_ld \ + hardcode_libdir_separator \ + hardcode_automatic \ + module_cmds \ + module_expsym_cmds \ + lt_cv_prog_compiler_c_o \ + exclude_expsyms \ + include_expsyms; do + + case $var in + old_archive_cmds | \ + old_archive_from_new_cmds | \ + archive_cmds | \ + archive_expsym_cmds | \ + module_cmds | \ + module_expsym_cmds | \ + old_archive_from_expsyms_cmds | \ + export_symbols_cmds | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="${ofile}T" + trap "$rm \"$cfgfile\"; exit 1" 1 2 15 + $rm -f "$cfgfile" + { echo "$as_me:$LINENO: creating $ofile" >&5 +echo "$as_me: creating $ofile" >&6;} + + cat <<__EOF__ >> "$cfgfile" +#! $SHELL + +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# +# This file is part of GNU Libtool: +# Originally by Gordon Matzigkeit , 1996 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="$SED -e 1s/^X//" + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# The names of the tagged configurations supported by this script. +available_tags= + +# ### BEGIN LIBTOOL CONFIG + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU C compiler? +with_gcc=$GCC + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# ### END LIBTOOL CONFIG + +__EOF__ + + + case $host_os in + aix3*) + cat <<\EOF >> "$cfgfile" + +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +EOF + ;; + esac + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || \ + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + +# Check whether --with-tags was given. +if test "${with_tags+set}" = set; then + withval=$with_tags; tagnames="$withval" +fi + + +if test -f "$ltmain" && test -n "$tagnames"; then + if test ! -f "${ofile}"; then + { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + fi + + if test -z "$LTCC"; then + eval "`$SHELL ${ofile} --config | grep '^LTCC='`" + if test -z "$LTCC"; then + { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + else + { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + fi + fi + if test -z "$LTCFLAGS"; then + eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`" + fi + + # Extract list of available tagged configurations in $ofile. + # Note that this assumes the entire list is on one line. + available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` + + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for tagname in $tagnames; do + IFS="$lt_save_ifs" + # Check whether tagname contains only valid characters + case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in + "") ;; + *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +echo "$as_me: error: invalid tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null + then + { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { (exit 1); exit 1; }; } + fi + + # Update the list of available tags. + if test -n "$tagname"; then + echo appending configuration tag \"$tagname\" to $ofile + + case $tagname in + CXX) + if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + +archive_cmds_need_lc_CXX=no +allow_undefined_flag_CXX= +always_export_symbols_CXX=no +archive_expsym_cmds_CXX= +export_dynamic_flag_spec_CXX= +hardcode_direct_CXX=no +hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= +hardcode_libdir_separator_CXX= +hardcode_minus_L_CXX=no +hardcode_shlibpath_var_CXX=unsupported +hardcode_automatic_CXX=no +module_cmds_CXX= +module_expsym_cmds_CXX= +link_all_deplibs_CXX=unknown +old_archive_cmds_CXX=$old_archive_cmds +no_undefined_flag_CXX= +whole_archive_flag_spec_CXX= +enable_shared_with_static_runtimes_CXX=no + +# Dependencies to place before and after the object being linked: +predep_objects_CXX= +postdep_objects_CXX= +predeps_CXX= +postdeps_CXX= +compiler_lib_search_path_CXX= + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +objext_CXX=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_LD=$LD +lt_save_GCC=$GCC +GCC=$GXX +lt_save_with_gnu_ld=$with_gnu_ld +lt_save_path_LD=$lt_cv_path_LD +if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx +else + $as_unset lt_cv_prog_gnu_ld +fi +if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX +else + $as_unset lt_cv_path_LD +fi +test -z "${LDCXX+set}" || LD=$LDCXX +CC=${CXX-"c++"} +compiler=$CC +compiler_CXX=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +# We don't want -fno-exception wen compiling C++ code, so set the +# no_builtin_flag separately +if test "$GXX" = yes; then + lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' +else + lt_prog_compiler_no_builtin_flag_CXX= +fi + +if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } +else + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } +fi +if test "${lt_cv_path_LD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +echo "${ECHO_T}$LD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} + { (exit 1); exit 1; }; } +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +if test "${lt_cv_prog_gnu_ld+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ + grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_CXX= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + +else + GXX=no + with_gnu_ld=no + wlarc= +fi + +# PORTME: fill in a description of your system's C++ link characteristics +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } +ld_shlibs_CXX=yes +case $host_os in + aix3*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_CXX='' + hardcode_direct_CXX=yes + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + + if test "$GXX" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct_CXX=yes + else + # We have old collect2 + hardcode_direct_CXX=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_CXX=yes + hardcode_libdir_flag_spec_CXX='-L$libdir' + hardcode_libdir_separator_CXX= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_CXX=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_CXX='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + + archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_CXX="-z nodefs" + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_CXX=' ${wl}-bernotok' + allow_undefined_flag_CXX=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_CXX='$convenience' + archive_cmds_need_lc_CXX=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_CXX=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_CXX=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_CXX='-L$libdir' + allow_undefined_flag_CXX=unsupported + always_export_symbols_CXX=no + enable_shared_with_static_runtimes_CXX=yes + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_CXX=no + fi + ;; + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_direct_CXX=no + hardcode_automatic_CXX=yes + hardcode_shlibpath_var_CXX=unsupported + whole_archive_flag_spec_CXX='' + link_all_deplibs_CXX=yes + + if test "$GXX" = yes ; then + lt_int_apple_cc_single_mod=no + output_verbose_link_cmd='echo' + if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then + lt_int_apple_cc_single_mod=yes + fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else + archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + fi + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs_CXX=no + ;; + esac + fi + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + freebsd[12]*) + # C++ shared libraries reported to be fairly broken before switch to ELF + ld_shlibs_CXX=no + ;; + freebsd-elf*) + archive_cmds_need_lc_CXX=no + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + ld_shlibs_CXX=yes + ;; + gnu*) + ;; + hpux9*) + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + export_dynamic_flag_spec_CXX='${wl}-E' + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_CXX='+b $libdir' + ;; + *) + export_dynamic_flag_spec_CXX='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + ;; + *) + hardcode_direct_CXX=yes + hardcode_minus_L_CXX=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + interix3*) + hardcode_direct_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' + fi + fi + link_all_deplibs_CXX=yes + ;; + esac + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + ;; + linux*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc*) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + archive_cmds_need_lc_CXX=no + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC*) + # Portland Group C++ compiler + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac + ;; + lynxos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + m88k*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + openbsd2*) + # C++ shared libraries are fairly broken + ld_shlibs_CXX=no + ;; + openbsd*) + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + ;; + osf3*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' + + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + hardcode_libdir_separator_CXX=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + cxx*) + allow_undefined_flag_CXX=' -expect_unresolved \*' + archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ + $rm $lib.exp' + + hardcode_libdir_flag_spec_CXX='-rpath $libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + + hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_CXX=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' + + else + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + fi + ;; + esac + ;; + psos*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + archive_cmds_need_lc_CXX=yes + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + hardcode_libdir_flag_spec_CXX='-R$libdir' + hardcode_shlibpath_var_CXX=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The C++ compiler is used as linker so we must use $wl + # flag to pass the commands to the underlying system + # linker. We must also pass each convience library through + # to the system linker between allextract/defaultextract. + # The C++ compiler will combine linker options so we + # cannot just pass the convience library names through + # without $wl. + # Supported since Solaris 2.6 (maybe 2.5.1?) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + ;; + esac + link_all_deplibs_CXX=yes + + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + no_undefined_flag_CXX=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then + archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" + fi + + hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + fi + ;; + esac + ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag_CXX='${wl}-z,text' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + # So that behaviour is only enabled if SCOABSPATH is set to a + # non-empty value in the environment. Most likely only useful for + # creating official distributions of packages. + # This is a hack until libtool officially supports absolute path + # names for shared libraries. + no_undefined_flag_CXX='${wl}-z,text' + allow_undefined_flag_CXX='${wl}-z,nodefs' + archive_cmds_need_lc_CXX=no + hardcode_shlibpath_var_CXX=no + hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_CXX=':' + link_all_deplibs_CXX=yes + export_dynamic_flag_spec_CXX='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + esac + ;; + vxworks*) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; + *) + # FIXME: insert proper C++ library support + ld_shlibs_CXX=no + ;; +esac +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no + +GCC_CXX="$GXX" +LD_CXX="$LD" + + +cat > conftest.$ac_ext <&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + # The `*' in the case matches for architectures that use `case' in + # $output_verbose_cmd can trigger glob expansion during the loop + # eval without this substitution. + output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` + + for p in `eval $output_verbose_link_cmd`; do + case $p in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" \ + || test $p = "-R"; then + prev=$p + continue + else + prev= + fi + + if test "$pre_test_object_deps_done" = no; then + case $p in + -L* | -R*) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$compiler_lib_search_path_CXX"; then + compiler_lib_search_path_CXX="${prev}${p}" + else + compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$postdeps_CXX"; then + postdeps_CXX="${prev}${p}" + else + postdeps_CXX="${postdeps_CXX} ${prev}${p}" + fi + fi + ;; + + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$predep_objects_CXX"; then + predep_objects_CXX="$p" + else + predep_objects_CXX="$predep_objects_CXX $p" + fi + else + if test -z "$postdep_objects_CXX"; then + postdep_objects_CXX="$p" + else + postdep_objects_CXX="$postdep_objects_CXX $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling CXX test program" +fi + +$rm -f confest.$objext + +# PORTME: override above test on systems where it is broken +case $host_os in +interix3*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + predep_objects_CXX= + postdep_objects_CXX= + postdeps_CXX= + ;; + +solaris*) + case $cc_basename in + CC*) + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + postdeps_CXX='-lCstd -lCrun' + ;; + esac + ;; +esac + + +case " $postdeps_CXX " in +*" -lc "*) archive_cmds_need_lc_CXX=no ;; +esac + +lt_prog_compiler_wl_CXX= +lt_prog_compiler_pic_CXX= +lt_prog_compiler_static_CXX= + +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + fi + ;; + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' + ;; + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | os2* | pw32*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_CXX='-DDLL_EXPORT' + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_CXX='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + lt_prog_compiler_pic_CXX= + ;; + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_CXX=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; + esac + else + case $host_os in + aix4* | aix5*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_CXX='-Bstatic' + else + lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_CXX='-qnocommon' + lt_prog_compiler_wl_CXX='-Wl,' + ;; + esac + ;; + dgux*) + case $cc_basename in + ec++*) + lt_prog_compiler_pic_CXX='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + lt_prog_compiler_pic_CXX='+Z' + fi + ;; + aCC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_CXX='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_static_CXX='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux*) + case $cc_basename in + KCC*) + # KAI C++ Compiler + lt_prog_compiler_wl_CXX='--backend -Wl,' + lt_prog_compiler_pic_CXX='-fPIC' + ;; + icpc* | ecpc*) + # Intel C++ + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-static' + ;; + pgCC*) + # Portland Group C++ compiler. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + lt_prog_compiler_pic_CXX='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + lt_prog_compiler_wl_CXX='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + lt_prog_compiler_pic_CXX='-pic' + ;; + cxx*) + # Digital/Compaq C++ + lt_prog_compiler_wl_CXX='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + lt_prog_compiler_pic_CXX= + lt_prog_compiler_static_CXX='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC*) + # Sun C++ 4.2, 5.x and Centerline C++ + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + lt_prog_compiler_pic_CXX='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + lt_prog_compiler_pic_CXX='-pic' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + lcc*) + # Lucid + lt_prog_compiler_pic_CXX='-pic' + ;; + *) + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + lt_prog_compiler_pic_CXX='-KPIC' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + ;; + esac + ;; + vxworks*) + ;; + *) + lt_prog_compiler_can_build_shared_CXX=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_CXX"; then + +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works_CXX=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:12793: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:12797: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works_CXX=yes + fi + fi + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } + +if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then + case $lt_prog_compiler_pic_CXX in + "" | " "*) ;; + *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; + esac +else + lt_prog_compiler_pic_CXX= + lt_prog_compiler_can_build_shared_CXX=no +fi + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_CXX= + ;; + *) + lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" + ;; +esac + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_CXX=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_CXX=yes + fi + else + lt_prog_compiler_static_works_CXX=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; } + +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then + : +else + lt_prog_compiler_static_CXX= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o_CXX=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:12897: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:12901: \$? = $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 + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_CXX=yes + fi + fi + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in + aix4* | aix5*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + export_symbols_cmds_CXX="$ltdll_cmds" + ;; + cygwin* | mingw*) + 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' + ;; + *) + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac + +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +test "$ld_shlibs_CXX" = no && can_build_shared=no + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_CXX" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_CXX=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_CXX in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_CXX + pic_flag=$lt_prog_compiler_pic_CXX + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_CXX=no + else + archive_cmds_need_lc_CXX=yes + fi + allow_undefined_flag_CXX=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } + ;; + esac + fi + ;; +esac + +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + 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}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 13433 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +knetbsd*-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='GNU ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx*) + 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=yes + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_CXX= +if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ + test "X$hardcode_automatic_CXX" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_CXX" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && + test "$hardcode_minus_L_CXX" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_CXX=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_CXX=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_CXX=unsupported +fi +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } + +if test "$hardcode_action_CXX" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_CXX \ + CC_CXX \ + LD_CXX \ + lt_prog_compiler_wl_CXX \ + lt_prog_compiler_pic_CXX \ + lt_prog_compiler_static_CXX \ + lt_prog_compiler_no_builtin_flag_CXX \ + export_dynamic_flag_spec_CXX \ + thread_safe_flag_spec_CXX \ + whole_archive_flag_spec_CXX \ + enable_shared_with_static_runtimes_CXX \ + old_archive_cmds_CXX \ + old_archive_from_new_cmds_CXX \ + predep_objects_CXX \ + postdep_objects_CXX \ + predeps_CXX \ + postdeps_CXX \ + compiler_lib_search_path_CXX \ + archive_cmds_CXX \ + archive_expsym_cmds_CXX \ + postinstall_cmds_CXX \ + postuninstall_cmds_CXX \ + old_archive_from_expsyms_cmds_CXX \ + allow_undefined_flag_CXX \ + no_undefined_flag_CXX \ + export_symbols_cmds_CXX \ + hardcode_libdir_flag_spec_CXX \ + hardcode_libdir_flag_spec_ld_CXX \ + hardcode_libdir_separator_CXX \ + hardcode_automatic_CXX \ + module_cmds_CXX \ + module_expsym_cmds_CXX \ + lt_cv_prog_compiler_c_o_CXX \ + exclude_expsyms_CXX \ + include_expsyms_CXX; do + + case $var in + old_archive_cmds_CXX | \ + old_archive_from_new_cmds_CXX | \ + archive_cmds_CXX | \ + archive_expsym_cmds_CXX | \ + module_cmds_CXX | \ + module_expsym_cmds_CXX | \ + old_archive_from_expsyms_cmds_CXX | \ + export_symbols_cmds_CXX | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_compiler_CXX + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_CXX + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_CXX + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_CXX +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_CXX + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_CXX + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_CXX + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_CXX + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_CXX + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_CXX + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_CXX" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC=$lt_save_CC +LDCXX=$LD +LD=$lt_save_LD +GCC=$lt_save_GCC +with_gnu_ldcxx=$with_gnu_ld +with_gnu_ld=$lt_save_with_gnu_ld +lt_cv_path_LDCXX=$lt_cv_path_LD +lt_cv_path_LD=$lt_save_path_LD +lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld +lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld + + else + tagname="" + fi + ;; + + F77) + if test -n "$F77" && test "X$F77" != "Xno"; then + +ac_ext=f +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_f77_compiler_gnu + + +archive_cmds_need_lc_F77=no +allow_undefined_flag_F77= +always_export_symbols_F77=no +archive_expsym_cmds_F77= +export_dynamic_flag_spec_F77= +hardcode_direct_F77=no +hardcode_libdir_flag_spec_F77= +hardcode_libdir_flag_spec_ld_F77= +hardcode_libdir_separator_F77= +hardcode_minus_L_F77=no +hardcode_automatic_F77=no +module_cmds_F77= +module_expsym_cmds_F77= +link_all_deplibs_F77=unknown +old_archive_cmds_F77=$old_archive_cmds +no_undefined_flag_F77= +whole_archive_flag_spec_F77= +enable_shared_with_static_runtimes_F77=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +objext_F77=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code=" subroutine t\n return\n end\n" + +# Code to be used in simple link tests +lt_simple_link_test_code=" program t\n end\n" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${F77-"f77"} +compiler=$CC +compiler_F77=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } + +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } +test "$can_build_shared" = "no" && enable_shared=no + +# On AIX, shared libraries and static libraries use the same namespace, and +# are all built from PIC. +case $host_os in +aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; +aix4* | aix5*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; +esac +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } + +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } +# Make sure either enable_shared or enable_static is yes. +test "$enable_shared" = yes || enable_static=yes +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } + +GCC_F77="$G77" +LD_F77="$LD" + +lt_prog_compiler_wl_F77= +lt_prog_compiler_pic_F77= +lt_prog_compiler_static_F77= + +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_static_F77='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_F77='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_F77='-fno-common' + ;; + + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared_F77=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_F77=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; + esac + ;; + + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl_F77='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_F77='-Bstatic' + else + lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' + fi + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_F77='-qnocommon' + lt_prog_compiler_wl_F77='-Wl,' + ;; + esac + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_F77='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl_F77='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_F77='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static_F77='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl_F77='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static_F77='-non_shared' + ;; + + newsos6) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + linux*) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fpic' + lt_prog_compiler_static_F77='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl_F77='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl_F77='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static_F77='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_F77='-Qoption ld ';; + *) + lt_prog_compiler_wl_F77='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl_F77='-Qoption ld ' + lt_prog_compiler_pic_F77='-PIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic_F77='-Kconform_pic' + lt_prog_compiler_static_F77='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_can_build_shared_F77=no + ;; + + uts4*) + lt_prog_compiler_pic_F77='-pic' + lt_prog_compiler_static_F77='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared_F77=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_F77"; then + +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_pic_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works_F77=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_F77" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:14488: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:14492: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works_F77=yes + fi + fi + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } + +if test x"$lt_prog_compiler_pic_works_F77" = xyes; then + case $lt_prog_compiler_pic_F77 in + "" | " "*) ;; + *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; + esac +else + lt_prog_compiler_pic_F77= + lt_prog_compiler_can_build_shared_F77=no +fi + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_F77= + ;; + *) + lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" + ;; +esac + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_F77=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_F77=yes + fi + else + lt_prog_compiler_static_works_F77=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; } + +if test x"$lt_prog_compiler_static_works_F77" = xyes; then + : +else + lt_prog_compiler_static_F77= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o_F77=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:14592: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:14596: \$? = $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 + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_F77=yes + fi + fi + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_F77= + enable_shared_with_static_runtimes_F77=no + archive_cmds_F77= + archive_expsym_cmds_F77= + old_archive_From_new_cmds_F77= + old_archive_from_expsyms_cmds_F77= + export_dynamic_flag_spec_F77= + whole_archive_flag_spec_F77= + thread_safe_flag_spec_F77= + hardcode_libdir_flag_spec_F77= + hardcode_libdir_flag_spec_ld_F77= + hardcode_libdir_separator_F77= + hardcode_direct_F77=no + hardcode_minus_L_F77=no + hardcode_shlibpath_var_F77=unsupported + link_all_deplibs_F77=unknown + hardcode_automatic_F77=no + module_cmds_F77= + module_expsym_cmds_F77= + always_export_symbols_F77=no + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms_F77= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs_F77=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_F77= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_F77=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + ld_shlibs_F77=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_F77=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_F77=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_F77='-L$libdir' + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=no + enable_shared_with_static_runtimes_F77=yes + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_F77=no + fi + ;; + + interix3*) + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + ld_shlibs_F77=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_F77=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_F77=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_F77=no + fi + ;; + esac + + if test "$ld_shlibs_F77" = no; then + runpath_var= + hardcode_libdir_flag_spec_F77= + export_dynamic_flag_spec_F77= + whole_archive_flag_spec_F77= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag_F77=unsupported + always_export_symbols_F77=yes + archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L_F77=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct_F77=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_F77='' + hardcode_direct_F77=yes + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct_F77=yes + else + # We have old collect2 + hardcode_direct_F77=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_F77=yes + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_libdir_separator_F77= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_F77=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_F77='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF + program main + + end +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_F77="-z nodefs" + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF + program main + + end +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_F77=' ${wl}-bernotok' + allow_undefined_flag_F77=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_F77='$convenience' + archive_cmds_need_lc_F77=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + # see comment about different semantics on the GNU ld section + ld_shlibs_F77=no + ;; + + bsdi[45]*) + export_dynamic_flag_spec_F77=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_F77=' ' + allow_undefined_flag_F77=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_F77='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_F77=yes + ;; + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc_F77=no + hardcode_direct_F77=no + hardcode_automatic_F77=yes + hardcode_shlibpath_var_F77=unsupported + whole_archive_flag_spec_F77='' + link_all_deplibs_F77=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs_F77=no + ;; + esac + fi + ;; + + dgux*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_shlibpath_var_F77=no + ;; + + freebsd1*) + ld_shlibs_F77=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | kfreebsd*-gnu | dragonfly*) + archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + hardcode_direct_F77=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_F77=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_F77='+b $libdir' + hardcode_direct_F77=no + hardcode_shlibpath_var_F77=no + ;; + *) + hardcode_direct_F77=yes + export_dynamic_flag_spec_F77='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_F77=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' + fi + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + link_all_deplibs_F77=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + newsos6) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + hardcode_shlibpath_var_F77=no + ;; + + openbsd*) + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_minus_L_F77=yes + allow_undefined_flag_F77=unsupported + archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag_F77=' -expect_unresolved \*' + archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_F77=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag_F77=' -expect_unresolved \*' + archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec_F77='-rpath $libdir' + fi + hardcode_libdir_separator_F77=: + ;; + + solaris*) + no_undefined_flag_F77=' -z text' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + wlarc='' + archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + hardcode_libdir_flag_spec_F77='-R$libdir' + hardcode_shlibpath_var_F77=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; + esac + link_all_deplibs_F77=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_direct_F77=yes + hardcode_minus_L_F77=yes + hardcode_shlibpath_var_F77=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds_F77='$CC -r -o $output$reload_objs' + hardcode_direct_F77=no + ;; + motorola) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_F77=no + ;; + + sysv4.3*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + export_dynamic_flag_spec_F77='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_F77=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs_F77=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_F77='${wl}-z,text' + archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_F77='${wl}-z,text' + allow_undefined_flag_F77='${wl}-z,nodefs' + archive_cmds_need_lc_F77=no + hardcode_shlibpath_var_F77=no + hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_F77=':' + link_all_deplibs_F77=yes + export_dynamic_flag_spec_F77='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-L$libdir' + hardcode_shlibpath_var_F77=no + ;; + + *) + ld_shlibs_F77=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } +test "$ld_shlibs_F77" = no && can_build_shared=no + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_F77" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_F77=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_F77 in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_F77 + pic_flag=$lt_prog_compiler_pic_F77 + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_F77 + allow_undefined_flag_F77= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_F77=no + else + archive_cmds_need_lc_F77=yes + fi + allow_undefined_flag_F77=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } + ;; + esac + fi + ;; +esac + +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + 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}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 16037 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +knetbsd*-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='GNU ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx*) + 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=yes + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_F77= +if test -n "$hardcode_libdir_flag_spec_F77" || \ + test -n "$runpath_var_F77" || \ + test "X$hardcode_automatic_F77" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_F77" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && + test "$hardcode_minus_L_F77" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_F77=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_F77=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_F77=unsupported +fi +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } + +if test "$hardcode_action_F77" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_F77 \ + CC_F77 \ + LD_F77 \ + lt_prog_compiler_wl_F77 \ + lt_prog_compiler_pic_F77 \ + lt_prog_compiler_static_F77 \ + lt_prog_compiler_no_builtin_flag_F77 \ + export_dynamic_flag_spec_F77 \ + thread_safe_flag_spec_F77 \ + whole_archive_flag_spec_F77 \ + enable_shared_with_static_runtimes_F77 \ + old_archive_cmds_F77 \ + old_archive_from_new_cmds_F77 \ + predep_objects_F77 \ + postdep_objects_F77 \ + predeps_F77 \ + postdeps_F77 \ + compiler_lib_search_path_F77 \ + archive_cmds_F77 \ + archive_expsym_cmds_F77 \ + postinstall_cmds_F77 \ + postuninstall_cmds_F77 \ + old_archive_from_expsyms_cmds_F77 \ + allow_undefined_flag_F77 \ + no_undefined_flag_F77 \ + export_symbols_cmds_F77 \ + hardcode_libdir_flag_spec_F77 \ + hardcode_libdir_flag_spec_ld_F77 \ + hardcode_libdir_separator_F77 \ + hardcode_automatic_F77 \ + module_cmds_F77 \ + module_expsym_cmds_F77 \ + lt_cv_prog_compiler_c_o_F77 \ + exclude_expsyms_F77 \ + include_expsyms_F77; do + + case $var in + old_archive_cmds_F77 | \ + old_archive_from_new_cmds_F77 | \ + archive_cmds_F77 | \ + archive_expsym_cmds_F77 | \ + module_cmds_F77 | \ + module_expsym_cmds_F77 | \ + old_archive_from_expsyms_cmds_F77 | \ + export_symbols_cmds_F77 | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_F77 + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_compiler_F77 + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_F77 + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_F77 + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_F77 + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_F77 +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_F77 + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_F77 +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_F77 +archive_expsym_cmds=$lt_archive_expsym_cmds_F77 +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_F77 +module_expsym_cmds=$lt_module_expsym_cmds_F77 + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_F77 + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_F77 + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_F77 + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_F77 + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_F77 + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_F77 + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_F77 + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77 + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_F77 + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_F77 + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_F77 + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_F77 + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_F77" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_F77 + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_F77 + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_F77 + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_F77 + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + else + tagname="" + fi + ;; + + GCJ) + if test -n "$GCJ" && test "X$GCJ" != "Xno"; then + + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +objext_GCJ=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}\n" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${GCJ-"gcj"} +compiler=$CC +compiler_GCJ=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +archive_cmds_need_lc_GCJ=no + +old_archive_cmds_GCJ=$old_archive_cmds + + +lt_prog_compiler_no_builtin_flag_GCJ= + +if test "$GCC" = yes; then + lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' + + +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:16811: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:16815: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then + lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" +else + : +fi + +fi + +lt_prog_compiler_wl_GCJ= +lt_prog_compiler_pic_GCJ= +lt_prog_compiler_static_GCJ= + +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } + + if test "$GCC" = yes; then + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_static_GCJ='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_GCJ='-Bstatic' + fi + ;; + + amigaos*) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' + ;; + + beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic_GCJ='-fno-common' + ;; + + interix3*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared_GCJ=no + enable_shared=no + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic_GCJ=-Kconform_pic + fi + ;; + + hpux*) + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; + esac + ;; + + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl_GCJ='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static_GCJ='-Bstatic' + else + lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' + fi + ;; + darwin*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + case $cc_basename in + xlc*) + lt_prog_compiler_pic_GCJ='-qnocommon' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + esac + ;; + + mingw* | pw32* | os2*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic_GCJ='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl_GCJ='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static_GCJ='-non_shared' + ;; + + newsos6) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + linux*) + case $cc_basename in + icc* | ecc*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-fpic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl_GCJ='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; + esac + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl_GCJ='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static_GCJ='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + case $cc_basename in + f77* | f90* | f95*) + lt_prog_compiler_wl_GCJ='-Qoption ld ';; + *) + lt_prog_compiler_wl_GCJ='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl_GCJ='-Qoption ld ' + lt_prog_compiler_pic_GCJ='-PIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic_GCJ='-Kconform_pic' + lt_prog_compiler_static_GCJ='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no + ;; + + uts4*) + lt_prog_compiler_pic_GCJ='-pic' + lt_prog_compiler_static_GCJ='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared_GCJ=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic_GCJ"; then + +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_pic_works_GCJ=no + ac_outfile=conftest.$ac_objext + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic_GCJ" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -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:17079: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:17083: \$? = $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. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_pic_works_GCJ=yes + fi + fi + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } + +if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then + case $lt_prog_compiler_pic_GCJ in + "" | " "*) ;; + *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; + esac +else + lt_prog_compiler_pic_GCJ= + lt_prog_compiler_can_build_shared_GCJ=no +fi + +fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic_GCJ= + ;; + *) + lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" + ;; +esac + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_prog_compiler_static_works_GCJ=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_prog_compiler_static_works_GCJ=yes + fi + else + lt_prog_compiler_static_works_GCJ=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" + +fi +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; } + +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then + : +else + lt_prog_compiler_static_GCJ= +fi + + +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + lt_cv_prog_compiler_c_o_GCJ=no + $rm -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -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:17183: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:17187: \$? = $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 + # So say no if there are warnings + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o_GCJ=yes + fi + fi + chmod u+w . 2>&5 + $rm conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files + $rm out/* && rmdir out + cd .. + rmdir conftest + $rm conftest* + +fi +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } + + +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } + if test "$hard_links" = no; then + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } + + runpath_var= + allow_undefined_flag_GCJ= + enable_shared_with_static_runtimes_GCJ=no + archive_cmds_GCJ= + archive_expsym_cmds_GCJ= + old_archive_From_new_cmds_GCJ= + old_archive_from_expsyms_cmds_GCJ= + export_dynamic_flag_spec_GCJ= + whole_archive_flag_spec_GCJ= + thread_safe_flag_spec_GCJ= + hardcode_libdir_flag_spec_GCJ= + hardcode_libdir_flag_spec_ld_GCJ= + hardcode_libdir_separator_GCJ= + hardcode_direct_GCJ=no + hardcode_minus_L_GCJ=no + hardcode_shlibpath_var_GCJ=unsupported + link_all_deplibs_GCJ=unknown + hardcode_automatic_GCJ=no + module_cmds_GCJ= + module_expsym_cmds_GCJ= + always_export_symbols_GCJ=no + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms_GCJ= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + extract_expsyms_cmds= + # Just being paranoid about ensuring that cc_basename is set. + for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + + case $host_os in + cygwin* | mingw* | pw32*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + ld_shlibs_GCJ=yes + if test "$with_gnu_ld" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + whole_archive_flag_spec_GCJ= + fi + supports_anon_versioning=no + case `$LD -v 2>/dev/null` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix3* | aix4* | aix5*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs_GCJ=no + cat <&2 + +*** Warning: the GNU linker, at least up to release 2.9.1, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. + +EOF + fi + ;; + + amigaos*) + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + + # Samuel A. Falvo II reports + # that the semantics of dynamic libraries on AmigaOS, at least up + # to version 4, is to share data among multiple programs linked + # with the same dynamic library. Since this doesn't match the + # behavior of shared libraries on other platforms, we can't use + # them. + ld_shlibs_GCJ=no + ;; + + beos*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag_GCJ=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + + cygwin* | mingw* | pw32*) + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec_GCJ='-L$libdir' + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=no + enable_shared_with_static_runtimes_GCJ=yes + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs_GCJ=no + fi + ;; + + interix3*) + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + tmp_addflag= + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test $supports_anon_versioning = yes; then + archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + else + ld_shlibs_GCJ=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then + ld_shlibs_GCJ=no + cat <&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs_GCJ=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs_GCJ=no + fi + ;; + esac + + if test "$ld_shlibs_GCJ" = no; then + runpath_var= + hardcode_libdir_flag_spec_GCJ= + export_dynamic_flag_spec_GCJ= + whole_archive_flag_spec_GCJ= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag_GCJ=unsupported + always_export_symbols_GCJ=yes + archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L_GCJ=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct_GCJ=unsupported + fi + ;; + + aix4* | aix5*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + if $NM -V 2>&1 | grep 'GNU' > /dev/null; then + export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix5*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds_GCJ='' + hardcode_direct_GCJ=yes + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && \ + strings "$collect2name" | grep resolve_lib_name >/dev/null + then + # We have reworked collect2 + hardcode_direct_GCJ=yes + else + # We have old collect2 + hardcode_direct_GCJ=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L_GCJ=yes + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_libdir_separator_GCJ= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols_GCJ=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag_GCJ='-berok' + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib' + allow_undefined_flag_GCJ="-z nodefs" + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an empty executable. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + + hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag_GCJ=' ${wl}-bernotok' + allow_undefined_flag_GCJ=' ${wl}-berok' + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec_GCJ='$convenience' + archive_cmds_need_lc_GCJ=yes + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + # see comment about different semantics on the GNU ld section + ld_shlibs_GCJ=no + ;; + + bsdi[45]*) + export_dynamic_flag_spec_GCJ=-rdynamic + ;; + + cygwin* | mingw* | pw32*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec_GCJ=' ' + allow_undefined_flag_GCJ=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_From_new_cmds_GCJ='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes_GCJ=yes + ;; + + darwin* | rhapsody*) + case $host_os in + rhapsody* | darwin1.[012]) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' + ;; + *) # Darwin 1.3 on + if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + else + case ${MACOSX_DEPLOYMENT_TARGET} in + 10.[012]) + allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + 10.*) + allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' + ;; + esac + fi + ;; + esac + archive_cmds_need_lc_GCJ=no + hardcode_direct_GCJ=no + hardcode_automatic_GCJ=yes + hardcode_shlibpath_var_GCJ=unsupported + whole_archive_flag_spec_GCJ='' + link_all_deplibs_GCJ=yes + if test "$GCC" = yes ; then + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case $cc_basename in + xlc*) + output_verbose_link_cmd='echo' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + ld_shlibs_GCJ=no + ;; + esac + fi + ;; + + dgux*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_shlibpath_var_GCJ=no + ;; + + freebsd1*) + ld_shlibs_GCJ=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | kfreebsd*-gnu | dragonfly*) + archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + hpux9*) + if test "$GCC" = yes; then + archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + hardcode_direct_GCJ=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_libdir_flag_spec_ld_GCJ='+b $libdir' + hardcode_direct_GCJ=no + hardcode_shlibpath_var_GCJ=no + ;; + *) + hardcode_direct_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L_GCJ=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' + fi + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + link_all_deplibs_GCJ=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + newsos6) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + hardcode_shlibpath_var_GCJ=no + ;; + + openbsd*) + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi + ;; + + os2*) + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_minus_L_GCJ=yes + allow_undefined_flag_GCJ=unsupported + archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + allow_undefined_flag_GCJ=' -expect_unresolved \*' + archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + fi + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator_GCJ=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' + archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' + else + allow_undefined_flag_GCJ=' -expect_unresolved \*' + archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ + $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec_GCJ='-rpath $libdir' + fi + hardcode_libdir_separator_GCJ=: + ;; + + solaris*) + no_undefined_flag_GCJ=' -z text' + if test "$GCC" = yes; then + wlarc='${wl}' + archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' + else + wlarc='' + archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' + fi + hardcode_libdir_flag_spec_GCJ='-R$libdir' + hardcode_shlibpath_var_GCJ=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine linker options so we + # cannot just pass the convience library names through + # without $wl, iff we do not link with $LD. + # Luckily, gcc supports the same syntax we need for Sun Studio. + # Supported since Solaris 2.6 (maybe 2.5.1?) + case $wlarc in + '') + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + *) + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; + esac ;; + esac + link_all_deplibs_GCJ=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_direct_GCJ=yes + hardcode_minus_L_GCJ=yes + hardcode_shlibpath_var_GCJ=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds_GCJ='$CC -r -o $output$reload_objs' + hardcode_direct_GCJ=no + ;; + motorola) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var_GCJ=no + ;; + + sysv4.3*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + export_dynamic_flag_spec_GCJ='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var_GCJ=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs_GCJ=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + no_undefined_flag_GCJ='${wl}-z,text' + archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag_GCJ='${wl}-z,text' + allow_undefined_flag_GCJ='${wl}-z,nodefs' + archive_cmds_need_lc_GCJ=no + hardcode_shlibpath_var_GCJ=no + hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator_GCJ=':' + link_all_deplibs_GCJ=yes + export_dynamic_flag_spec_GCJ='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-L$libdir' + hardcode_shlibpath_var_GCJ=no + ;; + + *) + ld_shlibs_GCJ=no + ;; + esac + fi + +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } +test "$ld_shlibs_GCJ" = no && can_build_shared=no + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc_GCJ" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc_GCJ=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds_GCJ in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + $rm conftest* + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl_GCJ + pic_flag=$lt_prog_compiler_pic_GCJ + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ + allow_undefined_flag_GCJ= + if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + then + archive_cmds_need_lc_GCJ=no + else + archive_cmds_need_lc_GCJ=yes + fi + allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $rm conftest* + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } + ;; + esac + fi + ;; +esac + +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix4* | aix5*) + version_type=linux + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32*) + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $rm \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + ;; + + *) + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. + if test "$GCC" = yes; then + sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` + else + sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' + fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + 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 + ;; + +freebsd1*) + dynamic_linker=no + ;; + +kfreebsd*-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='GNU ld.so' + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[123]*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + 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}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + freebsd*) # from 4.6 on + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +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 + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. + postinstall_cmds='chmod 555 $lib' + ;; + +interix3*) + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be Linux ELF. +linux*) + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 18648 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +knetbsd*-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='GNU ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +nto-qnx*) + 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=yes + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +solaris*) + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + export_dynamic_flag_spec='${wl}-Blargedynsym' + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + shlibpath_overrides_runpath=no + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + shlibpath_overrides_runpath=yes + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +uts4*) + version_type=linux + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +hardcode_action_GCJ= +if test -n "$hardcode_libdir_flag_spec_GCJ" || \ + test -n "$runpath_var_GCJ" || \ + test "X$hardcode_automatic_GCJ" = "Xyes" ; then + + # We can hardcode non-existant directories. + if test "$hardcode_direct_GCJ" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no && + test "$hardcode_minus_L_GCJ" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action_GCJ=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action_GCJ=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action_GCJ=unsupported +fi +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } + +if test "$hardcode_action_GCJ" = relink; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_GCJ \ + CC_GCJ \ + LD_GCJ \ + lt_prog_compiler_wl_GCJ \ + lt_prog_compiler_pic_GCJ \ + lt_prog_compiler_static_GCJ \ + lt_prog_compiler_no_builtin_flag_GCJ \ + export_dynamic_flag_spec_GCJ \ + thread_safe_flag_spec_GCJ \ + whole_archive_flag_spec_GCJ \ + enable_shared_with_static_runtimes_GCJ \ + old_archive_cmds_GCJ \ + old_archive_from_new_cmds_GCJ \ + predep_objects_GCJ \ + postdep_objects_GCJ \ + predeps_GCJ \ + postdeps_GCJ \ + compiler_lib_search_path_GCJ \ + archive_cmds_GCJ \ + archive_expsym_cmds_GCJ \ + postinstall_cmds_GCJ \ + postuninstall_cmds_GCJ \ + old_archive_from_expsyms_cmds_GCJ \ + allow_undefined_flag_GCJ \ + no_undefined_flag_GCJ \ + export_symbols_cmds_GCJ \ + hardcode_libdir_flag_spec_GCJ \ + hardcode_libdir_flag_spec_ld_GCJ \ + hardcode_libdir_separator_GCJ \ + hardcode_automatic_GCJ \ + module_cmds_GCJ \ + module_expsym_cmds_GCJ \ + lt_cv_prog_compiler_c_o_GCJ \ + exclude_expsyms_GCJ \ + include_expsyms_GCJ; do + + case $var in + old_archive_cmds_GCJ | \ + old_archive_from_new_cmds_GCJ | \ + archive_cmds_GCJ | \ + archive_expsym_cmds_GCJ | \ + module_cmds_GCJ | \ + module_expsym_cmds_GCJ | \ + old_archive_from_expsyms_cmds_GCJ | \ + export_symbols_cmds_GCJ | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_GCJ + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_compiler_GCJ + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_GCJ + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_GCJ + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_GCJ + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_GCJ +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_GCJ + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_GCJ +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_GCJ +archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_GCJ +module_expsym_cmds=$lt_module_expsym_cmds_GCJ + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_GCJ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_GCJ + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_GCJ + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_GCJ + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_GCJ + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_GCJ + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_GCJ + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_GCJ + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_GCJ + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_GCJ + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_GCJ + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_GCJ" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_GCJ + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_GCJ + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_GCJ + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_GCJ + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + else + tagname="" + fi + ;; + + RC) + + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +objext_RC=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* + +ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* + + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +CC=${RC-"windres"} +compiler=$CC +compiler_RC=$CC +for cc_temp in $compiler""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` + +lt_cv_prog_compiler_c_o_RC=yes + +# The else clause should only fire when bootstrapping the +# libtool distribution, otherwise you forgot to ship ltmain.sh +# with your package, and you will get complaints that there are +# no rules to generate ltmain.sh. +if test -f "$ltmain"; then + # See if we are running on zsh, and set the options which allow our commands through + # without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + # Now quote all the things that may contain metacharacters while being + # careful not to overquote the AC_SUBSTed values. We take copies of the + # variables and quote the copies for generation of the libtool script. + for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \ + SED SHELL STRIP \ + libname_spec library_names_spec soname_spec extract_expsyms_cmds \ + old_striplib striplib file_magic_cmd finish_cmds finish_eval \ + deplibs_check_method reload_flag reload_cmds need_locks \ + lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ + lt_cv_sys_global_symbol_to_c_name_address \ + sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ + old_postinstall_cmds old_postuninstall_cmds \ + compiler_RC \ + CC_RC \ + LD_RC \ + lt_prog_compiler_wl_RC \ + lt_prog_compiler_pic_RC \ + lt_prog_compiler_static_RC \ + lt_prog_compiler_no_builtin_flag_RC \ + export_dynamic_flag_spec_RC \ + thread_safe_flag_spec_RC \ + whole_archive_flag_spec_RC \ + enable_shared_with_static_runtimes_RC \ + old_archive_cmds_RC \ + old_archive_from_new_cmds_RC \ + predep_objects_RC \ + postdep_objects_RC \ + predeps_RC \ + postdeps_RC \ + compiler_lib_search_path_RC \ + archive_cmds_RC \ + archive_expsym_cmds_RC \ + postinstall_cmds_RC \ + postuninstall_cmds_RC \ + old_archive_from_expsyms_cmds_RC \ + allow_undefined_flag_RC \ + no_undefined_flag_RC \ + export_symbols_cmds_RC \ + hardcode_libdir_flag_spec_RC \ + hardcode_libdir_flag_spec_ld_RC \ + hardcode_libdir_separator_RC \ + hardcode_automatic_RC \ + module_cmds_RC \ + module_expsym_cmds_RC \ + lt_cv_prog_compiler_c_o_RC \ + exclude_expsyms_RC \ + include_expsyms_RC; do + + case $var in + old_archive_cmds_RC | \ + old_archive_from_new_cmds_RC | \ + archive_cmds_RC | \ + archive_expsym_cmds_RC | \ + module_cmds_RC | \ + module_expsym_cmds_RC | \ + old_archive_from_expsyms_cmds_RC | \ + export_symbols_cmds_RC | \ + extract_expsyms_cmds | reload_cmds | finish_cmds | \ + postinstall_cmds | postuninstall_cmds | \ + old_postinstall_cmds | old_postuninstall_cmds | \ + sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) + # Double-quote double-evaled strings. + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" + ;; + *) + eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" + ;; + esac + done + + case $lt_echo in + *'\$0 --fallback-echo"') + lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` + ;; + esac + +cfgfile="$ofile" + + cat <<__EOF__ >> "$cfgfile" +# ### BEGIN LIBTOOL TAG CONFIG: $tagname + +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_RC + +# Whether or not to disallow shared libs when runtime libs are static +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# An echo program that does not interpret backslashes. +echo=$lt_echo + +# The archiver. +AR=$lt_AR +AR_FLAGS=$lt_AR_FLAGS + +# A C compiler. +LTCC=$lt_LTCC + +# LTCC compiler flags. +LTCFLAGS=$lt_LTCFLAGS + +# A language-specific compiler. +CC=$lt_compiler_RC + +# Is the compiler the GNU C compiler? +with_gcc=$GCC_RC + +# An ERE matcher. +EGREP=$lt_EGREP + +# The linker used to build libraries. +LD=$lt_LD_RC + +# Whether we need hard or soft links. +LN_S=$lt_LN_S + +# A BSD-compatible nm program. +NM=$lt_NM + +# A symbol stripping program +STRIP=$lt_STRIP + +# Used to examine libraries when file_magic_cmd begins "file" +MAGIC_CMD=$MAGIC_CMD + +# Used on cygwin: DLL creation program. +DLLTOOL="$DLLTOOL" + +# Used on cygwin: object dumper. +OBJDUMP="$OBJDUMP" + +# Used on cygwin: assembler. +AS="$AS" + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_RC + +# Object file suffix (normally "o"). +objext="$ac_objext" + +# Old archive suffix (normally "a"). +libext="$libext" + +# Shared library suffix (normally ".so"). +shrext_cmds='$shrext_cmds' + +# Executable file suffix (normally ""). +exeext="$exeext" + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_RC +pic_mode=$pic_mode + +# What is the maximum length of a command? +max_cmd_len=$lt_cv_sys_max_cmd_len + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Do we need the lib prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_RC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC + +# Compiler flag to generate thread-safe objects. +thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC + +# Library versioning type. +version_type=$version_type + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME. +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Commands used to build and install an old-style archive. +RANLIB=$lt_RANLIB +old_archive_cmds=$lt_old_archive_cmds_RC +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC + +# Commands used to build and install a shared archive. +archive_cmds=$lt_archive_cmds_RC +archive_expsym_cmds=$lt_archive_expsym_cmds_RC +postinstall_cmds=$lt_postinstall_cmds +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to build a loadable module (assumed same as above if empty) +module_cmds=$lt_module_cmds_RC +module_expsym_cmds=$lt_module_expsym_cmds_RC + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + +# Dependencies to place before the objects being linked to create a +# shared library. +predep_objects=$lt_predep_objects_RC + +# Dependencies to place after the objects being linked to create a +# shared library. +postdep_objects=$lt_postdep_objects_RC + +# Dependencies to place before the objects being linked to create a +# shared library. +predeps=$lt_predeps_RC + +# Dependencies to place after the objects being linked to create a +# shared library. +postdeps=$lt_postdeps_RC + +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_RC + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method == file_magic. +file_magic_cmd=$lt_file_magic_cmd + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_RC + +# Flag that forces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_RC + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# Same as above, but a single script fragment to be evaled but not shown. +finish_eval=$lt_finish_eval + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm in a C name address pair +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# This is the shared library runtime path variable. +runpath_var=$runpath_var + +# This is the shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_RC + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC + +# If ld is used when linking, flag to hardcode \$libdir into +# a binary during linking. This must work even if \$libdir does +# not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC + +# Whether we need a single -rpath flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC + +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the +# resulting binary. +hardcode_direct=$hardcode_direct_RC + +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the +# resulting binary. +hardcode_minus_L=$hardcode_minus_L_RC + +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into +# the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_RC + +# Set to yes if building a shared library automatically hardcodes DIR into the library +# and all subsequent libraries and executables linked against it. +hardcode_automatic=$hardcode_automatic_RC + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at relink time. +variables_saved_for_relink="$variables_saved_for_relink" + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_RC + +# Compile-time system search path for libraries +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Run-time system search path for libraries +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec + +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path="$fix_srcfile_path_RC" + +# Set to yes if exported symbols are required. +always_export_symbols=$always_export_symbols_RC + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_RC + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_RC + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_RC + +# ### END LIBTOOL TAG CONFIG: $tagname + +__EOF__ + + +else + # If there is no Makefile yet, we rely on a make rule to execute + # `config.status --recheck' to rerun these tests and create the + # libtool script then. + ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` + if test -f "$ltmain_in"; then + test -f Makefile && make "$ltmain" + fi +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC="$lt_save_CC" + + ;; + + *) + { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + # Append the new tag name to the list of available tags. + if test -n "$tagname" ; then + available_tags="$available_tags $tagname" + fi + fi + done + IFS="$lt_save_ifs" + + # Now substitute the updated list of available tags. + if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then + mv "${ofile}T" "$ofile" + chmod +x "$ofile" + else + rm -f "${ofile}T" + { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { (exit 1); exit 1; }; } + fi +fi + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + +# Prevent multiple expansion + + + + + + + + + + + + + + + + + + + + + + +for ac_prog in gm4 m4 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_M4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$M4"; then + ac_cv_prog_M4="$M4" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_M4="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +M4=$ac_cv_prog_M4 +if test -n "$M4"; then + { echo "$as_me:$LINENO: result: $M4" >&5 +echo "${ECHO_T}$M4" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$M4" && break +done +test -n "$M4" || M4="m4" + + +if test "$M4" = "m4"; then + { echo "$as_me:$LINENO: checking whether m4 is GNU m4" >&5 +echo $ECHO_N "checking whether m4 is GNU m4... $ECHO_C" >&6; } + if $M4 --version /dev/null | grep '^GNU Mm4 ' >/dev/null ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + if test "$host_vendor" = "sun"; then + { { echo "$as_me:$LINENO: error: SUN m4 does not work for building gtkmm. +Please install GNU m4." >&5 +echo "$as_me: error: SUN m4 does not work for building gtkmm. +Please install GNU m4." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi + + + +{ echo "$as_me:$LINENO: checking whether make is GNU Make" >&5 +echo $ECHO_N "checking whether make is GNU Make... $ECHO_C" >&6; } +if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + if test "$host_vendor" = "sun" ; then + { { echo "$as_me:$LINENO: error: SUN make does not work for building gtkmm. +Please install GNU make." >&5 +echo "$as_me: error: SUN make does not work for building gtkmm. +Please install GNU make." >&2;} + { (exit 1); exit 1; }; } + fi +fi + + +# This macro is installed by glibmm +# Doxygen needs the path to the installed perl. + + glibmm_perl_result=no + + for ac_prog in perl perl5 +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PERL_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PERL_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL_PATH="$PERL_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL_PATH="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PERL_PATH=$ac_cv_path_PERL_PATH +if test -n "$PERL_PATH"; then + { echo "$as_me:$LINENO: result: $PERL_PATH" >&5 +echo "${ECHO_T}$PERL_PATH" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$PERL_PATH" && break +done +test -n "$PERL_PATH" || PERL_PATH="not found" + + + if test "x$PERL_PATH" != "xnot found"; then + { + { echo "$as_me:$LINENO: checking whether Perl is new enough" >&5 +echo $ECHO_N "checking whether Perl is new enough... $ECHO_C" >&6; } +if test "${glibmm_cv_perl_version_5_6_0+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + glibmm_cv_perl_version_5_6_0=no + "$PERL_PATH" -e "require v5.6.0; exit 0;" >/dev/null 2>&1 && glibmm_cv_perl_version_5_6_0=yes + +fi +{ echo "$as_me:$LINENO: result: $glibmm_cv_perl_version_5_6_0" >&5 +echo "${ECHO_T}$glibmm_cv_perl_version_5_6_0" >&6; } + test "x${glibmm_cv_perl_version_5_6_0}" = xyes && glibmm_perl_result=yes + } + else + { + # Make sure we have something sensible, even if it doesn't work. + PERL_PATH=perl + } + fi + + if test "x$glibmm_perl_result" = xno && test "x$USE_MAINTAINER_MODE" = xyes; then + { + { { echo "$as_me:$LINENO: error: +*** Perl >= 5.6.0 is required for building $PACKAGE in maintainer-mode. +" >&5 +echo "$as_me: error: +*** Perl >= 5.6.0 is required for building $PACKAGE in maintainer-mode. +" >&2;} + { (exit 1); exit 1; }; } + } + fi + + + + +######################################################################### +# Function checks +######################################################################### + +{ echo "$as_me:$LINENO: checking for mkfifo" >&5 +echo $ECHO_N "checking for mkfifo... $ECHO_C" >&6; } +if test "${ac_cv_func_mkfifo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define mkfifo to an innocuous variant, in case declares mkfifo. + For example, HP-UX 11i declares gettimeofday. */ +#define mkfifo innocuous_mkfifo + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char mkfifo (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef mkfifo + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mkfifo (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_mkfifo || defined __stub___mkfifo +choke me +#endif + +int +main () +{ +return mkfifo (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_mkfifo=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_mkfifo=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_mkfifo" >&5 +echo "${ECHO_T}$ac_cv_func_mkfifo" >&6; } +if test $ac_cv_func_mkfifo = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_MKFIFO 1 +_ACEOF + +fi + + +# functions used in demos/gtk-demo. Undefined in config.h. +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +{ echo "$as_me:$LINENO: checking for flockfile" >&5 +echo $ECHO_N "checking for flockfile... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +int +main () +{ + +flockfile (NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FLOCKFILE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for flockfile with a custom prototype" >&5 +echo $ECHO_N "checking for flockfile with a custom prototype... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + +extern "C" void flockfile (FILE *); +int +main () +{ + +flockfile (NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FLOCKFILE 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define NEED_FLOCKFILE_PROTO 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: not available" >&5 +echo "${ECHO_T}not available" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +{ echo "$as_me:$LINENO: checking for funlockfile" >&5 +echo $ECHO_N "checking for funlockfile... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +int +main () +{ + +funlockfile (NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FUNLOCKFILE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for funlockfile with a custom prototype" >&5 +echo $ECHO_N "checking for funlockfile with a custom prototype... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + +extern "C" void funlockfile (FILE *); +int +main () +{ + +funlockfile (NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FUNLOCKFILE 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define NEED_FUNLOCKFILE_PROTO 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: not available" >&5 +echo "${ECHO_T}not available" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +{ echo "$as_me:$LINENO: checking for getc_unlocked" >&5 +echo $ECHO_N "checking for getc_unlocked... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +int +main () +{ + +getc_unlocked (NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETC_UNLOCKED 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for getc_unlocked with a custom prototype" >&5 +echo $ECHO_N "checking for getc_unlocked with a custom prototype... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include + +extern "C" int getc_unlocked (FILE *); +int +main () +{ + +getc_unlocked (NULL); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETC_UNLOCKED 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define NEED_GETC_UNLOCKED_PROTO 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: not available" >&5 +echo "${ECHO_T}not available" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +######################################################################### +# Dependancy checks +######################################################################### +gtkmm_min_glibmm_version=2.14.1 +gtkmm_min_gtk_version=2.12.0 +gtkmm_min_cairomm_version=1.1.12 + + +GLIBMM_LIBDIR=`pkg-config --variable=libdir glibmm-2.4` +GMMPROC_DIR=$GLIBMM_LIBDIR/glibmm-2.4/proc + +GMMPROC=$GMMPROC_DIR/gmmproc + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +fi + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for ATKMM" >&5 +echo $ECHO_N "checking for ATKMM... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$ATKMM_CFLAGS"; then + pkg_cv_ATKMM_CFLAGS="$ATKMM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} atk >= 1.9.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ATKMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$ATKMM_LIBS"; then + pkg_cv_ATKMM_LIBS="$ATKMM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} atk >= 1.9.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_ATKMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ATKMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0"` + else + ATKMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ATKMM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0) were not met: + +$ATKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ATKMM_CFLAGS +and ATKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0) were not met: + +$ATKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables ATKMM_CFLAGS +and ATKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ATKMM_CFLAGS +and ATKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables ATKMM_CFLAGS +and ATKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + ATKMM_CFLAGS=$pkg_cv_ATKMM_CFLAGS + ATKMM_LIBS=$pkg_cv_ATKMM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + + + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for PANGOMM" >&5 +echo $ECHO_N "checking for PANGOMM... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$PANGOMM_CFLAGS"; then + pkg_cv_PANGOMM_CFLAGS="$PANGOMM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} pangocairo >= 1.5.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PANGOMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$PANGOMM_LIBS"; then + pkg_cv_PANGOMM_LIBS="$PANGOMM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} pangocairo >= 1.5.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_PANGOMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PANGOMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2"` + else + PANGOMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$PANGOMM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2) were not met: + +$PANGOMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PANGOMM_CFLAGS +and PANGOMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2) were not met: + +$PANGOMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PANGOMM_CFLAGS +and PANGOMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PANGOMM_CFLAGS +and PANGOMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PANGOMM_CFLAGS +and PANGOMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + PANGOMM_CFLAGS=$pkg_cv_PANGOMM_CFLAGS + PANGOMM_LIBS=$pkg_cv_PANGOMM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + + + +# gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+. + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GDKMM" >&5 +echo $ECHO_N "checking for GDKMM... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GDKMM_CFLAGS"; then + pkg_cv_GDKMM_CFLAGS="$GDKMM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} gtk+-2.0 >= \${gtkmm_min_gtk_version}\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDKMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GDKMM_LIBS"; then + pkg_cv_GDKMM_LIBS="$GDKMM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} gtk+-2.0 >= \${gtkmm_min_gtk_version}\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GDKMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GDKMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}"` + else + GDKMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GDKMM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}) were not met: + +$GDKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GDKMM_CFLAGS +and GDKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}) were not met: + +$GDKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GDKMM_CFLAGS +and GDKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GDKMM_CFLAGS +and GDKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GDKMM_CFLAGS +and GDKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + GDKMM_CFLAGS=$pkg_cv_GDKMM_CFLAGS + GDKMM_LIBS=$pkg_cv_GDKMM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + + + +# Only check for gtk+-unix-print-2.0 on non-win32 platform, as +# gtk+-unix-print-2.0.pc is not always included in win32 installers. +if test x"$os_win32" = xyes; then + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GTKMM" >&5 +echo $ECHO_N "checking for GTKMM... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GTKMM_CFLAGS"; then + pkg_cv_GTKMM_CFLAGS="$GTKMM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} gtk+-2.0 >= \${gtkmm_min_gtk_version}\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTKMM_LIBS"; then + pkg_cv_GTKMM_LIBS="$GTKMM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} gtk+-2.0 >= \${gtkmm_min_gtk_version}\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}"` + else + GTKMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKMM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}) were not met: + +$GTKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}) were not met: + +$GTKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + GTKMM_CFLAGS=$pkg_cv_GTKMM_CFLAGS + GTKMM_LIBS=$pkg_cv_GTKMM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi +else + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GTKMM" >&5 +echo $ECHO_N "checking for GTKMM... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GTKMM_CFLAGS"; then + pkg_cv_GTKMM_CFLAGS="$GTKMM_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} gtk+-2.0 >= \${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= \${gtkmm_min_gtk_version}\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTKMM_LIBS"; then + pkg_cv_GTKMM_LIBS="$GTKMM_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glibmm-2.4 >= \${gtkmm_min_glibmm_version} cairomm-1.0 >= \${gtkmm_min_cairomm_version} gtk+-2.0 >= \${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= \${gtkmm_min_gtk_version}\"") >&5 + ($PKG_CONFIG --exists --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}"` + else + GTKMM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKMM_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}) were not met: + +$GTKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}) were not met: + +$GTKMM_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKMM_CFLAGS +and GTKMM_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + GTKMM_CFLAGS=$pkg_cv_GTKMM_CFLAGS + GTKMM_LIBS=$pkg_cv_GTKMM_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi +fi + + + +# gthread isn't a requirement, but we should use its CFLAGS if available. + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GTHREAD" >&5 +echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GTHREAD_CFLAGS"; then + pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.4.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.4.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTHREAD_LIBS"; then + pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.4.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.4.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.4.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 >= 2.4.0"` + else + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= 2.4.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTHREAD_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + GTHREAD_CFLAGS=''; GTHREAD_LIBS='' +elif test $pkg_failed = untried; then + GTHREAD_CFLAGS=''; GTHREAD_LIBS='' +else + GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS + GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + + + +######################################################################### +# C++ checks +######################################################################### +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$CXX" && break + done +fi +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CXX="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi +fi + + fi +fi +# Provide some information about the compiler. +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + + + +# Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE in the header. +#GLIBMM_PROG_CXX_SUN + +# Ensure MSVC-compatible struct packing convention is used when +# compiling for Win32 with gcc. +# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while +# gcc2 uses "-fnative-struct". +if test x"$os_win32" = xyes; then + if test x"$GCC" = xyes -a x"$GXX" = xyes; then + msnative_struct='' + { echo "$as_me:$LINENO: checking how to get MSVC-compatible struct packing" >&5 +echo $ECHO_N "checking how to get MSVC-compatible struct packing... $ECHO_C" >&6; } + if test -z "$ac_cv_prog_CC"; then + our_gcc="$CC" + else + our_gcc="$ac_cv_prog_CC" + fi + case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in + 2.) + if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then + msnative_struct='-fnative-struct' + fi + ;; + *) + if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then + msnative_struct='-mms-bitfields' + fi + ;; + esac + if test x"$msnative_struct" = x ; then + { echo "$as_me:$LINENO: result: no way" >&5 +echo "${ECHO_T}no way" >&6; } + { echo "$as_me:$LINENO: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&5 +echo "$as_me: WARNING: produced libraries might be incompatible with MSVC-compiled code" >&2;} + else + CXXFLAGS="$CXXFLAGS $msnative_struct" + { echo "$as_me:$LINENO: result: ${msnative_struct}" >&5 +echo "${ECHO_T}${msnative_struct}" >&6; } + fi + fi +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + +# Create a list of input directories for Doxygen. + +GTKMM_DOXYGEN_INPUT= +gtkmm_srcdir=`cd "$srcdir" >/dev/null && pwd` + +gtkmm_list="pango atk gdk gtk" +for gtkmm_sublib in $gtkmm_list +do + GTKMM_DOXYGEN_INPUT="$GTKMM_DOXYGEN_INPUT ${gtkmm_srcdir}/${gtkmm_sublib}/${gtkmm_sublib}mm/" +done + + + + +# Evaluate the --enable-warnings=level option. + + # Check whether --enable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval=$enable_warnings; gtkmm_enable_warnings="$enableval" +else + gtkmm_enable_warnings='minimum' +fi + + + { echo "$as_me:$LINENO: checking for compiler warning flags to use" >&5 +echo $ECHO_N "checking for compiler warning flags to use... $ECHO_C" >&6; } + + gtkmm_warning_flags='' + + case "$gtkmm_enable_warnings" in + minimum|yes) gtkmm_warning_flags='-Wall';; + maximum) gtkmm_warning_flags='-pedantic -W -Wall';; + hardcore) gtkmm_warning_flags='-pedantic -W -Wall -Werror';; + esac + + gtkmm_use_flags='' + + if test "x$gtkmm_warning_flags" != "x" + then + echo 'int foo() { return 0; }' > conftest.cc + + for flag in $gtkmm_warning_flags + do + # Test whether the compiler accepts the flag. GCC doesn't bail + # out when given an unsupported flag but prints a warning, so + # check the compiler output instead. + gtkmm_cxx_out="`$CXX $flag -c conftest.cc 2>&1`" + rm -f conftest.$OBJEXT + test "x${gtkmm_cxx_out}" = "x" && \ + gtkmm_use_flags="${gtkmm_use_flags:+$gtkmm_use_flags }$flag" + done + + rm -f conftest.cc + gtkmm_cxx_out='' + fi + + if test "x$gtkmm_use_flags" != "x" + then + for flag in $gtkmm_use_flags + do + case " $CXXFLAGS " in + *" $flag "*) ;; # don't add flags twice + *) CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$flag";; + esac + done + else + gtkmm_use_flags='none' + fi + + { echo "$as_me:$LINENO: result: $gtkmm_use_flags" >&5 +echo "${ECHO_T}$gtkmm_use_flags" >&6; } + + +# Add an --enable-use-deprecations configure option: +# Check whether --enable-deprecations was given. +if test "${enable_deprecations+set}" = set; then + enableval=$enable_deprecations; +else + enable_deprecations=no +fi + + +if test "x$enable_use_deprecations" = "xyes"; then + DISABLE_DEPRECATED_CFLAGS="\ +-DG_DISABLE_DEPRECATED \ +-DGDK_DISABLE_DEPRECATED \ +-DGTK_DISABLE_DEPRECATED \ +-DGDK_PIXBUF_DISABLE_DEPRECATED \ +-DGNOME_DISABLE_DEPRECATED" + +fi + +# Add an --enable-deprecated-api option: +# Check whether --enable-deprecated-api was given. +if test "${enable_deprecated_api+set}" = set; then + enableval=$enable_deprecated_api; +else + enable_deprecated_api=yes +fi + +if test "x$enable_deprecated_api" = "xyes"; then +{ echo "$as_me:$LINENO: WARNING: Deprecated API will be built, for backwards-compatibility." >&5 +echo "$as_me: WARNING: Deprecated API will be built, for backwards-compatibility." >&2;} +else + +cat >>confdefs.h <<\_ACEOF +#define PANGOMM_DISABLE_DEPRECATED 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define ATKMM_DISABLE_DEPRECATED 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define GDKMM_DISABLE_DEPRECATED 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define GTKMM_DISABLE_DEPRECATED 1 +_ACEOF + + DISABLE_DEPRECATED_API_CFLAGS="-DPANGOMM_DISABLE_DEPRECATED -DATKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED" + +{ echo "$as_me:$LINENO: WARNING: Deprecated API will not be built, breaking backwards-compatibility. Do not use this build for distribution packages." >&5 +echo "$as_me: WARNING: Deprecated API will not be built, breaking backwards-compatibility. Do not use this build for distribution packages." >&2;} +fi + + +# Check whether --enable-examples was given. +if test "${enable_examples+set}" = set; then + enableval=$enable_examples; +else + enable_examples=yes +fi + +if test "x$enable_examples" = "xyes"; then + EXAMPLE_SUBDIR="examples" + ac_config_files="$ac_config_files examples/Makefile examples/arrow/Makefile examples/base/Makefile examples/book/Makefile examples/book/alignment/Makefile examples/book/aspectframe/Makefile examples/book/box/Makefile examples/book/builder/Makefile examples/book/builder/basic/Makefile examples/book/builder/derived/Makefile examples/book/buttonbox/Makefile examples/book/buttons/Makefile examples/book/buttons/button/Makefile examples/book/buttons/checkbutton/Makefile examples/book/buttons/filechooserbutton/Makefile examples/book/buttons/radiobutton/Makefile examples/book/buttons/togglebutton/Makefile examples/book/clipboard/Makefile examples/book/clipboard/simple/Makefile examples/book/clipboard/ideal/Makefile examples/book/combobox/Makefile examples/book/combobox/text/Makefile examples/book/combobox/complex/Makefile examples/book/comboboxentry/Makefile examples/book/comboboxentry/text/Makefile examples/book/comboboxentry/complex/Makefile examples/book/custom/Makefile examples/book/custom/custom_container/Makefile examples/book/custom/custom_widget/Makefile examples/book/dialogs/Makefile examples/book/dialogs/aboutdialog/Makefile examples/book/dialogs/colorselectiondialog/Makefile examples/book/dialogs/filechooserdialog/Makefile examples/book/dialogs/fileselection/Makefile examples/book/dialogs/fontselectiondialog/Makefile examples/book/dialogs/messagedialog/Makefile examples/book/dialogs/simple/Makefile examples/book/drag_and_drop/Makefile examples/book/drawingarea/Makefile examples/book/drawingarea/simple/Makefile examples/book/drawingarea/curve/Makefile examples/book/drawingarea/arcs/Makefile examples/book/drawingarea/clock/Makefile examples/book/drawingarea/joins/Makefile examples/book/entry/Makefile examples/book/entry/completion/Makefile examples/book/entry/simple/Makefile examples/book/eventbox/Makefile examples/book/expander/Makefile examples/book/frame/Makefile examples/book/helloworld/Makefile examples/book/helloworld2/Makefile examples/book/iconview/Makefile examples/book/idle/Makefile examples/book/input/Makefile examples/book/label/Makefile examples/book/menus/Makefile examples/book/menus/main_menu/Makefile examples/book/menus/popup/Makefile examples/book/menus_and_toolbars/Makefile examples/book/notebook/Makefile examples/book/paned/Makefile examples/book/printing/Makefile examples/book/printing/advanced/Makefile examples/book/printing/simple/Makefile examples/book/progressbar/Makefile examples/book/recent_files/Makefile examples/book/range_widgets/Makefile examples/book/scrolledwindow/Makefile examples/book/signals/Makefile examples/book/signals/custom/Makefile examples/book/socket/Makefile examples/book/spinbutton/Makefile examples/book/statusicon/Makefile examples/book/table/Makefile examples/book/textview/Makefile examples/book/timeout/Makefile examples/book/toolbar/Makefile examples/book/tooltips/Makefile examples/book/treeview/Makefile examples/book/treeview/combo_renderer/Makefile examples/book/treeview/editable_cells/Makefile examples/book/treeview/list/Makefile examples/book/treeview/listviewtext/Makefile examples/book/treeview/tree/Makefile examples/book/treeview/drag_and_drop/Makefile examples/book/treeview/popup/Makefile examples/book/treeview/filter/Makefile examples/book/treeview/filter_modify/Makefile examples/book/treeview/modelsort/Makefile examples/book/update_ui/Makefile examples/calendar/Makefile examples/dnd/Makefile examples/exception/Makefile examples/gdk/Makefile examples/rulers/Makefile examples/statusbar/Makefile examples/stock/Makefile examples/tictactoe/Makefile examples/treemodelcustom/Makefile examples/window/Makefile" + +else + EXAMPLE_SUBDIR="" +fi + + + + +# Check whether --enable-demos was given. +if test "${enable_demos+set}" = set; then + enableval=$enable_demos; +else + enable_demos=yes +fi + +if test "x$enable_demos" = "xyes"; then + DEMO_SUBDIR="demos" + ac_config_files="$ac_config_files demos/Makefile demos/gtk-demo/Makefile" + +else + DEMO_SUBDIR="" +fi + + + + +#Offer the ability to omit some API from the library, +#to reduce the code size: +#Note that there are other options in glibmm, which affect gtkmm. + + # Check whether --enable-api-atkmm was given. +if test "${enable_api_atkmm+set}" = set; then + enableval=$enable_api_atkmm; gtkmm_enable_api_atkmm="$enableval" +else + gtkmm_enable_api_atkmm='yes' +fi + + + if test "x$gtkmm_enable_api_atkmm" = "xyes"; then + { + +cat >>confdefs.h <<\_ACEOF +#define GTKMM_ATKMM_ENABLED 1 +_ACEOF + + } + fi + + +if test "x$gtkmm_enable_api_atkmm" = "xyes"; then + ac_config_files="$ac_config_files atk/Makefile atk/atkmm-1.6.pc atk/src/Makefile atk/atkmm/Makefile atk/atkmm/private/Makefile" + + GTKMM_PC_ATKMM_DEP="atkmm-1.6" +else + GTKMM_PC_ATKMM_DEP="" +fi + + +#Allow us to test for atkmm support in Makefile.am files: + if test "x$gtkmm_enable_api_atkmm" = "xyes"; then + GTKMM_ATKMM_ENABLED_TRUE= + GTKMM_ATKMM_ENABLED_FALSE='#' +else + GTKMM_ATKMM_ENABLED_TRUE='#' + GTKMM_ATKMM_ENABLED_FALSE= +fi + + + + + # Check whether --enable-api-maemo-extensions was given. +if test "${enable_api_maemo_extensions+set}" = set; then + enableval=$enable_api_maemo_extensions; gtkmm_enable_api_maemo_extensions="$enableval" +else + gtkmm_enable_api_maemo_extensions='no' +fi + + + if test "x$gtkmm_enable_api_maemo_extensions" = "xyes"; then + { + +cat >>confdefs.h <<\_ACEOF +#define GTKMM_MAEMO_EXTENSIONS_ENABLED 1 +_ACEOF + + } + fi + + + +# Check whether --enable-docs was given. +if test "${enable_docs+set}" = set; then + enableval=$enable_docs; +else + enable_docs=yes +fi + +if test "x$enable_docs" = "xyes"; then + DOCS_SUBDIR="docs" + ac_config_files="$ac_config_files docs/Makefile docs/FAQ/Makefile docs/images/Makefile docs/tutorial/Makefile docs/tutorial/figures/Makefile docs/tutorial/icons/Makefile docs/reference/Makefile docs/reference/Doxyfile" + +else + DOCS_SUBDIR="" +fi + + +# Dummy conditional just to make automake-1.4 happy. +# We need an always-false condition in docs/Makefile.am. + if false; then + GTKMM_FALSE_TRUE= + GTKMM_FALSE_FALSE='#' +else + GTKMM_FALSE_TRUE='#' + GTKMM_FALSE_FALSE= +fi + + +# HACK: Assign a dummy in order to prevent execution of autoheader by the +# maintainer-mode rules. That would fail since we aren't using autoheader. +AUTOHEADER=':' + + +ac_config_files="$ac_config_files Makefile gdk/Makefile gdk/gdkmm-2.4.pc gdk/src/Makefile gdk/gdkmm/Makefile gdk/gdkmm/private/Makefile gtk/Makefile gtk/gtkmm-2.4.pc gtk/src/Makefile gtk/gtkmm/Makefile gtk/gtkmm/private/Makefile pango/Makefile pango/pangomm-1.4.pc pango/src/Makefile pango/pangomm/Makefile pango/pangomm/private/Makefile tools/Makefile tools/m4/Makefile tools/extra_defs_gen/Makefile" + + +ac_config_files="$ac_config_files tests/Makefile tests/child_widget/Makefile tests/child_widget2/Makefile tests/child_widget_managed/Makefile tests/refcount_dialog/Makefile tests/dialog/Makefile tests/dialog_deletethis/Makefile tests/delete_cpp_child/Makefile tests/main_with_options/Makefile tests/menu_destruction/Makefile tests/property_notification/Makefile tests/scrolledwindow/Makefile tests/wrap_existing/Makefile" + + +ac_config_files="$ac_config_files scripts/Makefile" + + +ac_config_files="$ac_config_files MSVC_Net2003/Makefile MSVC_Net2003/gendef/Makefile MSVC_Net2003/atkmm/Makefile MSVC_Net2003/atkmm/atkmm.rc MSVC_Net2003/pangomm/Makefile MSVC_Net2003/pangomm/pangomm.rc MSVC_Net2003/gdkmm/Makefile MSVC_Net2003/gdkmm/gdkmm.rc MSVC_Net2003/gtkmm/Makefile MSVC_Net2003/gtkmm/gtkmm.rc MSVC_Net2003/demos/Makefile MSVC_Net2003/demos/gtk-demo/Makefile MSVC_Net2003/examples/Makefile MSVC_Net2003/examples/arrow/Makefile MSVC_Net2003/examples/calendar/Makefile MSVC_Net2003/examples/cellrenderercustom_popup/Makefile MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile MSVC_Net2003/examples/direction/Makefile MSVC_Net2003/examples/dnd/Makefile MSVC_Net2003/examples/exception/Makefile MSVC_Net2003/examples/gdk/Makefile MSVC_Net2003/examples/printing/Makefile MSVC_Net2003/examples/rulers/Makefile MSVC_Net2003/examples/statusbar/Makefile MSVC_Net2003/examples/stock/Makefile MSVC_Net2003/examples/tictactoe/Makefile MSVC_Net2003/examples/treemodelcustom/Makefile MSVC_Net2003/examples/window/Makefile" + + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"OS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${GTKMM_ATKMM_ENABLED_TRUE}" && test -z "${GTKMM_ATKMM_ENABLED_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GTKMM_ATKMM_ENABLED\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"GTKMM_ATKMM_ENABLED\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${GTKMM_FALSE_TRUE}" && test -z "${GTKMM_FALSE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GTKMM_FALSE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"GTKMM_FALSE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi + +: ${CONFIG_STATUS=./config.status} +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 + +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by gtkmm $as_me 2.12.3, which was +generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +ac_cs_version="\\ +gtkmm config.status 2.12.3 +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +Copyright (C) 2006 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "gdk/gdkmmconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS gdk/gdkmmconfig.h" ;; + "gtk/gtkmmconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS gtk/gtkmmconfig.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "examples/arrow/Makefile") CONFIG_FILES="$CONFIG_FILES examples/arrow/Makefile" ;; + "examples/base/Makefile") CONFIG_FILES="$CONFIG_FILES examples/base/Makefile" ;; + "examples/book/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/Makefile" ;; + "examples/book/alignment/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/alignment/Makefile" ;; + "examples/book/aspectframe/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/aspectframe/Makefile" ;; + "examples/book/box/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/box/Makefile" ;; + "examples/book/builder/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/builder/Makefile" ;; + "examples/book/builder/basic/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/builder/basic/Makefile" ;; + "examples/book/builder/derived/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/builder/derived/Makefile" ;; + "examples/book/buttonbox/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttonbox/Makefile" ;; + "examples/book/buttons/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttons/Makefile" ;; + "examples/book/buttons/button/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttons/button/Makefile" ;; + "examples/book/buttons/checkbutton/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttons/checkbutton/Makefile" ;; + "examples/book/buttons/filechooserbutton/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttons/filechooserbutton/Makefile" ;; + "examples/book/buttons/radiobutton/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttons/radiobutton/Makefile" ;; + "examples/book/buttons/togglebutton/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/buttons/togglebutton/Makefile" ;; + "examples/book/clipboard/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/clipboard/Makefile" ;; + "examples/book/clipboard/simple/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/clipboard/simple/Makefile" ;; + "examples/book/clipboard/ideal/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/clipboard/ideal/Makefile" ;; + "examples/book/combobox/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/combobox/Makefile" ;; + "examples/book/combobox/text/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/combobox/text/Makefile" ;; + "examples/book/combobox/complex/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/combobox/complex/Makefile" ;; + "examples/book/comboboxentry/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/comboboxentry/Makefile" ;; + "examples/book/comboboxentry/text/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/comboboxentry/text/Makefile" ;; + "examples/book/comboboxentry/complex/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/comboboxentry/complex/Makefile" ;; + "examples/book/custom/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/custom/Makefile" ;; + "examples/book/custom/custom_container/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/custom/custom_container/Makefile" ;; + "examples/book/custom/custom_widget/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/custom/custom_widget/Makefile" ;; + "examples/book/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/Makefile" ;; + "examples/book/dialogs/aboutdialog/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/aboutdialog/Makefile" ;; + "examples/book/dialogs/colorselectiondialog/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/colorselectiondialog/Makefile" ;; + "examples/book/dialogs/filechooserdialog/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/filechooserdialog/Makefile" ;; + "examples/book/dialogs/fileselection/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/fileselection/Makefile" ;; + "examples/book/dialogs/fontselectiondialog/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/fontselectiondialog/Makefile" ;; + "examples/book/dialogs/messagedialog/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/messagedialog/Makefile" ;; + "examples/book/dialogs/simple/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/dialogs/simple/Makefile" ;; + "examples/book/drag_and_drop/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drag_and_drop/Makefile" ;; + "examples/book/drawingarea/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drawingarea/Makefile" ;; + "examples/book/drawingarea/simple/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drawingarea/simple/Makefile" ;; + "examples/book/drawingarea/curve/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drawingarea/curve/Makefile" ;; + "examples/book/drawingarea/arcs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drawingarea/arcs/Makefile" ;; + "examples/book/drawingarea/clock/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drawingarea/clock/Makefile" ;; + "examples/book/drawingarea/joins/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/drawingarea/joins/Makefile" ;; + "examples/book/entry/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/entry/Makefile" ;; + "examples/book/entry/completion/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/entry/completion/Makefile" ;; + "examples/book/entry/simple/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/entry/simple/Makefile" ;; + "examples/book/eventbox/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/eventbox/Makefile" ;; + "examples/book/expander/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/expander/Makefile" ;; + "examples/book/frame/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/frame/Makefile" ;; + "examples/book/helloworld/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/helloworld/Makefile" ;; + "examples/book/helloworld2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/helloworld2/Makefile" ;; + "examples/book/iconview/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/iconview/Makefile" ;; + "examples/book/idle/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/idle/Makefile" ;; + "examples/book/input/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/input/Makefile" ;; + "examples/book/label/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/label/Makefile" ;; + "examples/book/menus/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/menus/Makefile" ;; + "examples/book/menus/main_menu/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/menus/main_menu/Makefile" ;; + "examples/book/menus/popup/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/menus/popup/Makefile" ;; + "examples/book/menus_and_toolbars/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/menus_and_toolbars/Makefile" ;; + "examples/book/notebook/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/notebook/Makefile" ;; + "examples/book/paned/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/paned/Makefile" ;; + "examples/book/printing/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/printing/Makefile" ;; + "examples/book/printing/advanced/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/printing/advanced/Makefile" ;; + "examples/book/printing/simple/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/printing/simple/Makefile" ;; + "examples/book/progressbar/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/progressbar/Makefile" ;; + "examples/book/recent_files/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/recent_files/Makefile" ;; + "examples/book/range_widgets/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/range_widgets/Makefile" ;; + "examples/book/scrolledwindow/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/scrolledwindow/Makefile" ;; + "examples/book/signals/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/signals/Makefile" ;; + "examples/book/signals/custom/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/signals/custom/Makefile" ;; + "examples/book/socket/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/socket/Makefile" ;; + "examples/book/spinbutton/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/spinbutton/Makefile" ;; + "examples/book/statusicon/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/statusicon/Makefile" ;; + "examples/book/table/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/table/Makefile" ;; + "examples/book/textview/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/textview/Makefile" ;; + "examples/book/timeout/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/timeout/Makefile" ;; + "examples/book/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/toolbar/Makefile" ;; + "examples/book/tooltips/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/tooltips/Makefile" ;; + "examples/book/treeview/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/Makefile" ;; + "examples/book/treeview/combo_renderer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/combo_renderer/Makefile" ;; + "examples/book/treeview/editable_cells/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/editable_cells/Makefile" ;; + "examples/book/treeview/list/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/list/Makefile" ;; + "examples/book/treeview/listviewtext/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/listviewtext/Makefile" ;; + "examples/book/treeview/tree/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/tree/Makefile" ;; + "examples/book/treeview/drag_and_drop/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/drag_and_drop/Makefile" ;; + "examples/book/treeview/popup/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/popup/Makefile" ;; + "examples/book/treeview/filter/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/filter/Makefile" ;; + "examples/book/treeview/filter_modify/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/filter_modify/Makefile" ;; + "examples/book/treeview/modelsort/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/treeview/modelsort/Makefile" ;; + "examples/book/update_ui/Makefile") CONFIG_FILES="$CONFIG_FILES examples/book/update_ui/Makefile" ;; + "examples/calendar/Makefile") CONFIG_FILES="$CONFIG_FILES examples/calendar/Makefile" ;; + "examples/dnd/Makefile") CONFIG_FILES="$CONFIG_FILES examples/dnd/Makefile" ;; + "examples/exception/Makefile") CONFIG_FILES="$CONFIG_FILES examples/exception/Makefile" ;; + "examples/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gdk/Makefile" ;; + "examples/rulers/Makefile") CONFIG_FILES="$CONFIG_FILES examples/rulers/Makefile" ;; + "examples/statusbar/Makefile") CONFIG_FILES="$CONFIG_FILES examples/statusbar/Makefile" ;; + "examples/stock/Makefile") CONFIG_FILES="$CONFIG_FILES examples/stock/Makefile" ;; + "examples/tictactoe/Makefile") CONFIG_FILES="$CONFIG_FILES examples/tictactoe/Makefile" ;; + "examples/treemodelcustom/Makefile") CONFIG_FILES="$CONFIG_FILES examples/treemodelcustom/Makefile" ;; + "examples/window/Makefile") CONFIG_FILES="$CONFIG_FILES examples/window/Makefile" ;; + "demos/Makefile") CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;; + "demos/gtk-demo/Makefile") CONFIG_FILES="$CONFIG_FILES demos/gtk-demo/Makefile" ;; + "atk/Makefile") CONFIG_FILES="$CONFIG_FILES atk/Makefile" ;; + "atk/atkmm-1.6.pc") CONFIG_FILES="$CONFIG_FILES atk/atkmm-1.6.pc" ;; + "atk/src/Makefile") CONFIG_FILES="$CONFIG_FILES atk/src/Makefile" ;; + "atk/atkmm/Makefile") CONFIG_FILES="$CONFIG_FILES atk/atkmm/Makefile" ;; + "atk/atkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES atk/atkmm/private/Makefile" ;; + "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; + "docs/FAQ/Makefile") CONFIG_FILES="$CONFIG_FILES docs/FAQ/Makefile" ;; + "docs/images/Makefile") CONFIG_FILES="$CONFIG_FILES docs/images/Makefile" ;; + "docs/tutorial/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/Makefile" ;; + "docs/tutorial/figures/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/figures/Makefile" ;; + "docs/tutorial/icons/Makefile") CONFIG_FILES="$CONFIG_FILES docs/tutorial/icons/Makefile" ;; + "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; + "docs/reference/Doxyfile") CONFIG_FILES="$CONFIG_FILES docs/reference/Doxyfile" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "gdk/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/Makefile" ;; + "gdk/gdkmm-2.4.pc") CONFIG_FILES="$CONFIG_FILES gdk/gdkmm-2.4.pc" ;; + "gdk/src/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/src/Makefile" ;; + "gdk/gdkmm/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/gdkmm/Makefile" ;; + "gdk/gdkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES gdk/gdkmm/private/Makefile" ;; + "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; + "gtk/gtkmm-2.4.pc") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm-2.4.pc" ;; + "gtk/src/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/src/Makefile" ;; + "gtk/gtkmm/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/Makefile" ;; + "gtk/gtkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/private/Makefile" ;; + "pango/Makefile") CONFIG_FILES="$CONFIG_FILES pango/Makefile" ;; + "pango/pangomm-1.4.pc") CONFIG_FILES="$CONFIG_FILES pango/pangomm-1.4.pc" ;; + "pango/src/Makefile") CONFIG_FILES="$CONFIG_FILES pango/src/Makefile" ;; + "pango/pangomm/Makefile") CONFIG_FILES="$CONFIG_FILES pango/pangomm/Makefile" ;; + "pango/pangomm/private/Makefile") CONFIG_FILES="$CONFIG_FILES pango/pangomm/private/Makefile" ;; + "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "tools/m4/Makefile") CONFIG_FILES="$CONFIG_FILES tools/m4/Makefile" ;; + "tools/extra_defs_gen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/extra_defs_gen/Makefile" ;; + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "tests/child_widget/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget/Makefile" ;; + "tests/child_widget2/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget2/Makefile" ;; + "tests/child_widget_managed/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget_managed/Makefile" ;; + "tests/refcount_dialog/Makefile") CONFIG_FILES="$CONFIG_FILES tests/refcount_dialog/Makefile" ;; + "tests/dialog/Makefile") CONFIG_FILES="$CONFIG_FILES tests/dialog/Makefile" ;; + "tests/dialog_deletethis/Makefile") CONFIG_FILES="$CONFIG_FILES tests/dialog_deletethis/Makefile" ;; + "tests/delete_cpp_child/Makefile") CONFIG_FILES="$CONFIG_FILES tests/delete_cpp_child/Makefile" ;; + "tests/main_with_options/Makefile") CONFIG_FILES="$CONFIG_FILES tests/main_with_options/Makefile" ;; + "tests/menu_destruction/Makefile") CONFIG_FILES="$CONFIG_FILES tests/menu_destruction/Makefile" ;; + "tests/property_notification/Makefile") CONFIG_FILES="$CONFIG_FILES tests/property_notification/Makefile" ;; + "tests/scrolledwindow/Makefile") CONFIG_FILES="$CONFIG_FILES tests/scrolledwindow/Makefile" ;; + "tests/wrap_existing/Makefile") CONFIG_FILES="$CONFIG_FILES tests/wrap_existing/Makefile" ;; + "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "MSVC_Net2003/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/Makefile" ;; + "MSVC_Net2003/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gendef/Makefile" ;; + "MSVC_Net2003/atkmm/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/atkmm/Makefile" ;; + "MSVC_Net2003/atkmm/atkmm.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/atkmm/atkmm.rc" ;; + "MSVC_Net2003/pangomm/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/pangomm/Makefile" ;; + "MSVC_Net2003/pangomm/pangomm.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/pangomm/pangomm.rc" ;; + "MSVC_Net2003/gdkmm/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gdkmm/Makefile" ;; + "MSVC_Net2003/gdkmm/gdkmm.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gdkmm/gdkmm.rc" ;; + "MSVC_Net2003/gtkmm/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gtkmm/Makefile" ;; + "MSVC_Net2003/gtkmm/gtkmm.rc") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/gtkmm/gtkmm.rc" ;; + "MSVC_Net2003/demos/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/demos/Makefile" ;; + "MSVC_Net2003/demos/gtk-demo/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/demos/gtk-demo/Makefile" ;; + "MSVC_Net2003/examples/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/Makefile" ;; + "MSVC_Net2003/examples/arrow/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/arrow/Makefile" ;; + "MSVC_Net2003/examples/calendar/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/calendar/Makefile" ;; + "MSVC_Net2003/examples/cellrenderercustom_popup/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/cellrenderercustom_popup/Makefile" ;; + "MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile" ;; + "MSVC_Net2003/examples/direction/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/direction/Makefile" ;; + "MSVC_Net2003/examples/dnd/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/dnd/Makefile" ;; + "MSVC_Net2003/examples/exception/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/exception/Makefile" ;; + "MSVC_Net2003/examples/gdk/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/gdk/Makefile" ;; + "MSVC_Net2003/examples/printing/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/printing/Makefile" ;; + "MSVC_Net2003/examples/rulers/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/rulers/Makefile" ;; + "MSVC_Net2003/examples/statusbar/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/statusbar/Makefile" ;; + "MSVC_Net2003/examples/stock/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/stock/Makefile" ;; + "MSVC_Net2003/examples/tictactoe/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/tictactoe/Makefile" ;; + "MSVC_Net2003/examples/treemodelcustom/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/treemodelcustom/Makefile" ;; + "MSVC_Net2003/examples/window/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2003/examples/window/Makefile" ;; + + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || +{ + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} + +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +GTKMM_MAJOR_VERSION!$GTKMM_MAJOR_VERSION$ac_delim +GTKMM_MINOR_VERSION!$GTKMM_MINOR_VERSION$ac_delim +GTKMM_MICRO_VERSION!$GTKMM_MICRO_VERSION$ac_delim +GTKMM_VERSION!$GTKMM_VERSION$ac_delim +GTKMM_RELEASE!$GTKMM_RELEASE$ac_delim +LIBGTKMM_SO_VERSION!$LIBGTKMM_SO_VERSION$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim +MAINT!$MAINT$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +CPP!$CPP$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim +PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim +OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim +OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +DLLTOOL!$DLLTOOL$ac_delim +AS!$AS$ac_delim +OBJDUMP!$OBJDUMP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +CXXCPP!$CXXCPP$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +M4!$M4$ac_delim +PERL_PATH!$PERL_PATH$ac_delim +GMMPROC_DIR!$GMMPROC_DIR$ac_delim +GMMPROC!$GMMPROC$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +ATKMM_CFLAGS!$ATKMM_CFLAGS$ac_delim +ATKMM_LIBS!$ATKMM_LIBS$ac_delim +PANGOMM_CFLAGS!$PANGOMM_CFLAGS$ac_delim +PANGOMM_LIBS!$PANGOMM_LIBS$ac_delim +GDKMM_CFLAGS!$GDKMM_CFLAGS$ac_delim +GDKMM_LIBS!$GDKMM_LIBS$ac_delim +GTKMM_CFLAGS!$GTKMM_CFLAGS$ac_delim +GTKMM_LIBS!$GTKMM_LIBS$ac_delim +GTHREAD_CFLAGS!$GTHREAD_CFLAGS$ac_delim +GTHREAD_LIBS!$GTHREAD_LIBS$ac_delim +GTKMM_DOXYGEN_INPUT!$GTKMM_DOXYGEN_INPUT$ac_delim +DISABLE_DEPRECATED_CFLAGS!$DISABLE_DEPRECATED_CFLAGS$ac_delim +DISABLE_DEPRECATED_API_CFLAGS!$DISABLE_DEPRECATED_API_CFLAGS$ac_delim +EXAMPLE_SUBDIR!$EXAMPLE_SUBDIR$ac_delim +DEMO_SUBDIR!$DEMO_SUBDIR$ac_delim +GTKMM_PC_ATKMM_DEP!$GTKMM_PC_ATKMM_DEP$ac_delim +GTKMM_ATKMM_ENABLED_TRUE!$GTKMM_ATKMM_ENABLED_TRUE$ac_delim +GTKMM_ATKMM_ENABLED_FALSE!$GTKMM_ATKMM_ENABLED_FALSE$ac_delim +DOCS_SUBDIR!$DOCS_SUBDIR$ac_delim +GTKMM_FALSE_TRUE!$GTKMM_FALSE_TRUE$ac_delim +GTKMM_FALSE_FALSE!$GTKMM_FALSE_FALSE$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : +do + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines conftest.tail + +echo "ac_result=$ac_in" >>$CONFIG_STATUS +cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f $ac_file + mv "$tmp/config.h" $ac_file + fi + else + echo "/* $configure_input */" + cat "$ac_result" + fi + rm -f "$tmp/out12" +# Compute $ac_file's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $ac_file | $ac_file:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| . 2>/dev/null || +echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + 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" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + + esac +done # for ac_tag + + +{ (exit 0); exit 0; } +_ACEOF +chmod +x $CONFIG_STATUS +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi + + diff --git a/libs/gtkmm2/configure.in b/libs/gtkmm2/configure.in new file mode 100644 index 0000000000..d2e61a7572 --- /dev/null +++ b/libs/gtkmm2/configure.in @@ -0,0 +1,589 @@ +# Configure.in +# +# This file tests for various compiler features needed to configure +# the gtkmm package. Original skeleton was provided by Stephan Kulow. +# All tests were written by Tero Pulkkinen, Mirko Streckenbach, and +# Karl Nelson. +# +# NOTE! IF YOU DO CHANGES HERE, CHECK IF YOU NEED TO MODIFY .m4 TOO!!! +# +# Copyright 2001 Free Software Foundation +# Copyright 1999 gtkmm Development Team +# Copyright 1998 Stephan Kulow +# + +#We use pushdef here because we can't use shell variables before AC_INIT, but we want to use a variable with AC_INIT: +pushdef([GTKMM_MAJOR_VERSION], [2]) +pushdef([GTKMM_MINOR_VERSION], [12]) +pushdef([GTKMM_MICRO_VERSION], [3]) +pushdef([GTKMM_EXTRA_VERSION], []) +pushdef([GTKMM_VERSION], GTKMM_MAJOR_VERSION.GTKMM_MINOR_VERSION.GTKMM_MICRO_VERSION[]GTKMM_EXTRA_VERSION) +AC_INIT([gtkmm], GTKMM_VERSION, [gtkmm-list@gnome.org]) +AC_CONFIG_SRCDIR([gtk/gtkmmconfig.h.in]) +AC_PREREQ(2.59) + +######################################################################### +# Version and initialization +######################################################################### +[GTKMM_MAJOR_VERSION]=GTKMM_MAJOR_VERSION +[GTKMM_MINOR_VERSION]=GTKMM_MINOR_VERSION +[GTKMM_MICRO_VERSION]=GTKMM_MICRO_VERSION +[GTKMM_EXTRA_VERSION]=GTKMM_EXTRA_VERSION +[GTKMM_VERSION]=GTKMM_VERSION +popdef([GTKMM_MAJOR_VERSION]) +popdef([GTKMM_MINOR_VERSION]) +popdef([GTKMM_MICRO_VERSION]) +popdef([GTKMM_EXTRA_VERSION]) +popdef([GTKMM_VERSION]) +GTKMM_RELEASE=$GTKMM_MAJOR_VERSION.$GTKMM_MINOR_VERSION +AC_DEFINE_UNQUOTED(GTKMM_MAJOR_VERSION, $GTKMM_MAJOR_VERSION, [Major version of gtkmm]) +AC_DEFINE_UNQUOTED(GTKMM_MINOR_VERSION, $GTKMM_MINOR_VERSION, [Minor version of gtkmm]) +AC_DEFINE_UNQUOTED(GTKMM_MICRO_VERSION, $GTKMM_MICRO_VERSION, [Micro version of gtkmm]) +AC_SUBST(GTKMM_MAJOR_VERSION) +AC_SUBST(GTKMM_MINOR_VERSION) +AC_SUBST(GTKMM_MICRO_VERSION) +AC_SUBST(GTKMM_VERSION) +AC_SUBST(GTKMM_RELEASE) + +# +# +1 : ? : +1 == new interface that does not break old one +# +1 : ? : 0 == new interface that breaks old one +# ? : ? : 0 == no new interfaces, but breaks apps +# ? :+1 : ? == just some internal changes, nothing breaks but might work +# better +# CURRENT : REVISION : AGE +LIBGTKMM_SO_VERSION=1:30:0 +AC_SUBST(LIBGTKMM_SO_VERSION) + +AC_CONFIG_AUX_DIR(scripts) + +# Initialize automake stuff +# tar-ustar asks it to use a sensible tar format that can handle long filenames. +AM_INIT_AUTOMAKE([1.9 tar-ustar]) + +dnl Specify a configuration file (no autoheader) +AM_CONFIG_HEADER(config.h gdk/gdkmmconfig.h gtk/gtkmmconfig.h) +AM_MAINTAINER_MODE +AL_ACLOCAL_INCLUDE(scripts) + + +######################################################################### +# Configure arguments +######################################################################### + +######################################################################### +# Environment Checks +######################################################################### +AC_PROG_CC +AC_PROG_CPP +AC_PROG_MAKE_SET +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + +dnl Used for enabling the "-no-undefined" flag while generating DLLs +dnl Copied from the official gtk+-2 configure.in +AC_MSG_CHECKING([for some Win32 platform]) +case "$host" in + *-*-mingw*|*-*-cygwin*) + platform_win32=yes + ;; + *) + platform_win32=no + ;; +esac +AC_MSG_RESULT([$platform_win32]) +AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") + +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) +AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") + +AC_DISABLE_STATIC +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL + +AL_PROG_GNU_M4(AC_MSG_ERROR([dnl +SUN m4 does not work for building gtkmm. +Please install GNU m4.])) + +AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl +SUN make does not work for building gtkmm. +Please install GNU make.])) + +# This macro is installed by glibmm +# Doxygen needs the path to the installed perl. +GLIBMM_CHECK_PERL([5.6.0]) + +######################################################################### +# Function checks +######################################################################### + +AC_CHECK_FUNC(mkfifo, AC_DEFINE(HAVE_MKFIFO)) + +# functions used in demos/gtk-demo. Undefined in config.h. +AC_LANG_PUSH(C++) +AC_MSG_CHECKING([for flockfile]) +AC_TRY_LINK([ +#include ],[ +flockfile (NULL);],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FLOCKFILE, 1, + [Define to 1 if you have the `flockfile' function.])],[ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([for flockfile with a custom prototype]) + AC_TRY_LINK([ +#include + +extern "C" void flockfile (FILE *);],[ +flockfile (NULL);],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FLOCKFILE, 1, + [Define to 1 if you have the `flockfile' function.]) + AC_DEFINE(NEED_FLOCKFILE_PROTO, 1, + [Define if flockfile() prototype needed.])],[ + AC_MSG_RESULT(not available)])]) + +AC_MSG_CHECKING([for funlockfile]) +AC_TRY_LINK([ +#include ],[ +funlockfile (NULL);],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FUNLOCKFILE, 1, + [Define to 1 if you have the `funlockfile' function.])],[ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([for funlockfile with a custom prototype]) + AC_TRY_LINK([ +#include + +extern "C" void funlockfile (FILE *);],[ +funlockfile (NULL);],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_FUNLOCKFILE, 1, + [Define to 1 if you have the `funlockfile' function.]) + AC_DEFINE(NEED_FUNLOCKFILE_PROTO, 1, + [Define if funlockfile() prototype needed.])],[ + AC_MSG_RESULT(not available)])]) + +AC_MSG_CHECKING([for getc_unlocked]) +AC_TRY_LINK([ +#include ],[ +getc_unlocked (NULL);],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GETC_UNLOCKED, 1, + [Define to 1 if you have the `getc_unlocked' function.])],[ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([for getc_unlocked with a custom prototype]) + AC_TRY_LINK([ +#include + +extern "C" int getc_unlocked (FILE *);],[ +getc_unlocked (NULL);],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_GETC_UNLOCKED, 1, + [Define to 1 if you have the `getc_unlocked' function.]) + AC_DEFINE(NEED_GETC_UNLOCKED_PROTO, 1, + [Define if getc_unlocked() prototype needed.])],[ + AC_MSG_RESULT(not available)])]) +AC_LANG_POP(C++) + +######################################################################### +# Dependancy checks +######################################################################### +gtkmm_min_glibmm_version=2.14.1 +gtkmm_min_gtk_version=2.12.0 +gtkmm_min_cairomm_version=1.1.12 + + +GLIBMM_LIBDIR=`pkg-config --variable=libdir glibmm-2.4` +GMMPROC_DIR=$GLIBMM_LIBDIR/glibmm-2.4/proc +AC_SUBST(GMMPROC_DIR) +GMMPROC=$GMMPROC_DIR/gmmproc +AC_SUBST(GMMPROC) + + +PKG_CHECK_MODULES(ATKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} atk >= 1.9.0) +AC_SUBST(ATKMM_CFLAGS) +AC_SUBST(ATKMM_LIBS) + +PKG_CHECK_MODULES(PANGOMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} pangocairo >= 1.5.2) +AC_SUBST(PANGOMM_CFLAGS) +AC_SUBST(PANGOMM_LIBS) + +# gdkmm really does need GTK+, because part of Gdk::DragContext is in GTK+. +PKG_CHECK_MODULES(GDKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}) +AC_SUBST(GDKMM_CFLAGS) +AC_SUBST(GDKMM_LIBS) + +# Only check for gtk+-unix-print-2.0 on non-win32 platform, as +# gtk+-unix-print-2.0.pc is not always included in win32 installers. +if test x"$os_win32" = xyes; then + PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version}) +else + PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version}) +fi +AC_SUBST(GTKMM_CFLAGS) +AC_SUBST(GTKMM_LIBS) + +# gthread isn't a requirement, but we should use its CFLAGS if available. +PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.4.0,[],[GTHREAD_CFLAGS=''; GTHREAD_LIBS='']) +AC_SUBST(GTHREAD_CFLAGS) +AC_SUBST(GTHREAD_LIBS) + +######################################################################### +# C++ checks +######################################################################### +AC_PROG_CXX + +# Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE in the header. +#GLIBMM_PROG_CXX_SUN + +# Ensure MSVC-compatible struct packing convention is used when +# compiling for Win32 with gcc. +# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while +# gcc2 uses "-fnative-struct". +if test x"$os_win32" = xyes; then + if test x"$GCC" = xyes -a x"$GXX" = xyes; then + msnative_struct='' + AC_MSG_CHECKING([how to get MSVC-compatible struct packing]) + if test -z "$ac_cv_prog_CC"; then + our_gcc="$CC" + else + our_gcc="$ac_cv_prog_CC" + fi + case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in + 2.) + if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then + msnative_struct='-fnative-struct' + fi + ;; + *) + if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then + msnative_struct='-mms-bitfields' + fi + ;; + esac + if test x"$msnative_struct" = x ; then + AC_MSG_RESULT([no way]) + AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code]) + else + CXXFLAGS="$CXXFLAGS $msnative_struct" + AC_MSG_RESULT([${msnative_struct}]) + fi + fi +fi + +AC_LANG_CPLUSPLUS + + +# Create a list of input directories for Doxygen. +GTKMM_DOXYGEN_INPUT_SUBDIRS([pango atk gdk gtk]) + +# Evaluate the --enable-warnings=level option. +GTKMM_ARG_ENABLE_WARNINGS() + +# Add an --enable-use-deprecations configure option: +AC_ARG_ENABLE(deprecations, + [AC_HELP_STRING([--enable-use-deprecations], + [warn about deprecated usages [default=no]])],, + [enable_deprecations=no]) + +if test "x$enable_use_deprecations" = "xyes"; then + DISABLE_DEPRECATED_CFLAGS="\ +-DG_DISABLE_DEPRECATED \ +-DGDK_DISABLE_DEPRECATED \ +-DGTK_DISABLE_DEPRECATED \ +-DGDK_PIXBUF_DISABLE_DEPRECATED \ +-DGNOME_DISABLE_DEPRECATED" + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) +fi + +# Add an --enable-deprecated-api option: +AC_ARG_ENABLE(deprecated-api, [AC_HELP_STRING([--enable-deprecated-api], + [include (build) deprecated API in the libraries [default=yes]])],, + [enable_deprecated_api=yes]) +if test "x$enable_deprecated_api" = "xyes"; then +AC_MSG_WARN([Deprecated API will be built, for backwards-compatibility.]) +else + AC_DEFINE(PANGOMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in pangomm]) + AC_DEFINE(ATKMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in atkmm]) + AC_DEFINE(GDKMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in gdkmm]) + AC_DEFINE(GTKMM_DISABLE_DEPRECATED, 1, [Whether not to build deprecated API in gtkmm]) + DISABLE_DEPRECATED_API_CFLAGS="-DPANGOMM_DISABLE_DEPRECATED -DATKMM_DISABLE_DEPRECATED -DGDKMM_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED" +AC_SUBST(DISABLE_DEPRECATED_API_CFLAGS) +AC_MSG_WARN([Deprecated API will not be built, breaking backwards-compatibility. Do not use this build for distribution packages.]) +fi + + +AC_ARG_ENABLE(examples, [AC_HELP_STRING([--enable-examples], + [build the included examples [default=yes]])],, + [enable_examples=yes]) +if test "x$enable_examples" = "xyes"; then + EXAMPLE_SUBDIR="examples" + AC_CONFIG_FILES([ + examples/Makefile + examples/arrow/Makefile + examples/base/Makefile + examples/book/Makefile + examples/book/alignment/Makefile + examples/book/aspectframe/Makefile + examples/book/box/Makefile + examples/book/builder/Makefile + examples/book/builder/basic/Makefile + examples/book/builder/derived/Makefile + examples/book/buttonbox/Makefile + examples/book/buttons/Makefile + examples/book/buttons/button/Makefile + examples/book/buttons/checkbutton/Makefile + examples/book/buttons/filechooserbutton/Makefile + examples/book/buttons/radiobutton/Makefile + examples/book/buttons/togglebutton/Makefile + examples/book/clipboard/Makefile + examples/book/clipboard/simple/Makefile + examples/book/clipboard/ideal/Makefile + examples/book/combobox/Makefile + examples/book/combobox/text/Makefile + examples/book/combobox/complex/Makefile + examples/book/comboboxentry/Makefile + examples/book/comboboxentry/text/Makefile + examples/book/comboboxentry/complex/Makefile + examples/book/custom/Makefile + examples/book/custom/custom_container/Makefile + examples/book/custom/custom_widget/Makefile + examples/book/dialogs/Makefile + examples/book/dialogs/aboutdialog/Makefile + examples/book/dialogs/colorselectiondialog/Makefile + examples/book/dialogs/filechooserdialog/Makefile + examples/book/dialogs/fileselection/Makefile + examples/book/dialogs/fontselectiondialog/Makefile + examples/book/dialogs/messagedialog/Makefile + examples/book/dialogs/simple/Makefile + examples/book/drag_and_drop/Makefile + examples/book/drawingarea/Makefile + examples/book/drawingarea/simple/Makefile + examples/book/drawingarea/curve/Makefile + examples/book/drawingarea/arcs/Makefile + examples/book/drawingarea/clock/Makefile + examples/book/drawingarea/joins/Makefile + examples/book/entry/Makefile + examples/book/entry/completion/Makefile + examples/book/entry/simple/Makefile + examples/book/eventbox/Makefile + examples/book/expander/Makefile + examples/book/frame/Makefile + examples/book/helloworld/Makefile + examples/book/helloworld2/Makefile + examples/book/iconview/Makefile + examples/book/idle/Makefile + examples/book/input/Makefile + examples/book/label/Makefile + examples/book/menus/Makefile + examples/book/menus/main_menu/Makefile + examples/book/menus/popup/Makefile + examples/book/menus_and_toolbars/Makefile + examples/book/notebook/Makefile + examples/book/paned/Makefile + examples/book/printing/Makefile + examples/book/printing/advanced/Makefile + examples/book/printing/simple/Makefile + examples/book/progressbar/Makefile + examples/book/recent_files/Makefile + examples/book/range_widgets/Makefile + examples/book/scrolledwindow/Makefile + examples/book/signals/Makefile + examples/book/signals/custom/Makefile + examples/book/socket/Makefile + examples/book/spinbutton/Makefile + examples/book/statusicon/Makefile + examples/book/table/Makefile + examples/book/textview/Makefile + examples/book/timeout/Makefile + examples/book/toolbar/Makefile + examples/book/tooltips/Makefile + examples/book/treeview/Makefile + examples/book/treeview/combo_renderer/Makefile + examples/book/treeview/editable_cells/Makefile + examples/book/treeview/list/Makefile + examples/book/treeview/listviewtext/Makefile + examples/book/treeview/tree/Makefile + examples/book/treeview/drag_and_drop/Makefile + examples/book/treeview/popup/Makefile + examples/book/treeview/filter/Makefile + examples/book/treeview/filter_modify/Makefile + examples/book/treeview/modelsort/Makefile + examples/book/update_ui/Makefile + examples/calendar/Makefile + examples/dnd/Makefile + examples/exception/Makefile + examples/gdk/Makefile + examples/rulers/Makefile + examples/statusbar/Makefile + examples/stock/Makefile + examples/tictactoe/Makefile + examples/treemodelcustom/Makefile + examples/window/Makefile + ]) +else + EXAMPLE_SUBDIR="" +fi + +AC_SUBST(EXAMPLE_SUBDIR) + + +AC_ARG_ENABLE(demos, [AC_HELP_STRING([--enable-demos], + [build the included demos [default=yes]])],, + [enable_demos=yes]) +if test "x$enable_demos" = "xyes"; then + DEMO_SUBDIR="demos" + AC_CONFIG_FILES([ + demos/Makefile + demos/gtk-demo/Makefile + ]) +else + DEMO_SUBDIR="" +fi + +AC_SUBST(DEMO_SUBDIR) + + +#Offer the ability to omit some API from the library, +#to reduce the code size: +#Note that there are other options in glibmm, which affect gtkmm. +GTKMM_ARG_ENABLE_API_ATKMM() + +if test "x$gtkmm_enable_api_atkmm" = "xyes"; then + AC_CONFIG_FILES([ + atk/Makefile + atk/atkmm-1.6.pc + atk/src/Makefile + atk/atkmm/Makefile + atk/atkmm/private/Makefile + ]) + GTKMM_PC_ATKMM_DEP="atkmm-1.6" +else + GTKMM_PC_ATKMM_DEP="" +fi +AC_SUBST(GTKMM_PC_ATKMM_DEP) + +#Allow us to test for atkmm support in Makefile.am files: +AM_CONDITIONAL(GTKMM_ATKMM_ENABLED, test "x$gtkmm_enable_api_atkmm" = "xyes") + + +GTKMM_ARG_ENABLE_API_MAEMO_EXTENSIONS() + + +AC_ARG_ENABLE(docs, [AC_HELP_STRING([--enable-docs], + [build the included docs [default=yes]])],, + [enable_docs=yes]) +if test "x$enable_docs" = "xyes"; then + DOCS_SUBDIR="docs" + AC_CONFIG_FILES([ + docs/Makefile + docs/FAQ/Makefile + docs/images/Makefile + docs/tutorial/Makefile + docs/tutorial/figures/Makefile + docs/tutorial/icons/Makefile + docs/reference/Makefile + docs/reference/Doxyfile + ]) +else + DOCS_SUBDIR="" +fi +AC_SUBST(DOCS_SUBDIR) + +# Dummy conditional just to make automake-1.4 happy. +# We need an always-false condition in docs/Makefile.am. +AM_CONDITIONAL(GTKMM_FALSE,[false]) + +# HACK: Assign a dummy in order to prevent execution of autoheader by the +# maintainer-mode rules. That would fail since we aren't using autoheader. +AUTOHEADER=':' + + +AC_CONFIG_FILES([ + Makefile + + gdk/Makefile + gdk/gdkmm-2.4.pc + gdk/src/Makefile + gdk/gdkmm/Makefile + gdk/gdkmm/private/Makefile + + gtk/Makefile + gtk/gtkmm-2.4.pc + gtk/src/Makefile + gtk/gtkmm/Makefile + gtk/gtkmm/private/Makefile + + pango/Makefile + pango/pangomm-1.4.pc + pango/src/Makefile + pango/pangomm/Makefile + pango/pangomm/private/Makefile + + tools/Makefile + tools/m4/Makefile + tools/extra_defs_gen/Makefile +]) + +AC_CONFIG_FILES([ + tests/Makefile + tests/child_widget/Makefile + tests/child_widget2/Makefile + tests/child_widget_managed/Makefile + tests/refcount_dialog/Makefile + tests/dialog/Makefile + tests/dialog_deletethis/Makefile + tests/delete_cpp_child/Makefile + tests/main_with_options/Makefile + tests/menu_destruction/Makefile + tests/property_notification/Makefile + tests/scrolledwindow/Makefile + tests/wrap_existing/Makefile +]) + +AC_CONFIG_FILES([ + scripts/Makefile +]) + +AC_CONFIG_FILES([ + MSVC_Net2003/Makefile + MSVC_Net2003/gendef/Makefile + MSVC_Net2003/atkmm/Makefile + MSVC_Net2003/atkmm/atkmm.rc + MSVC_Net2003/pangomm/Makefile + MSVC_Net2003/pangomm/pangomm.rc + MSVC_Net2003/gdkmm/Makefile + MSVC_Net2003/gdkmm/gdkmm.rc + MSVC_Net2003/gtkmm/Makefile + MSVC_Net2003/gtkmm/gtkmm.rc + MSVC_Net2003/demos/Makefile + MSVC_Net2003/demos/gtk-demo/Makefile + MSVC_Net2003/examples/Makefile + MSVC_Net2003/examples/arrow/Makefile + MSVC_Net2003/examples/calendar/Makefile + MSVC_Net2003/examples/cellrenderercustom_popup/Makefile + MSVC_Net2003/examples/cellrenderercustom_toggle/Makefile + MSVC_Net2003/examples/direction/Makefile + MSVC_Net2003/examples/dnd/Makefile + MSVC_Net2003/examples/exception/Makefile + MSVC_Net2003/examples/gdk/Makefile + MSVC_Net2003/examples/printing/Makefile + MSVC_Net2003/examples/rulers/Makefile + MSVC_Net2003/examples/statusbar/Makefile + MSVC_Net2003/examples/stock/Makefile + MSVC_Net2003/examples/tictactoe/Makefile + MSVC_Net2003/examples/treemodelcustom/Makefile + MSVC_Net2003/examples/window/Makefile +]) + +AC_OUTPUT() + diff --git a/libs/gtkmm2/gdk/.DS_Store b/libs/gtkmm2/gdk/.DS_Store deleted file mode 100644 index 5008ddfcf5..0000000000 Binary files a/libs/gtkmm2/gdk/.DS_Store and /dev/null differ diff --git a/libs/gtkmm2/gdk/.cvsignore b/libs/gtkmm2/gdk/.cvsignore deleted file mode 100644 index e5d046710f..0000000000 --- a/libs/gtkmm2/gdk/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.dylib diff --git a/libs/gtkmm2/gdk/Makefile.am b/libs/gtkmm2/gdk/Makefile.am new file mode 100644 index 0000000000..47cc5d7302 --- /dev/null +++ b/libs/gtkmm2/gdk/Makefile.am @@ -0,0 +1,13 @@ +SUBDIRS = src gdkmm + +EXTRA_DIST = README gdkmmconfig.h.in gdkmm-2.4.pc.in gdkmm.h + +gdkmm_includedir = $(includedir)/gdkmm-2.4 +gdkmm_include_HEADERS = gdkmm.h + +gdkmm_configdir = $(libdir)/gdkmm-2.4/include +gdkmm_config_DATA = gdkmmconfig.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gdkmm-2.4.pc + diff --git a/libs/gtkmm2/gdk/Makefile.in b/libs/gtkmm2/gdk/Makefile.in new file mode 100644 index 0000000000..c38db1b95d --- /dev/null +++ b/libs/gtkmm2/gdk/Makefile.in @@ -0,0 +1,617 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = gdk +DIST_COMMON = README $(gdkmm_include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gdkmm-2.4.pc.in \ + $(srcdir)/gdkmmconfig.h.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = gdkmm-2.4.pc +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(gdkmm_configdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(gdkmm_includedir)" +gdkmm_configDATA_INSTALL = $(INSTALL_DATA) +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(gdkmm_config_DATA) $(pkgconfig_DATA) +gdkmm_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(gdkmm_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = src gdkmm +EXTRA_DIST = README gdkmmconfig.h.in gdkmm-2.4.pc.in gdkmm.h +gdkmm_includedir = $(includedir)/gdkmm-2.4 +gdkmm_include_HEADERS = gdkmm.h +gdkmm_configdir = $(libdir)/gdkmm-2.4/include +gdkmm_config_DATA = gdkmmconfig.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gdkmm-2.4.pc +all: gdkmmconfig.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +gdkmmconfig.h: stamp-h2 + @if test ! -f $@; then \ + rm -f stamp-h2; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \ + else :; fi + +stamp-h2: $(srcdir)/gdkmmconfig.h.in $(top_builddir)/config.status + @rm -f stamp-h2 + cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkmmconfig.h +$(srcdir)/gdkmmconfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h2 + touch $@ + +distclean-hdr: + -rm -f gdkmmconfig.h stamp-h2 +gdkmm-2.4.pc: $(top_builddir)/config.status $(srcdir)/gdkmm-2.4.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-gdkmm_configDATA: $(gdkmm_config_DATA) + @$(NORMAL_INSTALL) + test -z "$(gdkmm_configdir)" || $(MKDIR_P) "$(DESTDIR)$(gdkmm_configdir)" + @list='$(gdkmm_config_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(gdkmm_configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gdkmm_configdir)/$$f'"; \ + $(gdkmm_configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gdkmm_configdir)/$$f"; \ + done + +uninstall-gdkmm_configDATA: + @$(NORMAL_UNINSTALL) + @list='$(gdkmm_config_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(gdkmm_configdir)/$$f'"; \ + rm -f "$(DESTDIR)$(gdkmm_configdir)/$$f"; \ + done +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +install-gdkmm_includeHEADERS: $(gdkmm_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(gdkmm_includedir)" || $(MKDIR_P) "$(DESTDIR)$(gdkmm_includedir)" + @list='$(gdkmm_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(gdkmm_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gdkmm_includedir)/$$f'"; \ + $(gdkmm_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gdkmm_includedir)/$$f"; \ + done + +uninstall-gdkmm_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(gdkmm_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(gdkmm_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gdkmm_includedir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) gdkmmconfig.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) gdkmmconfig.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) gdkmmconfig.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) gdkmmconfig.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) $(HEADERS) gdkmmconfig.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(gdkmm_configdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(gdkmm_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-gdkmm_configDATA install-gdkmm_includeHEADERS \ + install-pkgconfigDATA + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-gdkmm_configDATA \ + uninstall-gdkmm_includeHEADERS uninstall-pkgconfigDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-gdkmm_configDATA \ + install-gdkmm_includeHEADERS install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-gdkmm_configDATA uninstall-gdkmm_includeHEADERS \ + uninstall-pkgconfigDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/gdk/README b/libs/gtkmm2/gdk/README new file mode 100644 index 0000000000..318dff4144 --- /dev/null +++ b/libs/gtkmm2/gdk/README @@ -0,0 +1 @@ +Base directory for gdkmm - the drawing kit. diff --git a/libs/gtkmm2/gdk/gdkmm-2.4.pc.in b/libs/gtkmm2/gdk/gdkmm-2.4.pc.in new file mode 100644 index 0000000000..c27b2fd202 --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmm-2.4.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gdkmm +Description: C++ wrappers for GLib, GTK+, and Pango +Requires: glibmm-2.4 pangomm-1.4 gdk-2.0 cairomm-1.0 +Version: @VERSION@ +Libs: -L${libdir} -lgdkmm-2.4 +Cflags: -I${includedir}/gdkmm-2.4 -I${libdir}/gdkmm-2.4/include diff --git a/libs/gtkmm2/gdk/gdkmm/.cvsignore b/libs/gtkmm2/gdk/gdkmm/.cvsignore deleted file mode 100644 index 1edeb79fd1..0000000000 --- a/libs/gtkmm2/gdk/gdkmm/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.os diff --git a/libs/gtkmm2/gdk/gdkmm/Makefile.am b/libs/gtkmm2/gdk/gdkmm/Makefile.am new file mode 100644 index 0000000000..e423dfe445 --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmm/Makefile.am @@ -0,0 +1,31 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +SUBDIRS = private + +sublib_name = gdkmm +sublib_libname = gdkmm-2.4 +sublib_libversion = $(LIBGTKMM_SO_VERSION) +sublib_namespace = Gdk +sublib_cflags = $(GDKMM_CFLAGS) +sublib_topdir = gdk +sublib_win32_dlls_libs = + +sublib_files_extra_posix_cc = +sublib_files_extra_win32_cc = +sublib_files_extra_general_cc = general.cc rgb.cc +sublib_files_extra_general_deprecated_cc = + +sublib_files_extra_posix_h = +sublib_files_extra_win32_h = +sublib_files_extra_general_h = list.h general.h rgb.h +sublib_files_extra_general_deprecated_h = + +include $(top_srcdir)/build_shared/Makefile_build.am_fragment + +lib_LTLIBRARIES = libgdkmm-2.4.la +libgdkmm_2_4_la_SOURCES = $(files_built_cc) $(files_extra_cc) +libgdkmm_2_4_la_LDFLAGS = $(common_ldflags) +libgdkmm_2_4_la_LIBADD = $(top_builddir)/pango/pangomm/libpangomm-1.4.la \ + $(GDKMM_LIBS) + diff --git a/libs/gtkmm2/gdk/gdkmm/Makefile.in b/libs/gtkmm2/gdk/gdkmm/Makefile.in new file mode 100644 index 0000000000..ec96f83bce --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmm/Makefile.in @@ -0,0 +1,794 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = README $(srcdir)/../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(sublib_include_HEADERS) \ + $(top_srcdir)/build_shared/Makefile_build.am_fragment \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment +subdir = gdk/gdkmm +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(sublib_includedir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +libgdkmm_2_4_la_DEPENDENCIES = \ + $(top_builddir)/pango/pangomm/libpangomm-1.4.la \ + $(am__DEPENDENCIES_1) +am__libgdkmm_2_4_la_SOURCES_DIST = bitmap.cc color.cc colormap.cc \ + cursor.cc device.cc display.cc displaymanager.cc \ + dragcontext.cc drawable.cc event.cc gc.cc image.cc pixbuf.cc \ + pixbufanimation.cc pixbufanimationiter.cc pixmap.cc \ + pixbufformat.cc pixbufloader.cc rectangle.cc region.cc \ + rgbcmap.cc screen.cc types.cc visual.cc window.cc wrap_init.cc \ + general.cc rgb.cc +am__objects_1 = bitmap.lo color.lo colormap.lo cursor.lo device.lo \ + display.lo displaymanager.lo dragcontext.lo drawable.lo \ + event.lo gc.lo image.lo pixbuf.lo pixbufanimation.lo \ + pixbufanimationiter.lo pixmap.lo pixbufformat.lo \ + pixbufloader.lo rectangle.lo region.lo rgbcmap.lo screen.lo \ + types.lo visual.lo window.lo +am__objects_2 = +@OS_WIN32_FALSE@am__objects_3 = $(am__objects_1) $(am__objects_2) \ +@OS_WIN32_FALSE@ $(am__objects_2) +@OS_WIN32_TRUE@am__objects_3 = $(am__objects_1) $(am__objects_2) \ +@OS_WIN32_TRUE@ $(am__objects_2) +am__objects_4 = $(am__objects_3) wrap_init.lo +am__objects_5 = general.lo rgb.lo +@OS_WIN32_FALSE@am__objects_6 = $(am__objects_2) $(am__objects_5) +@OS_WIN32_TRUE@am__objects_6 = $(am__objects_2) $(am__objects_5) +am_libgdkmm_2_4_la_OBJECTS = $(am__objects_4) $(am__objects_6) +libgdkmm_2_4_la_OBJECTS = $(am_libgdkmm_2_4_la_OBJECTS) +libgdkmm_2_4_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libgdkmm_2_4_la_LDFLAGS) $(LDFLAGS) -o $@ +depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libgdkmm_2_4_la_SOURCES) +DIST_SOURCES = $(am__libgdkmm_2_4_la_SOURCES_DIST) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +sublib_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(sublib_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ -DG_LOG_DOMAIN=\"$(sublib_name)\" $(extra_win32_defines) +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = private +sublib_name = gdkmm +sublib_libname = gdkmm-2.4 +sublib_libversion = $(LIBGTKMM_SO_VERSION) +sublib_namespace = Gdk +sublib_cflags = $(GDKMM_CFLAGS) +sublib_topdir = gdk +sublib_win32_dlls_libs = +sublib_files_extra_posix_cc = +sublib_files_extra_win32_cc = +sublib_files_extra_general_cc = general.cc rgb.cc +sublib_files_extra_general_deprecated_cc = +sublib_files_extra_posix_h = +sublib_files_extra_win32_h = +sublib_files_extra_general_h = list.h general.h rgb.h +sublib_files_extra_general_deprecated_h = +files_posix_hg = +files_win32_hg = +files_general_hg = bitmap.hg color.hg colormap.hg cursor.hg \ + device.hg display.hg displaymanager.hg dragcontext.hg drawable.hg event.hg gc.hg image.hg \ + pixbuf.hg pixbufanimation.hg pixbufanimationiter.hg pixmap.hg pixbufformat.hg pixbufloader.hg \ + rectangle.hg region.hg rgbcmap.hg screen.hg types.hg visual.hg window.hg + +files_general_deprecated_hg = +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +@PLATFORM_WIN32_FALSE@extra_win32_defines = + +# Support for DLL on mingw using libtool > 1.4 +# When creating DLLs on win32, we need to explicitly add a few extra +# libraries at link time to resolve symbols (remember a dll is like an +# executable). +@PLATFORM_WIN32_TRUE@extra_win32_defines = \ +@PLATFORM_WIN32_TRUE@ -D$(shell echo $(sublib_name) | tr [:lower:] [:upper:])_BUILD + +@PLATFORM_WIN32_FALSE@no_undefined = +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols +@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = +@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs) +common_ldflags = -version-info $(sublib_libversion) $(no_undefined) + +# All modules can include all other modules, +# for instance, so that gdkmm can use headers in pangomm. +all_includes = -I$(top_builddir)/$(sublib_topdir) -I$(top_srcdir)/$(sublib_topdir) \ + -I$(top_builddir)/pango -I$(top_srcdir)/pango \ + -I$(top_builddir)/atk -I$(top_srcdir)/atk \ + -I$(top_builddir)/gdk -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gtk -I$(top_srcdir)/gtk \ + $(sublib_cflags) $(GTHREAD_CFLAGS) + +dist_sources = $(files_all_built_cc) $(files_all_extra_cc) $(files_all_built_h) $(files_all_extra_h) +DISTFILES = $(DIST_COMMON) $(dist_sources) $(TEXINFOS) $(EXTRA_DIST) +DEFAULT_INCLUDES = + +# DISABLE_DEPRECATED_CFLAGS and DISABLE_DEPRECATED_API_CFLAGS are empty unless the appropriate --enable-*=no options are specified to configure: +INCLUDES = $(strip $(all_includes)) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) +sublib_includedir = $(includedir)/$(sublib_libname)/$(sublib_name) +sublib_include_HEADERS = $(files_all_built_h) $(files_all_extra_h) +lib_LTLIBRARIES = libgdkmm-2.4.la +libgdkmm_2_4_la_SOURCES = $(files_built_cc) $(files_extra_cc) +libgdkmm_2_4_la_LDFLAGS = $(common_ldflags) +libgdkmm_2_4_la_LIBADD = $(top_builddir)/pango/pangomm/libpangomm-1.4.la \ + $(GDKMM_LIBS) + +all: all-recursive + +.SUFFIXES: +.SUFFIXES: .cc .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_build.am_fragment $(srcdir)/../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/gdkmm/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/gdkmm/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgdkmm-2.4.la: $(libgdkmm_2_4_la_OBJECTS) $(libgdkmm_2_4_la_DEPENDENCIES) + $(libgdkmm_2_4_la_LINK) -rpath $(libdir) $(libgdkmm_2_4_la_OBJECTS) $(libgdkmm_2_4_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/device.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displaymanager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dragcontext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/general.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbuf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbufanimation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbufanimationiter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbufformat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixbufloader.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/region.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgb.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rgbcmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screen.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/visual.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrap_init.Plo@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-sublib_includeHEADERS: $(sublib_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(sublib_includedir)" || $(MKDIR_P) "$(DESTDIR)$(sublib_includedir)" + @list='$(sublib_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(sublib_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sublib_includedir)/$$f'"; \ + $(sublib_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sublib_includedir)/$$f"; \ + done + +uninstall-sublib_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(sublib_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(sublib_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(sublib_includedir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sublib_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-sublib_includeHEADERS + +install-dvi: install-dvi-recursive + +install-exec-am: install-libLTLIBRARIES + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-sublib_includeHEADERS installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS + + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_all_built_cc) $(files_all_built_h)) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/gdk/gdkmm/README b/libs/gtkmm2/gdk/gdkmm/README new file mode 100644 index 0000000000..b712fd63d2 --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmm/README @@ -0,0 +1 @@ +Sources for the gdk drawing kit. diff --git a/libs/gtkmm2/gdk/gdkmm/color.h b/libs/gtkmm2/gdk/gdkmm/color.h index 167152d1fa..010a21c025 100644 --- a/libs/gtkmm2/gdk/gdkmm/color.h +++ b/libs/gtkmm2/gdk/gdkmm/color.h @@ -3,6 +3,8 @@ #ifndef _GDKMM_COLOR_H #define _GDKMM_COLOR_H +#include + #include @@ -25,6 +27,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include @@ -258,10 +264,13 @@ inline void swap(Color& lhs, Color& rhs) namespace Glib { -/** @relates Gdk::Color - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Color */ Gdk::Color wrap(GdkColor* object, bool take_copy = false); diff --git a/libs/gtkmm2/gdk/gdkmm/colormap.h b/libs/gtkmm2/gdk/gdkmm/colormap.h index 2d2a4cd92e..f088d54580 100644 --- a/libs/gtkmm2/gdk/gdkmm/colormap.h +++ b/libs/gtkmm2/gdk/gdkmm/colormap.h @@ -3,6 +3,8 @@ #ifndef _GDKMM_COLORMAP_H #define _GDKMM_COLORMAP_H +#include + #include @@ -27,6 +29,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include #include #include @@ -158,12 +164,12 @@ public: void query_color (gulong pixel, Color& result); - /** Returns the visual for which a given colormap was created. + /** Return value: the visual of the colormap. * @return The visual of the colormap. */ Glib::RefPtr get_visual(); - /** Returns the visual for which a given colormap was created. + /** Return value: the visual of the colormap. * @return The visual of the colormap. */ Glib::RefPtr get_visual() const; @@ -208,10 +214,13 @@ protected: namespace Glib { - /** @relates Gdk::Colormap - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Colormap */ Glib::RefPtr wrap(GdkColormap* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/cursor.h b/libs/gtkmm2/gdk/gdkmm/cursor.h index 19b6d6054b..81381fd88c 100644 --- a/libs/gtkmm2/gdk/gdkmm/cursor.h +++ b/libs/gtkmm2/gdk/gdkmm/cursor.h @@ -199,14 +199,14 @@ public: explicit Cursor(const Glib::RefPtr& display, const Glib::ustring& name); - /** Returns the display on which the Gdk::Cursor is defined. + /** Returns: the Gdk::Display associated to @a cursor * @return The Gdk::Display associated to @a cursor * * @newin2p2. */ Glib::RefPtr get_display(); - /** Returns the display on which the Gdk::Cursor is defined. + /** Returns: the Gdk::Display associated to @a cursor * @return The Gdk::Display associated to @a cursor * * @newin2p2. @@ -214,22 +214,14 @@ public: Glib::RefPtr get_display() const; - /** Returns a Gdk::Pixbuf with the image used to display the cursor. - * - * Note that depending on the capabilities of the windowing system and - * on the cursor, GDK may not be able to obtain the image data. In this - * case, 0 is returned. + /** Returns: a Gdk::Pixbuf representing @a cursor , or 0 * @return A Gdk::Pixbuf representing @a cursor , or 0 * * @newin2p8. */ Glib::RefPtr get_image(); - /** Returns a Gdk::Pixbuf with the image used to display the cursor. - * - * Note that depending on the capabilities of the windowing system and - * on the cursor, GDK may not be able to obtain the image data. In this - * case, 0 is returned. + /** Returns: a Gdk::Pixbuf representing @a cursor , or 0 * @return A Gdk::Pixbuf representing @a cursor , or 0 * * @newin2p8. @@ -257,10 +249,13 @@ inline void swap(Cursor& lhs, Cursor& rhs) namespace Glib { -/** @relates Gdk::Cursor - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Cursor */ Gdk::Cursor wrap(GdkCursor* object, bool take_copy = false); diff --git a/libs/gtkmm2/gdk/gdkmm/device.cc b/libs/gtkmm2/gdk/gdkmm/device.cc index 5d29021169..7675c4517d 100644 --- a/libs/gtkmm2/gdk/gdkmm/device.cc +++ b/libs/gtkmm2/gdk/gdkmm/device.cc @@ -150,7 +150,8 @@ GType Device::get_base_type() Device::Device() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(device_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/device.h b/libs/gtkmm2/gdk/gdkmm/device.h index 2453396d73..c40a98bde7 100644 --- a/libs/gtkmm2/gdk/gdkmm/device.h +++ b/libs/gtkmm2/gdk/gdkmm/device.h @@ -248,10 +248,13 @@ protected: namespace Glib { - /** @relates Gdk::Device - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Device */ Glib::RefPtr wrap(GdkDevice* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/display.cc b/libs/gtkmm2/gdk/gdkmm/display.cc index fe4318c328..04f33d333f 100644 --- a/libs/gtkmm2/gdk/gdkmm/display.cc +++ b/libs/gtkmm2/gdk/gdkmm/display.cc @@ -216,7 +216,7 @@ void Display_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Display_Class::closed_callback(GdkDisplay* self, gboolean p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -224,33 +224,36 @@ void Display_Class::closed_callback(GdkDisplay* self, gboolean p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_closed(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_closed(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->closed) - (*base->closed)(self, p0); - } + // Call the original underlying C function: + if(base && base->closed) + (*base->closed)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -298,7 +301,8 @@ GType Display::get_base_type() Display::Display() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(display_class_.init())) { } @@ -581,6 +585,21 @@ bool Display::supports_clipboard_persistence() const return gdk_display_supports_clipboard_persistence(const_cast(gobj())); } +bool Display::supports_shapes() const +{ + return gdk_display_supports_shapes(const_cast(gobj())); +} + +bool Display::supports_input_shapes() const +{ + return gdk_display_supports_input_shapes(const_cast(gobj())); +} + +bool Display::supports_composite() const +{ + return gdk_display_supports_composite(const_cast(gobj())); +} + Glib::SignalProxy1< void,bool > Display::signal_closed() { diff --git a/libs/gtkmm2/gdk/gdkmm/display.h b/libs/gtkmm2/gdk/gdkmm/display.h index e99910af21..db0d7c4e38 100644 --- a/libs/gtkmm2/gdk/gdkmm/display.h +++ b/libs/gtkmm2/gdk/gdkmm/display.h @@ -131,7 +131,7 @@ public: */ int get_n_screens() const; - /** Returns a screen object for one of the screens of the display. + /** Returns: the Gdk::Screen object * @param screen_num The screen number. * @return The Gdk::Screen object * @@ -139,7 +139,7 @@ public: */ Glib::RefPtr get_screen(int screen_num); - /** Returns a screen object for one of the screens of the display. + /** Returns: the Gdk::Screen object * @param screen_num The screen number. * @return The Gdk::Screen object * @@ -212,16 +212,14 @@ public: void close(); - /** Returns the list of available input devices attached to @a display . - * The list is statically allocated and should not be freed. + /** Return value: a list of Gdk::Device * @return A list of Gdk::Device * * @newin2p2. */ Glib::ListHandle< Glib::RefPtr > list_devices(); - /** Returns the list of available input devices attached to @a display . - * The list is statically allocated and should not be freed. + /** Return value: a list of Gdk::Device * @return A list of Gdk::Device * * @newin2p2. @@ -286,6 +284,8 @@ public: //Find out whether we can use a string representation for the atom - look for examples of this function's use. /** Adds a filter to be called when X ClientMessage events are received. + * See gdk_window_add_filter() if you are interested in filtering other + * types of events. * * @newin2p2 * @param message_type The type of ClientMessage events to receive. @@ -332,7 +332,7 @@ public: static Glib::RefPtr get_default(); - /** Returns the core pointer device for the given display + /** Return value: the core pointer device; this is owned by the * @return The core pointer device; this is owned by the * display and should not be freed. * @@ -340,7 +340,7 @@ public: */ Glib::RefPtr get_core_pointer(); - /** Returns the core pointer device for the given display + /** Return value: the core pointer device; this is owned by the * @return The core pointer device; this is owned by the * display and should not be freed. * @@ -529,25 +529,21 @@ public: */ void flush(); - /** Returns true if cursors can use an 8bit alpha channel - * on @a display . Otherwise, cursors are restricted to bilevel - * alpha (i.e. a mask). + /** Returns: whether cursors can have alpha channels. * @return Whether cursors can have alpha channels. * * @newin2p4. */ bool supports_cursor_alpha() const; - /** Returns true if multicolored cursors are supported - * on @a display . Otherwise, cursors have only a forground - * and a background color. + /** Returns: whether cursors can have multiple colors. * @return Whether cursors can have multiple colors. * * @newin2p4. */ bool supports_cursor_color() const; - /** Returns the default size to use for cursors on @a display . + /** Returns: the default cursor size. * @return The default cursor size. * * @newin2p4. @@ -563,18 +559,14 @@ public: void get_maximal_cursor_size(guint& width, guint& height); - /** Returns the default group leader window for all toplevel windows - * on @a display . This window is implicitly created by GDK. - * See gdk_window_set_group(). + /** Return value: The default group leader window for @a display * @return The default group leader window for @a display * * @newin2p4. */ Glib::RefPtr get_default_group(); - /** Returns the default group leader window for all toplevel windows - * on @a display . This window is implicitly created by GDK. - * See gdk_window_set_group(). + /** Return value: The default group leader window for @a display * @return The default group leader window for @a display * * @newin2p4. @@ -584,8 +576,7 @@ public: //TODO: wrap the vfuncs, though they are not very useful because people will not derive from this class? murrayc. - /** Returns whether Gdk::EventOwnerChange events will be - * sent when the owner of a selection changes. + /** Return value: whether Gdk::EventOwnerChange events will * @return Whether Gdk::EventOwnerChange events will * be sent. * @@ -605,31 +596,56 @@ public: bool request_selection_notification(const Glib::ustring& selection); - /** Returns whether the speicifed display supports clipboard - * persistance; i.e.\ if it's possible to store the clipboard data after an - * application has quit. On X11 this checks if a clipboard daemon is - * running. + /** Returns: true if the display supports clipboard persistance. * @return true if the display supports clipboard persistance. * * @newin2p6. */ bool supports_clipboard_persistence() const; - //TODO: Documentation, based on C docs: + /** Issues a request to the clipboard manager to store the clipboard data, + * saving all available targets. + * On X11, this is a special program that works according to the freedesktop clipboard specification, + * available at http://www.freedesktop.org/Standards/clipboard-manager-spec. + * @newin2p6 + * + * @param clipboard_window A Gdk::Window belonging to the clipboard owner. + * @param time_ A timestamp. + */ void store_clipboard(const Glib::RefPtr& clipboard_window, guint32 time_); void store_clipboard(const Glib::RefPtr& clipboard_window, guint32 time_, const Glib::StringArrayHandle& targets); - + + + /** Returns: true if shaped windows are supported + * @return true if shaped windows are supported + * + * @newin2p10. + */ + bool supports_shapes() const; + + /** Returns: true if windows with modified input shape are supported + * @return true if windows with modified input shape are supported + * + * @newin2p10. + */ + bool supports_input_shapes() const; + + /** Returns: true if windows may be composited. + * @return true if windows may be composited. + * + * @newin2p12. + */ + bool supports_composite() const; + /** The closed signal is emitted when the connection to the windowing * system for this display is closed. * * @param is_error true if the display was closed due to an error - */ - -/** + * * @par Prototype: - * void %closed(bool is_error) + * void on_my_%closed(bool is_error) */ Glib::SignalProxy1< void,bool > signal_closed(); @@ -660,10 +676,13 @@ protected: namespace Glib { - /** @relates Gdk::Display - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Display */ Glib::RefPtr wrap(GdkDisplay* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/displaymanager.cc b/libs/gtkmm2/gdk/gdkmm/displaymanager.cc index 3a2696788f..8ff571b5e3 100644 --- a/libs/gtkmm2/gdk/gdkmm/displaymanager.cc +++ b/libs/gtkmm2/gdk/gdkmm/displaymanager.cc @@ -131,7 +131,7 @@ void DisplayManager_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void DisplayManager_Class::display_opened_callback(GdkDisplayManager* self, GdkDisplay* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -139,33 +139,36 @@ void DisplayManager_Class::display_opened_callback(GdkDisplayManager* self, GdkD // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_display_opened(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_display_opened(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->display_opened) - (*base->display_opened)(self, p0); - } + // Call the original underlying C function: + if(base && base->display_opened) + (*base->display_opened)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gdk/gdkmm/displaymanager.h b/libs/gtkmm2/gdk/gdkmm/displaymanager.h index b15608b6f2..34f381f2cb 100644 --- a/libs/gtkmm2/gdk/gdkmm/displaymanager.h +++ b/libs/gtkmm2/gdk/gdkmm/displaymanager.h @@ -162,11 +162,9 @@ public: * @newin2p2 * * @param display the opened display - */ - -/** + * * @par Prototype: - * void %display_opened(const Glib::RefPtr& display) + * void on_my_%display_opened(const Glib::RefPtr& display) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_display_opened(); @@ -197,10 +195,13 @@ protected: namespace Glib { - /** @relates Gdk::DisplayManager - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::DisplayManager */ Glib::RefPtr wrap(GdkDisplayManager* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/dragcontext.cc b/libs/gtkmm2/gdk/gdkmm/dragcontext.cc index 1daebcd9de..6bdc8fe352 100644 --- a/libs/gtkmm2/gdk/gdkmm/dragcontext.cc +++ b/libs/gtkmm2/gdk/gdkmm/dragcontext.cc @@ -47,29 +47,10 @@ void DragContext::drag_refuse(guint32 time) gdk_drag_status(gobj(), ((GdkDragAction)(0)) /* see GDK docs */, time); } -Glib::StringArrayHandle DragContext::get_targets() const +Gdk::ListHandle_AtomString DragContext::get_targets() const { - std::list listTargets; - - //Get a newly-allocated array of atoms: - GList* list = gobj()->targets; - while(list) - { - GdkAtom atom = GDK_POINTER_TO_ATOM(list->data); - - //Convert the atom to a string: - gchar* const atom_name = gdk_atom_name(atom); - - Glib::ustring target; - if(atom_name) - target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. - - listTargets.push_back(target); - - list = list->next; - } - - return listTargets; + //Note that we don't free the GList* (or it's items), because we are accessing the struct directly: + return ListHandle_AtomString( gobj()->targets, Glib::OWNERSHIP_NONE); } } /* namespace Gdk */ @@ -191,7 +172,8 @@ GType DragContext::get_base_type() DragContext::DragContext() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(dragcontext_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/dragcontext.h b/libs/gtkmm2/gdk/gdkmm/dragcontext.h index b30d2f3715..f7377a9e6d 100644 --- a/libs/gtkmm2/gdk/gdkmm/dragcontext.h +++ b/libs/gtkmm2/gdk/gdkmm/dragcontext.h @@ -249,7 +249,7 @@ public: */ void drop_finish(bool success, guint32 time); - /** Returns the selection atom for the current source window. + /** Return value: the selection atom. * @return The selection atom. */ Glib::ustring get_selection() const; @@ -289,7 +289,7 @@ public: /** Get a list of targets offered by the source. * @result a list of targets offered by the source. */ - Glib::StringArrayHandle get_targets() const; + Gdk::ListHandle_AtomString get_targets() const; /** Get the DND protocol which governs this drag. * @result the DND protocol which governs this drag. @@ -365,10 +365,13 @@ protected: namespace Glib { - /** @relates Gdk::DragContext - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::DragContext */ Glib::RefPtr wrap(GdkDragContext* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/drawable.cc b/libs/gtkmm2/gdk/gdkmm/drawable.cc index 2a57382d36..6722d64951 100644 --- a/libs/gtkmm2/gdk/gdkmm/drawable.cc +++ b/libs/gtkmm2/gdk/gdkmm/drawable.cc @@ -181,7 +181,8 @@ GType Drawable::get_base_type() Drawable::Drawable() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(drawable_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/drawable.h b/libs/gtkmm2/gdk/gdkmm/drawable.h index ccf3310e57..c50ed19180 100644 --- a/libs/gtkmm2/gdk/gdkmm/drawable.h +++ b/libs/gtkmm2/gdk/gdkmm/drawable.h @@ -409,6 +409,12 @@ public: * The clip mask of @a gc is ignored, but clip rectangles and clip regions work * fine. * + * If GDK is built with the Sun mediaLib library, the gdk_draw_pixbuf + * function is accelerated using mediaLib, which provides hardware + * acceleration on Intel, AMD, and Sparc chipsets. If desired, mediaLib + * support can be turned off by setting the GDK_DISABLE_MEDIALIB environment + * variable. + * * @newin2p2 * @param gc A Gdk::GC, used for clipping, or 0. * @param pixbuf A Gdk::Pixbuf. @@ -609,10 +615,13 @@ protected: namespace Glib { - /** @relates Gdk::Drawable - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Drawable */ Glib::RefPtr wrap(GdkDrawable* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/event.h b/libs/gtkmm2/gdk/gdkmm/event.h index eecc131cf4..15fc5f12b4 100644 --- a/libs/gtkmm2/gdk/gdkmm/event.h +++ b/libs/gtkmm2/gdk/gdkmm/event.h @@ -261,8 +261,8 @@ public: static bool events_pending(); - /** Returns the time stamp from @a event , if there is one; otherwise - * returns Gdk::CURRENT_TIME. If @a event is 0, returns Gdk::CURRENT_TIME. + /** returns Gdk::CURRENT_TIME. If @a event is 0, returns Gdk::CURRENT_TIME. + * Return value: time stamp field from @a event * @return Time stamp field from @a event . */ guint32 get_time() const; @@ -323,26 +323,14 @@ public: */ void set_screen(const Glib::RefPtr& screen); - /** Returns the screen for the event. The screen is - * typically the screen for event->any.window, but - * for events such as mouse events, it is the screen - * where the pointer was when the event occurs - - * that is, the screen which has the root window - * to which event->motion.x_root and - * event->motion.y_root are relative. + /** Return value: the screen for the event * @return The screen for the event * * @newin2p2. */ Glib::RefPtr get_screen(); - /** Returns the screen for the event. The screen is - * typically the screen for event->any.window, but - * for events such as mouse events, it is the screen - * where the pointer was when the event occurs - - * that is, the screen which has the root window - * to which event->motion.x_root and - * event->motion.y_root are relative. + /** Return value: the screen for the event * @return The screen for the event * * @newin2p2. @@ -381,10 +369,13 @@ inline void swap(Event& lhs, Event& rhs) namespace Glib { -/** @relates Gdk::Event - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Event */ Gdk::Event wrap(GdkEvent* object, bool take_copy = false); diff --git a/libs/gtkmm2/gdk/gdkmm/gc.cc b/libs/gtkmm2/gdk/gdkmm/gc.cc index eeddc82148..5bdb704459 100644 --- a/libs/gtkmm2/gdk/gdkmm/gc.cc +++ b/libs/gtkmm2/gdk/gdkmm/gc.cc @@ -194,7 +194,8 @@ GType GC::get_base_type() GC::GC() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(gc_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/gc.h b/libs/gtkmm2/gdk/gdkmm/gc.h index 5c156d706e..40bb206e23 100644 --- a/libs/gtkmm2/gdk/gdkmm/gc.h +++ b/libs/gtkmm2/gdk/gdkmm/gc.h @@ -622,10 +622,13 @@ protected: namespace Glib { - /** @relates Gdk::GC - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::GC */ Glib::RefPtr wrap(GdkGC* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/general.cc b/libs/gtkmm2/gdk/gdkmm/general.cc index 48729f95a8..b942954cb0 100644 --- a/libs/gtkmm2/gdk/gdkmm/general.cc +++ b/libs/gtkmm2/gdk/gdkmm/general.cc @@ -53,30 +53,65 @@ void flush() namespace Cairo { +#ifndef GDKMM_DISABLE_DEPRECATED void set_source_color(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color) { gdk_cairo_set_source_color(context->cobj(), const_cast(color.gobj())); } +#endif +void set_source_color(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color) +{ + gdk_cairo_set_source_color(context->cobj(), const_cast(color.gobj())); +} + +#ifndef GDKMM_DISABLE_DEPRECATED void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixbuf, double pixbuf_x, double pixbuf_y) { gdk_cairo_set_source_pixbuf(context->cobj(), pixbuf->gobj(), pixbuf_x, pixbuf_y); } +#endif +void set_source_pixbuf(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixbuf, double pixbuf_x, double pixbuf_y) +{ + gdk_cairo_set_source_pixbuf(context->cobj(), pixbuf->gobj(), pixbuf_x, pixbuf_y); +} + +#ifndef GDKMM_DISABLE_DEPRECATED void set_source_pixmap(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixmap, double pixmap_x, double pixmap_y) { gdk_cairo_set_source_pixmap(context->cobj(), pixmap->gobj(), pixmap_x, pixmap_y); } +#endif +void set_source_pixmap(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixmap, double pixmap_x, double pixmap_y) +{ + gdk_cairo_set_source_pixmap(context->cobj(), pixmap->gobj(), pixmap_x, pixmap_y); +} + +#ifndef GDKMM_DISABLE_DEPRECATED void rectangle(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle) { gdk_cairo_rectangle(context->cobj(), const_cast(rectangle.gobj())); } +#endif +void add_rectangle_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle) +{ + gdk_cairo_rectangle(context->cobj(), const_cast(rectangle.gobj())); +} + +#ifndef GDKMM_DISABLE_DEPRECATED void region(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region) { gdk_cairo_region(context->cobj(), const_cast(region.gobj())); } +#endif + +void add_region_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region) +{ + gdk_cairo_region(context->cobj(), const_cast(region.gobj())); +} } //namespace Cairo diff --git a/libs/gtkmm2/gdk/gdkmm/general.h b/libs/gtkmm2/gdk/gdkmm/general.h index b5b6164a8d..7a528e1621 100644 --- a/libs/gtkmm2/gdk/gdkmm/general.h +++ b/libs/gtkmm2/gdk/gdkmm/general.h @@ -37,13 +37,41 @@ void flush(); namespace Cairo { +#ifndef GDKMM_DISABLE_DEPRECATED /** Sets the specified Gdk::Color as the source color of the Cairo context. * @param @context The cairo context. * @param color The color to use as the source color. * + * @deprecated Use the overloaded function that takes a const RefPtr + * reference. + * * @newin2p10 */ void set_source_color(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color); +#endif + +/** Sets the specified Gdk::Color as the source color of the Cairo context. + * @param @context The cairo context. + * @param color The color to use as the source color. + * + * @newin2p12 + */ +void set_source_color(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Color& color); + +#ifndef GDKMM_DISABLE_DEPRECATED +/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y. + * @param @context The cairo context. + * @param pixbuf A Gdk::Pixbuf + * @param pixbuf_x X coordinate of location to place upper left corner of pixbuf. + * @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf. + * + * @deprecated Use the overloaded function that takes a const RefPtr + * reference. + * + * @newin2p10 + */ +void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixbuf, double pixbuf_x, double pixbuf_y); +#endif /** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixbuf_x, pixbuf_y. * @param @context The cairo context. @@ -51,9 +79,24 @@ void set_source_color(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::C * @param pixbuf_x X coordinate of location to place upper left corner of pixbuf. * @param pixbuf_y Y coordinate of location to place upper left corner of pixbuf. * + * @newin2p12 + */ +void set_source_pixbuf(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixbuf, double pixbuf_x, double pixbuf_y); + +#ifndef GDKMM_DISABLE_DEPRECATED +/** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y. + * @param @context The cairo context. + * @param pixmap A Gdk::Pixmap + * @param pixmap_x X coordinate of location to place upper left corner of pixmap. + * @param pixmap_y Y coordinate of location to place upper left corner of pixmap. + * + * @deprecated Use the overloaded function that takes a const RefPtr + * reference. + * * @newin2p10 */ -void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixbuf, double pixbuf_x, double pixbuf_y); +void set_source_pixmap(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixmap, double pixmap_x, double pixmap_y); +#endif /** Sets the given pixbuf as the source pattern for the Cairo context. The pattern has an extend mode of CAIRO_EXTEND_NONE and is aligned so that the origin of pixbuf is pixmap_x, pixmap_y. * @param @context The cairo context. @@ -61,29 +104,54 @@ void set_source_pixbuf(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib: * @param pixmap_x X coordinate of location to place upper left corner of pixmap. * @param pixmap_y Y coordinate of location to place upper left corner of pixmap. * + * @newin2p12 + */ +void set_source_pixmap(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixmap, double pixmap_x, double pixmap_y); + +#ifndef GDKMM_DISABLE_DEPRECATED +/** Adds the given rectangle to the current path of the context. + * + * @param context A cairo context. + * @param rectangle A rectangle to add to the path of the context. + * + * @deprecated Use add_rectangle_to_path() instead + * reference. + * * @newin2p10 */ -void set_source_pixmap(::Cairo::RefPtr< ::Cairo::Context >& context, const Glib::RefPtr& pixmap, double pixmap_x, double pixmap_y); - -//TODO: Rename to add_rectangle_to_context_path and add_region_to_context_path(), and deprecate rectangle() and region()? +void rectangle(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle); +#endif /** Adds the given rectangle to the current path of the context. * * @param context A cairo context. * @param rectangle A rectangle to add to the path of the context. * + * @newin2p12 + */ +void add_rectangle_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle); + +#ifndef GDKMM_DISABLE_DEPRECATED +/** Adds the given region to the current path of the context. + * + * @param context A cairo context. + * @param region A region to add to the path of the context. + * + * @deprecated Use add_region_to_path() instead + * * @newin2p10 */ -void rectangle(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Rectangle& rectangle); +void region(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region); +#endif /** Adds the given region to the current path of the context. * * @param context A cairo context. * @param region A region to add to the path of the context. * - * @newin2p10 + * @newin2p12 */ -void region(::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region); +void add_region_to_path(const ::Cairo::RefPtr< ::Cairo::Context >& context, const Gdk::Region& region); } //namespace Cairo diff --git a/libs/gtkmm2/gdk/gdkmm/image.h b/libs/gtkmm2/gdk/gdkmm/image.h index 5b9fa7f33b..dc506bc6ee 100644 --- a/libs/gtkmm2/gdk/gdkmm/image.h +++ b/libs/gtkmm2/gdk/gdkmm/image.h @@ -225,10 +225,13 @@ protected: namespace Glib { - /** @relates Gdk::Image - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Image */ Glib::RefPtr wrap(GdkImage* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/pixbuf.cc b/libs/gtkmm2/gdk/gdkmm/pixbuf.cc index 4a97b5dac9..0489cc4b39 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbuf.cc +++ b/libs/gtkmm2/gdk/gdkmm/pixbuf.cc @@ -60,6 +60,8 @@ static void pixbuf_destroy_data_callback(guint8* pixels, void* user_data) namespace Gdk { +#ifndef GDKMM_DISABLE_DEPRECATED + Pixbuf::Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, @@ -69,6 +71,27 @@ Pixbuf::Pixbuf(const Glib::RefPtr& src, Object((GObject*) gdk_pixbuf_get_from_image( 0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height)) {} +#endif // GDKMM_DISABLE_DEPRECATED + + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_image( + 0, src->gobj(), cmap->gobj(), src_x, src_y, 0, 0, width, height)) +{} + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_image( + 0, src->gobj(), 0, src_x, src_y, 0, 0, width, height)) +{} + +#ifndef GDKMM_DISABLE_DEPRECATED Pixbuf::Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, @@ -79,6 +102,46 @@ Pixbuf::Pixbuf(const Glib::RefPtr& src, Object((GObject*) gdk_pixbuf_get_from_drawable( 0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height)) {} +#endif // GDKMM_DISABLE_DEPRECATED + + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_drawable( + 0, src->gobj(), cmap->gobj(), src_x, src_y, 0, 0, width, height)) +{} + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_drawable( + 0, src->gobj(), 0, src_x, src_y, 0, 0, width, height)) +{} + +#ifndef GDKMM_DISABLE_DEPRECATED + +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height) +{ + return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) ); +} + +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height) +{ + return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) ); +} +#endif // GDKMM_DISABLE_DEPRECATED Glib::RefPtr Pixbuf::create_from_data(const guint8* data, Colorspace colorspace, @@ -234,11 +297,9 @@ void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size, Pixbuf::SListHandle_PixbufFormat Pixbuf::get_formats() { - //TODO: Check that this ownership is appropriate. murrayc. - return SListHandle_PixbufFormat(gdk_pixbuf_get_formats(), Glib::OWNERSHIP_DEEP); + return SListHandle_PixbufFormat(gdk_pixbuf_get_formats(), Glib::OWNERSHIP_SHALLOW); } - } // namespace Gdk @@ -404,13 +465,21 @@ GType Pixbuf::get_base_type() } -Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int width, int height) { - return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) ); + return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, width, height) ); } -Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, int src_x, int src_y, int width, int height) { - return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) ); + return Glib::RefPtr( new Pixbuf(src, src_x, src_y, width, height) ); +} +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int width, int height) +{ + return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, width, height) ); +} +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, int src_x, int src_y, int width, int height) +{ + return Glib::RefPtr( new Pixbuf(src, src_x, src_y, width, height) ); } Glib::RefPtr Pixbuf::copy() const { diff --git a/libs/gtkmm2/gdk/gdkmm/pixbuf.h b/libs/gtkmm2/gdk/gdkmm/pixbuf.h index fb4a066ef6..543b52d4b9 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbuf.h +++ b/libs/gtkmm2/gdk/gdkmm/pixbuf.h @@ -3,6 +3,8 @@ #ifndef _GDKMM_PIXBUF_H #define _GDKMM_PIXBUF_H +#include + #include @@ -25,6 +27,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include #include #include @@ -287,20 +293,229 @@ private: protected: - //TODO: Document these, based on the docs for the C functions. - Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + /** Creates a pixbuf object from a drawable. + * + * Transfers image data from a Drawable and converts it to an RGB(A) + * representation inside a Pixbuf. In other words, copies + * image data from a server-side drawable to a client-side RGB(A) buffer. + * This allows you to efficiently read individual pixels on the client side. + * + * If the drawable @src has no colormap (See Gdk::Drawable::get_colormap()), + * then a suitable colormap must be specified. Otherwise, you may use the + * constructor that takes no colormap argument. + * Typically a Gdk::Window or a pixmap created by passing a Gdk:Window + * to the Gdk::Pixbuf constructor will already have a colormap associated with + * it. If the drawable is a bitmap (1 bit per pixel pixmap), + * then a colormap is not required; pixels with a value of 1 are + * assumed to be white, and pixels with a value of 0 are assumed to be + * black. For taking screenshots, Gdk::Colormap::get_system() returns + * the correct colormap to use. + * + * This will create an RGB pixbuf with 8 bits per channel and no + * alpha, with the same size specified by the @a width and @a height + * arguments. + * + * If the specified drawable is a pixmap, then the requested source + * rectangle must be completely contained within the pixmap, otherwise + * the constructor will fail. For pixmaps only (not for windows) + * passing -1 for width or height is allowed to mean the full width + * or height of the pixmap. + * + * If the specified drawable is a window, and the window is off the + * screen, then there is no image data in the obscured/offscreen + * regions to be placed in the pixbuf. The contents of portions of the + * pixbuf corresponding to the offscreen region are undefined. + * + * If the window you're obtaining data from is partially obscured by + * other windows, then the contents of the pixbuf areas corresponding + * to the obscured regions are undefined. + * + * See alo Gdk::Drawable::get_image(). + * + * @param src Source drawable. + * @param cmap: A colormap. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int width, int height); + + /** Creates a pixbuf object from a drawable, using the colormap from the drawable. + * + * @param src Source drawable. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, int width, int height); + + #ifndef GDKMM_DISABLE_DEPRECATED + + /// @deprecated Use the constructor without dest_x and dest_y parameters. + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height); + #endif // GDKMM_DISABLE_DEPRECATED + + + /** Creates a pixbuf object from an image. + * + * @param src Source Image. + * @param cmap A colormap. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int width, int height); + + /** Creates a pixbuf object from an image, using the colormap from the image. + * + * @param src Source Image. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newinp212 + */ + Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, int width, int height); + + #ifndef GDKMM_DISABLE_DEPRECATED + + /// @deprecated Use the constructors without dest_x and dest_y parameters. Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height); + #endif // GDKMM_DISABLE_DEPRECATED + public: typedef sigc::slot SlotDestroyData; - - static Glib::RefPtr create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height); + // Hand-coded so the implementation in the .ccg is also only + // built when GDKMM_DISABLE_DEPRECATED is defined. + #ifndef GDKMM_DISABLE_DEPRECATED + /** @deprecated Use the create() methods that don't have the unused dest_x and dest_y parameters. */ + static Glib::RefPtr create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height); + + /** @deprecated Use the create() methods that that don't have the unused dest_x and dest_y parameters. */ + static Glib::RefPtr create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height); + #endif // GDKMM_DISABLE_DEPRECATED + + + /** Creates a pixbuf object from a drawable. + * + * Transfers image data from a Drawable and converts it to an RGB(A) + * representation inside a Pixbuf. In other words, copies + * image data from a server-side drawable to a client-side RGB(A) buffer. + * This allows you to efficiently read individual pixels on the client side. + * + * If the drawable @src has no colormap (See Gdk::Drawable::get_colormap()), + * then a suitable colormap must be specified. Otherwise, you may use the + * constructor that takes no colormap argument. + * Typically a Gdk::Window or a pixmap created by passing a Gdk:Window + * to the Gdk::Pixbuf constructor will already have a colormap associated with + * it. If the drawable is a bitmap (1 bit per pixel pixmap), + * then a colormap is not required; pixels with a value of 1 are + * assumed to be white, and pixels with a value of 0 are assumed to be + * black. For taking screenshots, Gdk::Colormap::get_system() returns + * the correct colormap to use. + * + * This will create an RGB pixbuf with 8 bits per channel and no + * alpha, with the same size specified by the @a width and @a height + * arguments. + * + * If the specified drawable is a pixmap, then the requested source + * rectangle must be completely contained within the pixmap, otherwise + * the constructor will fail. For pixmaps only (not for windows) + * passing -1 for width or height is allowed to mean the full width + * or height of the pixmap. + * + * If the specified drawable is a window, and the window is off the + * screen, then there is no image data in the obscured/offscreen + * regions to be placed in the pixbuf. The contents of portions of the + * pixbuf corresponding to the offscreen region are undefined. + * + * If the window you're obtaining data from is partially obscured by + * other windows, then the contents of the pixbuf areas corresponding + * to the obscured regions are undefined. + * + * See alo Gdk::Drawable::get_image(). + * + * @param src Source drawable. + * @param cmap: A colormap. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ - static Glib::RefPtr create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height); + static Glib::RefPtr create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int width, int height); + + + /** Creates a pixbuf object from a drawable, using the colormap from the drawable. + * + * @param src Source drawable. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + + static Glib::RefPtr create(const Glib::RefPtr& src, int src_x, int src_y, int width, int height); + + + /** Creates a pixbuf object from an image. + * + * @param src Source Image. + * @param cmap A colormap. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + + static Glib::RefPtr create(const Glib::RefPtr& src, const Glib::RefPtr& cmap, int src_x, int src_y, int width, int height); + + + /** Creates a pixbuf object from an image, using the colormap from the image. + * + * @param src Source Image. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newinp212 + */ + + static Glib::RefPtr create(const Glib::RefPtr& src, int src_x, int src_y, int width, int height); /** Creates a new Gdk::Pixbuf with a copy of the information in the specified @@ -317,8 +532,8 @@ public: * @param colorspace Color space for image. * @param has_alpha Whether the image should have transparency information. * @param bits_per_sample Number of bits per color sample. - * @param width Width of image in pixels. - * @param height Height of image in pixels. + * @param width Width of image in pixels, must be > 0. + * @param height Height of image in pixels, must be > 0. * @return A newly-created Gdk::Pixbuf with a reference count of 1, or * 0 if not enough memory could be allocated for the image buffer. */ @@ -736,14 +951,14 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, int dest_x, int dest_y) const; - /** Modifies saturation and optionally pixelates @a src , placing the - * result in @a dest . @a src and @a dest may be the same pixbuf with no ill - * effects. If @a saturation is 1.0 then saturation is not changed. If - * it's less than 1.0, saturation is reduced (the image is darkened); - * if greater than 1.0, saturation is increased (the image is - * brightened). If @a pixelate is true, then pixels are faded in a - * checkerboard pattern to create a pixelated image. @a src and @a dest - * must have the same image format, size, and rowstride. + /** Modifies saturation and optionally pixelates @a src , placing the result in + * @a dest . @a src and @a dest may be the same pixbuf with no ill effects. If + * @a saturation is 1.0 then saturation is not changed. If it's less than 1.0, + * saturation is reduced (the image turns toward grayscale); if greater than + * 1.0, saturation is increased (the image gets more vivid colors). If @a pixelate + * is true, then pixels are faded in a checkerboard pattern to create a + * pixelated image. @a src and @a dest must have the same image format, size, and + * rowstride. * @param dest Place to write modified version of @a src . * @param saturation Saturation factor. * @param pixelate Whether to pixelate. @@ -901,7 +1116,8 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, /** Rotates a pixbuf by a multiple of 90 degrees, and returns the * result in a new pixbuf. * @param angle The angle to rotate by. - * @return A new pixbuf + * @return The new Gdk::Pixbuf, or 0 if not enough memory could be + * allocated for it. * * @newin2p6. */ @@ -910,7 +1126,8 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, /** Flips a pixbuf horizontally or vertically and returns the * result in a new pixbuf. * @param horizontal true to flip horizontally, false to flip vertically. - * @return A new pixbuf. + * @return The new Gdk::Pixbuf, or 0 if not enough memory could be + * allocated for it. * * @newin2p6. */ @@ -950,7 +1167,7 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, * for consistent visual results. If you do not have any of these cases, the * dither offsets can be both zero. * - * Deprecated: This function is obsolete. Use gdk_draw_pixbuf() instead. + * Deprecated: 2.4: This function is obsolete. Use gdk_draw_pixbuf() instead. * @param drawable Destination drawable. * @param gc GC used for rendering. * @param src_x Source X coordinate within pixbuf. @@ -979,7 +1196,7 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, * On older X servers, rendering pixbufs with an alpha channel involves round trips * to the X server, and may be somewhat slow. * - * Deprecated: This function is obsolete. Use gdk_draw_pixbuf() instead. + * Deprecated: 2.4: This function is obsolete. Use gdk_draw_pixbuf() instead. * @param drawable Destination drawable. * @param src_x Source X coordinate within pixbuf. * @param src_y Source Y coordinates within pixbuf. @@ -1012,7 +1229,15 @@ gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, /** Looks up @a key in the list of options that may have been attached to the - * @a pixbuf when it was loaded. + * @a pixbuf when it was loaded, or that may have been attached by another + * function using set_option(). + * + * For instance, the ANI loader provides "Title" and "Artist" options. + * The ICO, XBM, and XPM loaders provide "x_hot" and "y_hot" hot-spot + * options for cursor definitions. The PNG loader provides the tEXt ancillary + * chunk key/value pairs as options. Since 2.12, the TIFF and JPEG loaders + * return an "orientation" option string that corresponds to the embedded + * TIFF/Exif orientation tag (if present). * @param key A nul-terminated string. * @return The value associated with @a key . This is a nul-terminated * string that should not be freed or 0 if @a key was not found. @@ -1048,10 +1273,13 @@ protected: namespace Glib { - /** @relates Gdk::Pixbuf - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Pixbuf */ Glib::RefPtr wrap(GdkPixbuf* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h b/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h index c30d72eae0..90e1149604 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h +++ b/libs/gtkmm2/gdk/gdkmm/pixbufanimation.h @@ -188,10 +188,13 @@ protected: namespace Glib { - /** @relates Gdk::PixbufAnimation - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::PixbufAnimation */ Glib::RefPtr wrap(GdkPixbufAnimation* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h b/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h index 7223a4baec..fcddeb8289 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h +++ b/libs/gtkmm2/gdk/gdkmm/pixbufanimationiter.h @@ -114,10 +114,13 @@ protected: namespace Glib { - /** @relates Gdk::PixbufAnimationIter - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::PixbufAnimationIter */ Glib::RefPtr wrap(GdkPixbufAnimationIter* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufformat.h b/libs/gtkmm2/gdk/gdkmm/pixbufformat.h index bff60da222..f4e88aaf65 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbufformat.h +++ b/libs/gtkmm2/gdk/gdkmm/pixbufformat.h @@ -56,21 +56,21 @@ public: PixbufFormat& operator=(const PixbufFormat& src); - /** Returns the name of the format. + /** Return value: the name of the format. * @return The name of the format. * * @newin2p2. */ Glib::ustring get_name() const; - /** Returns a description of the format. + /** Return value: a description of the format. * @return A description of the format. * * @newin2p2. */ Glib::ustring get_description() const; - /** Returns the mime types supported by the format. + /** Return value: a 0-terminated array of mime types which must be freed with * @return A 0-terminated array of mime types which must be freed with * Glib::strfreev() when it is no longer needed. * @@ -78,8 +78,7 @@ public: */ Glib::StringArrayHandle get_mime_types() const; - /** Returns the filename extensions typically used for files in the - * given format. + /** Return value: a 0-terminated array of filename extensions which must be * @return A 0-terminated array of filename extensions which must be * freed with Glib::strfreev() when it is no longer needed. * @@ -87,7 +86,7 @@ public: */ Glib::StringArrayHandle get_extensions() const; - /** Returns whether pixbufs can be saved in the given format. + /** Return value: whether pixbufs can be saved in the given format. * @return Whether pixbufs can be saved in the given format. * * @newin2p2. @@ -95,18 +94,14 @@ public: bool is_writable() const; - /** Returns whether this image format is scalable. If a file is in a - * scalable format, it is preferable to load it at the desired size, - * rather than loading it at the default size and scaling the - * resulting pixbuf to the desired size. + /** Return value: whether this image format is scalable. * @return Whether this image format is scalable. * * @newin2p6. */ bool is_scalable() const; - /** Returns whether this image format is disabled. See - * gdk_pixbuf_format_set_disabled(). + /** Return value: whether this image format is disabled. * @return Whether this image format is disabled. * * @newin2p6. @@ -123,10 +118,7 @@ public: */ void set_disabled(bool disabled = true); - /** Returns information about the license of the image loader - * for the format. The returned string should be a shorthand for - * a wellknown license, e.g. "LGPL", "GPL", "QPL", "GPL/QPL", - * or "other" to indicate some other license. + /** Returns: a string describing the license of @a format . * @return A string describing the license of @a format . * * @newin2p6. diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc b/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc index cd0022326b..17f0ad84a1 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc +++ b/libs/gtkmm2/gdk/gdkmm/pixbufloader.cc @@ -217,7 +217,7 @@ void PixbufLoader_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void PixbufLoader_Class::area_prepared_callback(GdkPixbufLoader* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -225,36 +225,39 @@ void PixbufLoader_Class::area_prepared_callback(GdkPixbufLoader* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_area_prepared(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_area_prepared(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->area_prepared) - (*base->area_prepared)(self); - } + // Call the original underlying C function: + if(base && base->area_prepared) + (*base->area_prepared)(self); } void PixbufLoader_Class::area_updated_callback(GdkPixbufLoader* self, gint p0, gint p1, gint p2, gint p3) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -262,40 +265,43 @@ void PixbufLoader_Class::area_updated_callback(GdkPixbufLoader* self, gint p0, g // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_area_updated(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_area_updated(p0 , p1 , p2 , p3 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->area_updated) - (*base->area_updated)(self, p0, p1, p2, p3); - } + // Call the original underlying C function: + if(base && base->area_updated) + (*base->area_updated)(self, p0, p1, p2, p3); } void PixbufLoader_Class::closed_callback(GdkPixbufLoader* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -303,32 +309,35 @@ void PixbufLoader_Class::closed_callback(GdkPixbufLoader* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_closed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_closed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->closed) - (*base->closed)(self); - } + // Call the original underlying C function: + if(base && base->closed) + (*base->closed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -376,7 +385,8 @@ GType PixbufLoader::get_base_type() PixbufLoader::PixbufLoader() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(pixbufloader_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/pixbufloader.h b/libs/gtkmm2/gdk/gdkmm/pixbufloader.h index 1df9791c95..a7f2908850 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixbufloader.h +++ b/libs/gtkmm2/gdk/gdkmm/pixbufloader.h @@ -270,11 +270,9 @@ public: * pixbuf in the desired size. After this signal is emitted, * applications can call get_pixbuf() to fetch * the partially-loaded pixbuf. - */ - -/** + * * @par Prototype: - * void %area_prepared() + * void on_my_%area_prepared() */ Glib::SignalProxy0< void > signal_area_prepared(); @@ -290,11 +288,9 @@ public: * @param y Y offset of upper-left corner of the updated area. * @param width Width of updated area. * @param height Height of updated area. - */ - -/** + * * @par Prototype: - * void %area_updated(int x, int y, int width, int height) + * void on_my_%area_updated(int x, int y, int width, int height) */ Glib::SignalProxy4< void,int,int,int,int > signal_area_updated(); @@ -304,11 +300,9 @@ public: * It can be used by different parts of an application to receive * notification when an image loader is closed by the code that * drives it. - */ - -/** + * * @par Prototype: - * void %closed() + * void on_my_%closed() */ Glib::SignalProxy0< void > signal_closed(); @@ -324,11 +318,9 @@ public: * * @param width The original width of the image. * @param height The original height of the image - */ - -/** + * * @par Prototype: - * void %size_prepared(int width, int height) + * void on_my_%size_prepared(int width, int height) */ Glib::SignalProxy2< void,int,int > signal_size_prepared(); @@ -361,10 +353,13 @@ protected: namespace Glib { - /** @relates Gdk::PixbufLoader - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::PixbufLoader */ Glib::RefPtr wrap(GdkPixbufLoader* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/pixmap.cc b/libs/gtkmm2/gdk/gdkmm/pixmap.cc index 6dd0a8be83..1c9edc25af 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixmap.cc +++ b/libs/gtkmm2/gdk/gdkmm/pixmap.cc @@ -308,7 +308,8 @@ GType Pixmap::get_base_type() Pixmap::Pixmap() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gdk::Drawable(Glib::ConstructParams(pixmap_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/pixmap.h b/libs/gtkmm2/gdk/gdkmm/pixmap.h index b544b063ee..83c4d75d6a 100644 --- a/libs/gtkmm2/gdk/gdkmm/pixmap.h +++ b/libs/gtkmm2/gdk/gdkmm/pixmap.h @@ -196,10 +196,13 @@ protected: namespace Glib { - /** @relates Gdk::Pixmap - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Pixmap */ Glib::RefPtr wrap(GdkPixmapObject* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/private/Makefile.am b/libs/gtkmm2/gdk/gdkmm/private/Makefile.am new file mode 100644 index 0000000000..8640826f88 --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmm/private/Makefile.am @@ -0,0 +1,14 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment +files_built_p_h = $(files_all_hg:.hg=_p.h) + +private_includedir = $(includedir)/gdkmm-2.4/gdkmm/private +private_include_HEADERS = $(files_built_p_h) + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_built_p_h)) + + + diff --git a/libs/gtkmm2/gdk/gdkmm/private/Makefile.in b/libs/gtkmm2/gdk/gdkmm/private/Makefile.in new file mode 100644 index 0000000000..4d395b8a3e --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmm/private/Makefile.in @@ -0,0 +1,491 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(private_include_HEADERS) \ + $(srcdir)/../../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment +subdir = gdk/gdkmm/private +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(private_includedir)" +private_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(private_include_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +files_posix_hg = +files_win32_hg = +files_general_hg = bitmap.hg color.hg colormap.hg cursor.hg \ + device.hg display.hg displaymanager.hg dragcontext.hg drawable.hg event.hg gc.hg image.hg \ + pixbuf.hg pixbufanimation.hg pixbufanimationiter.hg pixmap.hg pixbufformat.hg pixbufloader.hg \ + rectangle.hg region.hg rgbcmap.hg screen.hg types.hg visual.hg window.hg + +files_general_deprecated_hg = +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +files_built_p_h = $(files_all_hg:.hg=_p.h) +private_includedir = $(includedir)/gdkmm-2.4/gdkmm/private +private_include_HEADERS = $(files_built_p_h) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/gdkmm/private/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/gdkmm/private/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-private_includeHEADERS: $(private_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(private_includedir)" || $(MKDIR_P) "$(DESTDIR)$(private_includedir)" + @list='$(private_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(private_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(private_includedir)/$$f'"; \ + $(private_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(private_includedir)/$$f"; \ + done + +uninstall-private_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(private_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(private_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(private_includedir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(private_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-private_includeHEADERS + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-private_includeHEADERS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-private_includeHEADERS install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-private_includeHEADERS + + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_built_p_h)) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/gdk/gdkmm/region.h b/libs/gtkmm2/gdk/gdkmm/region.h index af0d2647f9..0f49ba2fa3 100644 --- a/libs/gtkmm2/gdk/gdkmm/region.h +++ b/libs/gtkmm2/gdk/gdkmm/region.h @@ -141,19 +141,45 @@ public: explicit Region(const Rectangle& rectangle); + /** Obtains the smallest rectangle which includes the entire Gdk::Region. + * @param rectangle Return location for the clipbox. + */ void get_clipbox(const Rectangle& rectangle); Glib::ArrayHandle get_rectangles() const; + /** Finds out if the Gdk::Region is empty. + * @return true if @a region is empty. + */ bool empty(); + /** Finds out if a point is in a region. + * @param x The x coordinate of a point. + * @param y The y coordinate of a point. + * @return true if the point is in @a region . + */ bool point_in(int x, int y); + /** Tests whether a rectangle is within a region. + * @param rectangle A Gdk::Rectangle. + * @return Gdk::OVERLAP_RECTANGLE_IN, Gdk::OVERLAP_RECTANGLE_OUT, or + * Gdk::OVERLAP_RECTANGLE_PART, depending on whether the rectangle is inside, + * outside, or partly inside the Gdk::Region, respectively. + */ OverlapType rect_in(const Rectangle& rect); + /** Moves a region the specified distance. + * @param dx The distance to move the region horizontally. + * @param dy The distance to move the region vertically. + */ void offset(int dx, int dy); + /** Resizes a region by the specified amount. + * Positive values shrink the region. Negative values expand it. + * @param dx The number of pixels to shrink the region horizontally. + * @param dy The number of pixels to shrink the region vertically. + */ void shrink(int dx, int dy); /** Sets the area of @a region to the union of the areas of @a region and @@ -190,6 +216,13 @@ public: */ void xor_(const Region& source2); //xor is a keyword + /** Calls a function on each span in the intersection of @a region and @a spans . + * @param spans An array of Gdk::Spans. + * @param n_spans The length of @a spans . + * @param sorted true if @a spans is sorted wrt. the y coordinate. + * @param function Function to call on each span in the intersection. + * @param data Data to pass to @a function . + */ void spans_intersect_foreach(GdkSpan* spans, int n_spans, bool sorted, GdkSpanFunc function, gpointer data); @@ -222,10 +255,13 @@ bool operator!=(const Region& lhs, const Region& rhs); namespace Glib { - /** @relates Gdk::Region - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Region */ Gdk::Region wrap(GdkRegion* object, bool take_copy = false); diff --git a/libs/gtkmm2/gdk/gdkmm/screen.cc b/libs/gtkmm2/gdk/gdkmm/screen.cc index b41daef539..0f2d71d379 100644 --- a/libs/gtkmm2/gdk/gdkmm/screen.cc +++ b/libs/gtkmm2/gdk/gdkmm/screen.cc @@ -110,7 +110,7 @@ void Screen_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Screen_Class::size_changed_callback(GdkScreen* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -118,32 +118,35 @@ void Screen_Class::size_changed_callback(GdkScreen* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_size_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_size_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->size_changed) - (*base->size_changed)(self); - } + // Call the original underlying C function: + if(base && base->size_changed) + (*base->size_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -299,6 +302,11 @@ Glib::RefPtr Screen::get_rgba_visual() const return const_cast(this)->get_rgba_visual(); } +bool Screen::is_composited() const +{ + return gdk_screen_is_composited(const_cast(gobj())); +} + Glib::RefPtr Screen::get_root_window() { @@ -405,6 +413,47 @@ Glib::RefPtr Screen::get_default() } +void Screen::set_font_options(const Cairo::FontOptions& options) +{ +gdk_screen_set_font_options(gobj(), (options).cobj()); +} + +Cairo::FontOptions Screen::get_font_options() const +{ + return Cairo::FontOptions(const_cast(gdk_screen_get_font_options(const_cast(gobj()))), true /* take_reference */); +} + +void Screen::set_resolution(double dpi) +{ +gdk_screen_set_resolution(gobj(), dpi); +} + +double Screen::get_resolution() const +{ + return gdk_screen_get_resolution(const_cast(gobj())); +} + +Glib::RefPtr Screen::get_active_window() +{ + + Glib::RefPtr retvalue = Glib::wrap((GdkWindowObject*)(gdk_screen_get_active_window(gobj()))); + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; + +} + +Glib::RefPtr Screen::get_active_window() const +{ + return const_cast(this)->get_active_window(); +} + +Glib::ListHandle< Glib::RefPtr > Screen::get_window_stack() +{ + return Glib::ListHandle< Glib::RefPtr >(gdk_screen_get_window_stack(gobj()), Glib::OWNERSHIP_DEEP); +} + + Glib::SignalProxy0< void > Screen::signal_size_changed() { return Glib::SignalProxy0< void >(this, &Screen_signal_size_changed_info); diff --git a/libs/gtkmm2/gdk/gdkmm/screen.h b/libs/gtkmm2/gdk/gdkmm/screen.h index 5cdb4e744a..d8ea3c075d 100644 --- a/libs/gtkmm2/gdk/gdkmm/screen.h +++ b/libs/gtkmm2/gdk/gdkmm/screen.h @@ -31,6 +31,7 @@ //#include #include #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -216,6 +217,11 @@ public: * when displaying the window on the screen: in particular, for * X an appropriate windowing manager and compositing manager * must be running to provide appropriate display. + * + * This functionality is not implemented in the Windows backend. + * + * For setting an overall opacity for a top-level window, see + * gdk_window_set_opacity(). * @return A colormap to use for windows with an alpha channel * or 0 if the capability is not available. * @@ -231,6 +237,11 @@ public: * when displaying the window on the screen: in particular, for * X an appropriate windowing manager and compositing manager * must be running to provide appropriate display. + * + * This functionality is not implemented in the Windows backend. + * + * For setting an overall opacity for a top-level window, see + * gdk_window_set_opacity(). * @return A colormap to use for windows with an alpha channel * or 0 if the capability is not available. * @@ -260,6 +271,15 @@ public: Glib::RefPtr get_rgba_visual() const; + /** Return value: Whether windows with RGBA visuals can reasonably be + * @return Whether windows with RGBA visuals can reasonably be + * expected to have their alpha channels drawn correctly on the screen. + * + * @newin2p10. + */ + bool is_composited() const; + + /** Gets the root window of @a screen . * @return The root window * @@ -320,15 +340,14 @@ public: */ int get_width_mm() const; - /** Returns the height of @a screen in millimeters. - * Note that on some X servers this value will not be correct. + /** Returns: the heigth of @a screen in millimeters. * @return The heigth of @a screen in millimeters. * * @newin2p2. */ int get_height_mm() const; - + /** Lists the available visuals for the specified @a screen . * A visual describes a hardware image data format. * For example, a visual might support 24-bit color, or 8-bit color, @@ -337,7 +356,8 @@ public: * @return A list of visuals. */ Glib::ListHandle< Glib::RefPtr > list_visuals(); - + + /** Obtains a list of all toplevel windows known to GDK on the screen @a screen . * A toplevel window is a child of the root window (see * gdk_get_default_root_window()). @@ -345,6 +365,7 @@ public: * @return List of toplevel windows. */ Glib::ListHandle< Glib::RefPtr > get_toplevel_windows(); + /** Determines the name to pass to Gdk::Display::open() to get * a Gdk::Display with this screen as the default screen. @@ -355,7 +376,7 @@ public: Glib::ustring make_display_name(); - /** Returns the number of monitors which @a screen consists of. + /** Returns: number of monitors which @a screen consists of. * @return Number of monitors which @a screen consists of. * * @newin2p2. @@ -374,7 +395,7 @@ public: */ void get_monitor_geometry(int monitor_num, Rectangle& dest) const; - /** Returns the monitor number in which the point ( @a x , @a y ) is located. + /** Returns: the monitor number in which the point ( @a x , @a y ) lies, or * @param x The x coordinate in the virtual screen. * @param y The y coordinate in the virtual screen. * @return The monitor number in which the point ( @a x , @a y ) lies, or @@ -427,13 +448,79 @@ public: bool get_setting(const Glib::ustring& name, ValueType& value) const; + /** Sets the default font options for the screen. These + * options will be set on any Pango::Context's newly created + * with gdk_pango_context_get_for_screen(). Changing the + * default set of font options does not affect contexts that + * have already been created. + * + * @newin2p10 + * @param options A #cairo_font_options_t, or 0 to unset any + * previously set default font options. + */ + void set_font_options(const Cairo::FontOptions& options); + + // Note: This returns a const, so we assume that we must copy it: + + + /** Gets any options previously set with set_font_options(). + * @return The current font options, or 0 if no default + * font options have been set. + * + * @newin2p10. + */ + Cairo::FontOptions get_font_options() const; + + + /** @newin2p10 + * @param dpi The resolution in "dots per inch". (Physical inches aren't actually + * involved; the terminology is conventional.) + * + * Sets the resolution for font handling on the screen. This is a + * scale factor between points specified in a Pango::FontDescription + * and cairo units. The default value is 96, meaning that a 10 point + * font will be 13 units high. (10 * 96. / 72. = 13.3). + */ + void set_resolution(double dpi); + + /** Gets the resolution for font handling on the screen; see + * set_resolution() for full details. + * @return The current resolution, or -1 if no resolution + * has been set. + * + * @newin2p10. + */ + double get_resolution() const; + + + /** Return value: the currently active window, or 0. + * @return The currently active window, or 0. + * + * @newin2p10. + */ + Glib::RefPtr get_active_window(); + + /** Return value: the currently active window, or 0. + * @return The currently active window, or 0. + * + * @newin2p10. + */ + Glib::RefPtr get_active_window() const; + + + /** Return value: a list of Gdk::Window<!-- -->s for the current window stack, + * @return A list of Gdk::Window<!-- -->s for the current window stack, + * or 0. + * + * @newin2p10. + */ + Glib::ListHandle< Glib::RefPtr > get_window_stack(); + /** The size_changed signal is emitted when the pixel width or * height of a screen changes. - */ - -/** + * * @par Prototype: - * void %size_changed() + * void on_my_%size_changed() */ Glib::SignalProxy0< void > signal_size_changed(); @@ -476,10 +563,13 @@ bool Screen::get_setting(const Glib::ustring& name, ValueType& value) const namespace Glib { - /** @relates Gdk::Screen - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Screen */ Glib::RefPtr wrap(GdkScreen* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/types.h b/libs/gtkmm2/gdk/gdkmm/types.h index 60dd486794..d9d10f556b 100644 --- a/libs/gtkmm2/gdk/gdkmm/types.h +++ b/libs/gtkmm2/gdk/gdkmm/types.h @@ -128,8 +128,11 @@ enum ModifierType BUTTON3_MASK = 1 << 10, BUTTON4_MASK = 1 << 11, BUTTON5_MASK = 1 << 12, + SUPER_MASK = 1 << 26, + HYPER_MASK = 1 << 27, + META_MASK = 1 << 28, RELEASE_MASK = 1 << 30, - MODIFIER_MASK = 0x40001FFF + MODIFIER_MASK = 0x5c001fff }; /** @ingroup gdkmmEnums */ @@ -352,6 +355,7 @@ typedef AtomStringTraits AtomString; #endif //DOXYGEN_SHOULD_SKIP_THIS typedef Glib::ArrayHandle ArrayHandle_AtomString; +typedef Glib::ListHandle ListHandle_AtomString; } // namespace Gdk diff --git a/libs/gtkmm2/gdk/gdkmm/visual.cc b/libs/gtkmm2/gdk/gdkmm/visual.cc index 4f77645a88..d92b6f82d6 100644 --- a/libs/gtkmm2/gdk/gdkmm/visual.cc +++ b/libs/gtkmm2/gdk/gdkmm/visual.cc @@ -147,7 +147,8 @@ GType Visual::get_base_type() Visual::Visual() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(visual_class_.init())) { } diff --git a/libs/gtkmm2/gdk/gdkmm/visual.h b/libs/gtkmm2/gdk/gdkmm/visual.h index b170b4ce15..8c713a92e7 100644 --- a/libs/gtkmm2/gdk/gdkmm/visual.h +++ b/libs/gtkmm2/gdk/gdkmm/visual.h @@ -247,10 +247,13 @@ protected: namespace Glib { - /** @relates Gdk::Visual - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Visual */ Glib::RefPtr wrap(GdkVisual* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmm/window.cc b/libs/gtkmm2/gdk/gdkmm/window.cc index 90c72d1dc7..7a2b84dec6 100644 --- a/libs/gtkmm2/gdk/gdkmm/window.cc +++ b/libs/gtkmm2/gdk/gdkmm/window.cc @@ -380,11 +380,36 @@ void Window::set_child_shapes() gdk_window_set_child_shapes(gobj()); } +void Window::set_composited(bool composited) +{ +gdk_window_set_composited(gobj(), static_cast(composited)); +} + void Window::merge_child_shapes() { gdk_window_merge_child_shapes(gobj()); } +void Window::input_shape_combine_mask(const Glib::RefPtr& mask, int x, int y) +{ +gdk_window_input_shape_combine_mask(gobj(), Glib::unwrap(mask), x, y); +} + +void Window::input_shape_combine_region(const Region& shape_region, int offset_x, int offset_y) +{ +gdk_window_input_shape_combine_region(gobj(), const_cast((shape_region).gobj()), offset_x, offset_y); +} + +void Window::set_child_input_shapes() +{ +gdk_window_set_child_input_shapes(gobj()); +} + +void Window::merge_child_input_shapes() +{ +gdk_window_merge_child_input_shapes(gobj()); +} + bool Window::is_visible() const { return gdk_window_is_visible(const_cast(gobj())); @@ -410,6 +435,11 @@ void Window::set_type_hint(WindowTypeHint hint) gdk_window_set_type_hint(gobj(), ((GdkWindowTypeHint)(hint))); } +WindowTypeHint Window::get_type_hint() +{ + return ((WindowTypeHint)(gdk_window_get_type_hint(gobj()))); +} + void Window::set_modal_hint(bool modal) { gdk_window_set_modal_hint(gobj(), static_cast(modal)); @@ -451,6 +481,11 @@ void Window::set_role(const Glib::ustring& role) gdk_window_set_role(gobj(), role.c_str()); } +void Window::set_startup_id(const Glib::ustring& startup_id) +{ +gdk_window_set_startup_id(gobj(), startup_id.c_str()); +} + void Window::set_transient_for(const Glib::RefPtr& parent) { gdk_window_set_transient_for(gobj(), Glib::unwrap(parent)); @@ -612,6 +647,11 @@ Glib::ListHandle< Glib::RefPtr > Window::get_toplevels() } +void Window::beep() +{ +gdk_window_beep(gobj()); +} + void Window::iconify() { gdk_window_iconify(gobj()); @@ -772,6 +812,11 @@ void Window::set_keep_below(bool setting) gdk_window_set_keep_below(gobj(), static_cast(setting)); } +void Window::set_opacity(double opacity) +{ +gdk_window_set_opacity(gobj(), opacity); +} + void Window::set_accept_focus(bool accept_focus) { gdk_window_set_accept_focus(gobj(), static_cast(accept_focus)); diff --git a/libs/gtkmm2/gdk/gdkmm/window.h b/libs/gtkmm2/gdk/gdkmm/window.h index 40acfafa32..3c3835562e 100644 --- a/libs/gtkmm2/gdk/gdkmm/window.h +++ b/libs/gtkmm2/gdk/gdkmm/window.h @@ -264,7 +264,8 @@ enum WindowAttributesType WA_COLORMAP = 1 << 5, WA_VISUAL = 1 << 6, WA_WMCLASS = 1 << 7, - WA_NOREDIR = 1 << 8 + WA_NOREDIR = 1 << 8, + WA_TYPE_HINT = 1 << 9 }; /** @ingroup gdkmmEnums */ @@ -401,7 +402,13 @@ enum WindowTypeHint WINDOW_TYPE_HINT_SPLASHSCREEN, WINDOW_TYPE_HINT_UTILITY, WINDOW_TYPE_HINT_DOCK, - WINDOW_TYPE_HINT_DESKTOP + WINDOW_TYPE_HINT_DESKTOP, + WINDOW_TYPE_HINT_DROPDOWN_MENU, + WINDOW_TYPE_HINT_POPUP_MENU, + WINDOW_TYPE_HINT_TOOLTIP, + WINDOW_TYPE_HINT_NOTIFICATION, + WINDOW_TYPE_HINT_COMBO, + WINDOW_TYPE_HINT_DND }; } // namespace Gdk @@ -904,6 +911,9 @@ public: * easy to break GDK and/or GTK+, so you have to know what you're * doing. Pass 0 for @a window to get all events for all windows, * instead of events for a specific window. + * + * See Gdk::Display::add_client_message_filter() if you are interested + * in X ClientMessage events. * @param function Filter callback. * @param data Data to pass to filter callback. */ @@ -957,12 +967,14 @@ public: * buggy. On servers without the shape extension, this function * will do nothing. * + * On the Win32 platform the functionality is always present. + * * This function works on both toplevel and child windows. * @param mask Shape mask. * @param x X position of shape mask with respect to @a window . * @param y Y position of shape mask with respect to @a window . */ - void shape_combine_mask(const Glib::RefPtr& mask, int x, int y); + void shape_combine_mask(const Glib::RefPtr& mask, int x, int y); void unset_shape_combine_mask(); @@ -980,6 +992,8 @@ public: * buggy. On servers without the shape extension, this function * will do nothing. * + * On the Win32 platform, this functionality is always present. + * * This function works on both toplevel and child windows. * @param shape_region Region of window to be non-transparent. * @param offset_x X position of @a shape_region in @a window coordinates. @@ -994,6 +1008,35 @@ public: */ void set_child_shapes(); + /** Sets a Gdk::Window as composited, or unsets it. Composited + * windows do not automatically have their contents drawn to + * the screen. Drawing is redirected to an offscreen buffer + * and an expose event is emitted on the parent of the composited + * window. It is the responsibility of the parent's expose handler + * to manually merge the off-screen content onto the screen in + * whatever way it sees fit. See <xref linkend="composited-window-example"/> + * for an example. + * + * It only makes sense for child windows to be composited; see + * gdk_window_set_opacity() if you need translucent toplevel + * windows. + * + * An additional effect of this call is that the area of this + * window is no longer clipped from regions marked for + * invalidation on its parent. Draws done on the parent + * window are also no longer clipped by the child. + * + * This call is only supported on some systems (currently, + * only X11 with new enough Xcomposite and Xdamage extensions). + * You must call Gdk::Display::supports_composite() to check if + * setting a window as composited is supported before + * attempting to do so. + * + * @newin2p12 + * @param composited true to set the window as composited. + */ + void set_composited(bool composited = TRUE); + /** Merges the shape masks for any child windows into the * shape mask for @a window . i.e. the union of all masks * for @a window and its children will become the new mask @@ -1004,7 +1047,79 @@ public: * be merged. */ void merge_child_shapes(); + + /** Like gdk_window_shape_combine_mask(), but the shape applies + * only to event handling. Mouse events which happen while + * the pointer position corresponds to an unset bit in the + * mask will be passed on the window below @a window . + * + * An input shape is typically used with RGBA windows. + * The alpha channel of the window defines which pixels are + * invisible and allows for nicely antialiased borders, + * and the input shape controls where the window is + * "clickable". + * + * On the X11 platform, this requires version 1.1 of the + * shape extension. + * + * On the Win32 platform, this functionality is not present and the + * function does nothing. + * + * @newin2p10 + * @param mask Shape mask. + * @param x X position of shape mask with respect to @a window . + * @param y Y position of shape mask with respect to @a window . + */ + void input_shape_combine_mask(const Glib::RefPtr& mask, int x, int y); + + /** Like gdk_window_shape_combine_region(), but the shape applies + * only to event handling. Mouse events which happen while + * the pointer position corresponds to an unset bit in the + * mask will be passed on the window below @a window . + * + * An input shape is typically used with RGBA windows. + * The alpha channel of the window defines which pixels are + * invisible and allows for nicely antialiased borders, + * and the input shape controls where the window is + * "clickable". + * + * On the X11 platform, this requires version 1.1 of the + * shape extension. + * + * On the Win32 platform, this functionality is not present and the + * function does nothing. + * + * @newin2p10 + * @param shape_region Region of window to be non-transparent. + * @param offset_x X position of @a shape_region in @a window coordinates. + * @param offset_y Y position of @a shape_region in @a window coordinates. + */ + void input_shape_combine_region (const Region& shape_region, int offset_x, int offset_y); + + /** Sets the input shape mask of @a window to the union of input shape masks + * for all children of @a window , ignoring the input shape mask of @a window + * itself. Contrast with gdk_window_merge_child_input_shapes() which includes + * the input shape mask of @a window in the masks to be merged. + * + * @newin2p10 + */ + void set_child_input_shapes(); + + /** Merges the input shape masks for any child windows into the + * input shape mask for @a window . i.e. the union of all input masks + * for @a window and its children will become the new input mask + * for @a window . See gdk_window_input_shape_combine_mask(). + * + * This function is distinct from gdk_window_set_child_input_shapes() + * because it includes @a window 's input shape mask in the set of + * shapes to be merged. + * + * @newin2p10 + */ + void merge_child_input_shapes(); + + /** Checks whether the window has been mapped (with gdk_window_show() or * gdk_window_show_unraised()). * @return true if the window is mapped. @@ -1044,6 +1159,13 @@ public: */ void set_type_hint(WindowTypeHint hint); + /** This function returns the type hint set for a window. + * @return The type hint set for @a window + * + * @newin2p10. + */ + WindowTypeHint get_type_hint(); + /** The application can use this hint to tell the window manager * that a certain window has modal behaviour. The window manager * can use this information to handle modal windows in a special @@ -1180,6 +1302,14 @@ public: */ void set_role(const Glib::ustring& role); + /** When using GTK+, typically you should use gtk_window_set_startup_id() + * instead of this low-level function. + * + * @newin2p12 + * @param startup_id A string with startup-notification identifier. + */ + void set_startup_id(const Glib::ustring& startup_id); + /** Indicates to the window manager that @a window is a transient dialog * associated with the application window @a parent . This allows the * window manager to do things like center @a window on @a parent and @@ -1314,10 +1444,14 @@ public: void get_frame_extents(Rectangle& rect); /** Obtains the current pointer position and modifier state. - * The position is given in coordinates relative to @a window . - * @param x Return location for X coordinate of pointer. - * @param y Return location for Y coordinate of pointer. - * @param mask Return location for modifier mask. + * The position is given in coordinates relative to the upper left + * corner of @a window . + * @param x Return location for X coordinate of pointer or 0 to not + * return the X coordinate. + * @param y Return location for Y coordinate of pointer or 0 to not + * return the Y coordinate. + * @param mask Return location for modifier mask or 0 to not return the + * modifier mask. * @return The window containing the pointer (as with * gdk_window_at_pointer()), or 0 if the window containing the * pointer isn't known to GDK. @@ -1440,14 +1574,14 @@ public: */ void set_group(const Glib::RefPtr& leader); - /** Returns the group leader window for @a window . See gdk_window_set_group(). + /** Return value: the group leader window for @a window * @return The group leader window for @a window * * @newin2p4. */ Glib::RefPtr get_group(); - /** Returns the group leader window for @a window . See gdk_window_set_group(). + /** Return value: the group leader window for @a window * @return The group leader window for @a window * * @newin2p4. @@ -1473,15 +1607,17 @@ public: */ void set_decorations(WMDecoration decorations); - /** Returns the decorations set on the GdkWindow with #gdk_window_set_decorations + /** Returns: true if the window has decorations set, false otherwise. * @param decorations The window decorations will be written here. * @return true if the window has decorations set, false otherwise. */ bool get_decorations(WMDecoration& decorations) const; - /** This function isn't really good for much. It sets the traditional - * Motif window manager hint for which operations the window manager - * should allow on a toplevel window. However, few window managers do + /** Sets hints about the window management functions to make available + * via buttons on the window frame. + * + * On the X backend, this function sets the traditional Motif window + * manager hint for this purpose. However, few window managers do * anything reliable or interesting with this hint. Many ignore it * entirely. * @@ -1504,6 +1640,15 @@ public: static Glib::ListHandle< Glib::RefPtr > get_toplevels(); + /** Emits a short beep associated to @a window in the appropriate + * display, if supported. Otherwise, emits a short beep on + * the display just as Gdk::Display::beep(). + * + * @newin2p12 + */ + void beep(); + + /** Asks to iconify (minimize) @a window . The window manager may choose * to ignore the request, but normally will honor it. Using * gtk_window_iconify() is preferred, if you have a Gtk::Window widget. @@ -1596,7 +1741,8 @@ public: /** A convenience wrapper around gdk_window_invalidate_region() which * invalidates a rectangular region. See * gdk_window_invalidate_region() for details. - * @param rect Rectangle to invalidate. + * @param rect Rectangle to invalidate or 0 to invalidate the whole + * window. * @param invalidate_children Whether to also invalidate child windows. */ void invalidate_rect(const Rectangle& rect, bool invalidate_children); @@ -1624,14 +1770,12 @@ public: */ void invalidate_region(const Region& region, bool invalidate_children = true); - //TODO: Rewrite the docs, to be more C++-like. /** Transfers ownership of the update area from @a window to the caller * of the function. That is, after calling this function, @a window will * no longer have an invalid/dirty region; the update area is removed * from @a window and handed to you. If a window has no update area, - * gdk_window_get_update_area() returns 0. You are responsible for - * calling gdk_region_destroy() on the returned region if it's non-0. + * get_update_area() returns an invalid Region. * @return The update area for @a window . */ Region get_update_area(); @@ -1826,7 +1970,8 @@ public: GrabStatus pointer_grab(bool owner_events, EventMask event_mask, guint32 timestamp); - /** Ungrabs the pointer, if it is grabbed by this application. + /** Ungrabs the pointer on the default display, if it is grabbed by this + * application. * @param timestamp A timestamp from a Gdk::Event, or Gdk::CURRENT_TIME if no * timestamp is available. */ @@ -1834,7 +1979,8 @@ public: GrabStatus keyboard_grab(bool owner_events, guint32 timestamp); - /** Ungrabs the keyboard, if it is grabbed by this application. + /** Ungrabs the keyboard on the default display, if it is grabbed by this + * application. * @param timestamp A timestamp from a Gdk::Event, or Gdk::CURRENT_TIME if no * timestamp is available. */ @@ -1872,6 +2018,23 @@ public: void set_keep_below(bool setting = true); + /** Request the windowing system to make @a window partially transparent, + * with opacity 0 being fully transparent and 1 fully opaque. (Values + * of the opacity parameter are clamped to the [0,1] range.) + * + * On X11, this works only on X screens with a compositing manager + * running. + * + * For setting up per-pixel alpha, see Gdk::Screen::get_rgba_colormap(). + * For making non-toplevel windows translucent, see + * gdk_window_set_composited(). + * + * @newin2p12 + * @param opacity Opacity. + */ + void set_opacity(double opacity); + + /** Setting @a accept_focus to false hints the desktop environment that the * window doesn't want to receive input focus. * @@ -1923,10 +2086,13 @@ protected: namespace Glib { - /** @relates Gdk::Window - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gdk::Window */ Glib::RefPtr wrap(GdkWindowObject* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gdk/gdkmmconfig.h.in b/libs/gtkmm2/gdk/gdkmmconfig.h.in new file mode 100644 index 0000000000..93ece3d84f --- /dev/null +++ b/libs/gtkmm2/gdk/gdkmmconfig.h.in @@ -0,0 +1,9 @@ +#ifndef _GDKMM_CONFIG_H +#define _GDKMM_CONFIG_H 1 + +#include + +#undef GDKMM_DISABLE_DEPRECATED + +#endif /* _GDKMM_CONFIG_H */ + diff --git a/libs/gtkmm2/gdk/src/Makefile.am b/libs/gtkmm2/gdk/src/Makefile.am new file mode 100644 index 0000000000..6baa07c1fd --- /dev/null +++ b/libs/gtkmm2/gdk/src/Makefile.am @@ -0,0 +1,11 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +sublib_name = gdkmm +sublib_namespace = Gdk +sublib_parentdir = gdkmm +files_defs = gdk.defs gdk_extra.defs gdk_pixbuf.defs gdk_pixbuf_enums.defs gdk_methods.defs gdk_signals.defs gdk_enums.defs \ + gdk_docs.xml gdk_docs_override.xml + +include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment + diff --git a/libs/gtkmm2/gdk/src/Makefile.in b/libs/gtkmm2/gdk/src/Makefile.in new file mode 100644 index 0000000000..ee177b1afb --- /dev/null +++ b/libs/gtkmm2/gdk/src/Makefile.in @@ -0,0 +1,464 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = README $(srcdir)/../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment \ + $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment \ + $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment \ + $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment +subdir = gdk/src +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +sublib_name = gdkmm +sublib_namespace = Gdk +sublib_parentdir = gdkmm +files_defs = gdk.defs gdk_extra.defs gdk_pixbuf.defs gdk_pixbuf_enums.defs gdk_methods.defs gdk_signals.defs gdk_enums.defs \ + gdk_docs.xml gdk_docs_override.xml + +tools_dir = $(top_srcdir)/tools +tools_dir_m4 = $(top_srcdir)/tools/m4 +tools_dir_pm = $(top_srcdir)/tools/pm +gensrc_destdir = $(srcdir)/../$(sublib_name) +stamp_dir = $(srcdir)/.stamps +files_tools_m4 = convert.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ + convert_gtk.m4 convert_pango.m4 + +tools_m4 = $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4) +files_posix_hg = +files_win32_hg = +files_general_hg = bitmap.hg color.hg colormap.hg cursor.hg \ + device.hg display.hg displaymanager.hg dragcontext.hg drawable.hg event.hg gc.hg image.hg \ + pixbuf.hg pixbufanimation.hg pixbufanimationiter.hg pixmap.hg pixbufformat.hg pixbufloader.hg \ + rectangle.hg region.hg rgbcmap.hg screen.hg types.hg visual.hg window.hg + +files_general_deprecated_hg = +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +# tools_pm = $(files_tools_pm:%.pm=$(tools_dir_pm)/%.pm) +files_all_ccg = $(files_all_hg:%.hg=%.ccg) +files_h = $(files_all_hg:%.hg=$(gensrc_destdir)/%.h) +files_cc = $(files_all_hg:%.hg=$(gensrc_destdir)/%.cc) +files_stamp = $(files_all_hg:%.hg=$(stamp_dir)/stamp-%) + +#Installed gmmproc stuff, from glibmm: +gmmproc_path = $(GMMPROC) +gmmproc_dir = $(GMMPROC_DIR) + +# We use our own m4 and pm files as well as the ones installed by gtkmm: +# Our override m4 include seems to need to be before the default one. +gmmproc_args = -I $(tools_dir_m4) --defs $(srcdir) +run_gmmproc = $(gmmproc_path) $(gmmproc_args) +gen_wrap_init_path = $(gmmproc_dir)/generate_wrap_init.pl +gen_wrap_init_args = --namespace=$(sublib_namespace) --parent_dir=$(sublib_parentdir) +run_gen_wrap_init = $(gen_wrap_init_path) $(gen_wrap_init_args) +EXTRA_DIST = Makefile_list_of_hg.am_fragment \ + $(files_defs) $(files_all_hg) $(files_all_ccg) + +sublib_srcdir = $(srcdir)/../src +files_hg_with_path = $(patsubst %.hg,$(sublib_srcdir)/%.hg,$(files_all_hg)) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment $(srcdir)/../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/src/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gdk/src/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +@MAINTAINER_MODE_FALSE@all-local: +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +$(stamp_dir)/stamp-%: %.hg %.ccg $(tools_m4) $(files_defs) + $(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir) + @echo 'timestamp' > $@ + +$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_path) $(files_hg_with_path) + $(run_gen_wrap_init) $(files_all_hg:%.hg=$(srcdir)/%.hg) >$@ + +create-stamp-dir: + @(test -d $(stamp_dir) || mkdir $(stamp_dir)) + +@MAINTAINER_MODE_TRUE@all-local: create-stamp-dir $(files_stamp) $(gensrc_destdir)/wrap_init.cc + +maintainer-clean-local: + rm -rf $(stamp_dir) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/gdk/src/Makefile_list_of_hg.am_fragment b/libs/gtkmm2/gdk/src/Makefile_list_of_hg.am_fragment new file mode 100644 index 0000000000..8d374b825f --- /dev/null +++ b/libs/gtkmm2/gdk/src/Makefile_list_of_hg.am_fragment @@ -0,0 +1,13 @@ +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +files_posix_hg = +files_win32_hg = +files_general_hg = bitmap.hg color.hg colormap.hg cursor.hg \ + device.hg display.hg displaymanager.hg dragcontext.hg drawable.hg event.hg gc.hg image.hg \ + pixbuf.hg pixbufanimation.hg pixbufanimationiter.hg pixmap.hg pixbufformat.hg pixbufloader.hg \ + rectangle.hg region.hg rgbcmap.hg screen.hg types.hg visual.hg window.hg +files_general_deprecated_hg = + +include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment diff --git a/libs/gtkmm2/gdk/src/README b/libs/gtkmm2/gdk/src/README new file mode 100644 index 0000000000..787c17ef55 --- /dev/null +++ b/libs/gtkmm2/gdk/src/README @@ -0,0 +1,5 @@ +Sources for the gdk drawing kit. + + + + diff --git a/libs/gtkmm2/gdk/src/bitmap.ccg b/libs/gtkmm2/gdk/src/bitmap.ccg new file mode 100644 index 0000000000..996bc3416f --- /dev/null +++ b/libs/gtkmm2/gdk/src/bitmap.ccg @@ -0,0 +1,44 @@ +// -*- c++ -*- +/* $Id: bitmap.ccg,v 1.2 2003/01/22 23:04:18 murrayc Exp $ */ + +/* Copyright 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace Gdk +{ + +Bitmap::Bitmap(GdkBitmap* castitem) +: + Pixmap((GdkPixmap*) castitem) +{} + +Bitmap::Bitmap(const char* data, int width, int height) +: + Pixmap((GdkPixmap*) gdk_bitmap_create_from_data(0, data, width, height)) +{} + +Bitmap::Bitmap(const Glib::RefPtr& drawable, const char* data, int width, int height) +: + Pixmap((GdkPixmap*) gdk_bitmap_create_from_data(Glib::unwrap(drawable), data, width, height)) +{} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/bitmap.hg b/libs/gtkmm2/gdk/src/bitmap.hg new file mode 100644 index 0000000000..9f24b88961 --- /dev/null +++ b/libs/gtkmm2/gdk/src/bitmap.hg @@ -0,0 +1,60 @@ +/* $Id: bitmap.hg,v 1.3 2004/01/05 17:32:12 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(gdkmm/private/pixmap_p.h) + +namespace Gdk +{ + +class Window; + +// In GDK, GdkBitmap has the same type as GdkPixmap. Both are typedefed +// to their base type GdkDrawable, but the real type is GdkPixmapObject. +// A GdkBitmap is a GdkPixmap with a depth of 1. + +/** Bitmaps are simply pixmaps with a depth of 1. (That is, they are monochrome bitmaps - each pixel can be either on or off). + */ +class Bitmap : public Gdk::Pixmap +{ + // The Bitmap type only really exists in gtkmm. We fake its existence + // with a custom Gdk::Pixmap_Class::wrap_new() -- see comments there. + _CLASS_GENERIC(Bitmap, GdkBitmap) + +protected: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + explicit Bitmap(GdkBitmap* castitem); + friend class Gdk::Pixmap_Class; +#endif + + Bitmap(const char* data, int width, int height); + + Bitmap(const Glib::RefPtr& drawable, const char* data, int width, int height); + +public: + _WRAP_CREATE(const char* data, int width, int height) + + _WRAP_CREATE(const Glib::RefPtr& drawable, const char* data, int width, int height) +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/color.ccg b/libs/gtkmm2/gdk/src/color.ccg new file mode 100644 index 0000000000..039eb3a700 --- /dev/null +++ b/libs/gtkmm2/gdk/src/color.ccg @@ -0,0 +1,213 @@ +// -*- c++ -*- +/* $Id: color.ccg,v 1.4 2005/11/29 16:38:10 murrayc Exp $ */ + +/* + * + * Copyright 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + +namespace Gdk +{ + +Color::Color() +{ + GdkColor tmp = { 0, 0, 0, 0, }; + gobject_ = gdk_color_copy(&tmp); +} + +Color::Color(const Glib::ustring& value) +{ + GdkColor tmp = { 0, 0, 0, 0, }; + gobject_ = gdk_color_copy(&tmp); + + set(value); +} + +void Color::set_grey(gushort value) +{ + gobject_->red = gobject_->green = gobject_->blue = value; +} + +void Color::set_grey_p(double g) +{ + gobject_->red = gobject_->green = gobject_->blue = (gushort)(g * 65535.0); +} + +void Color::set_rgb(gushort red_, gushort green_, gushort blue_) +{ + gobject_->red = red_; + gobject_->green = green_; + gobject_->blue = blue_; +} + +void Color::set_rgb_p(double red_, double green_, double blue_) +{ + gobject_->red = (gushort)(red_ * 65535.0); + gobject_->green = (gushort)(green_ * 65535.0); + gobject_->blue = (gushort)(blue_ * 65535.0); +} + +void Color::set_hsv(double h, double s, double v) +{ + //TODO: Comments/Documentation. I have no idea what this code does. murrayc. + + h /= 60.0; + int i = (int)h; + double p = v * (1 - s); + double q = v * (1 - s * (h - i)); + double t = v * (1 - s * (1 - h + i)); + + switch(i) + { + case 0: + set_rgb_p(v, t, p); + break; + case 1: + set_rgb_p(q, v, p); + break; + case 2: + set_rgb_p(p, v, t); + break; + case 3: + set_rgb_p(p, q, v); + break; + case 4: + set_rgb_p(t, p, v); + break; + default: + set_rgb_p(v, p, q); + } +} + +void Color::set_hsl(double h, double s, double l) +{ + //TODO: Comments/Documentation. I have no idea what this code does. murrayc. + + if(s == 0.0) + set_grey_p(l); + else + { + double t2 = (l < 0.5) ? l * (1.0 + s) : l + s - l * s; + double t1 = 2*l-t2; + h /= 360.0; + + double tr = h + 1.0/3.0; + double tg = h; + double tb = h - 1.0/3.0; + if (tb < 0) tb += 1.0; + + double r = 0.0, g = 0.0, b = 0.0; + + if (tr < 1.0/6.0) + r = t1 +(t2-t1) * 6 * tr; + else if (tr < 1.0/2.0) + r = t2; + else if (tr < 2.0/3.0) + r = t1+(t2-t1)*(2.0/3.0 - tr) * 6.0; + + if (tg < 1.0/6.0) + g = t1 + (t2 - t1) * 6 * tg; + else if (tg < 1.0/2.0) + g = t2; + else if (tg < 2.0/3.0) + g = t1+(t2-t1)*(2.0/3.0 - tg) * 6.0; + + if (tb < 1.0/6.0) + b = t1 +(t2-t1) * 6 * tb; + else if (tb < 1.0/2.0) + b = t2; + else if (tb < 2.0/3.0) + b = t1+(t2-t1)*(2.0/3.0 - tb) * 6.0; + + set_rgb_p(r, g, b); + } +} + +bool Color::set(const Glib::ustring& value) +{ + return gdk_color_parse(value.c_str(), gobj()); +} + +_DEPRECATE_IFDEF_START +bool Color::parse(const Glib::ustring& spec) +{ + return set(spec); +} +_DEPRECATE_IFDEF_END + +gushort Color::get_red() const +{ + return gobject_->red; +} + +gushort Color::get_green() const +{ + return gobject_->green; + +} +gushort Color::get_blue() const +{ + return gobject_->blue; +} + +void Color::set_red(gushort value) +{ + gobject_->red = value; +} + +void Color::set_green(gushort value) +{ + gobject_->green = value; +} + +void Color::set_blue(gushort value) +{ + gobject_->blue = value; +} + +void Color::rgb_find_color(const Glib::RefPtr& map) +{ + gdk_rgb_find_color(map->gobj(), gobj()); +} + +guint Color::get_pixel() const +{ + return gobject_->pixel; +} + +double Color::get_red_p() const +{ + return gobject_->red / 65535.0; +} + +double Color::get_green_p() const +{ + return gobject_->green / 65535.0; +} + +double Color::get_blue_p() const +{ + return gobject_->blue / 65535.0; +} + + +} //namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/color.hg b/libs/gtkmm2/gdk/src/color.hg new file mode 100644 index 0000000000..be1b34143e --- /dev/null +++ b/libs/gtkmm2/gdk/src/color.hg @@ -0,0 +1,186 @@ +/* $Id: color.hg,v 1.5 2005/11/29 16:38:10 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +// This is for including the config header before any code (such as +// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated: +_CONFIGINCLUDE(gdkmmconfig.h) + +#include + +_DEFS(gdkmm,gdk) + +namespace Gdk +{ + +class Colormap; + +/** Gdk::Color is used to describe an allocated or unallocated color. + * It contains the following data: + * pixel: For allocated colors, the value used to draw this color on the screen. + * red: The red component of the color. This is a value between 0 and 65535, with 65535 indicating full intensitiy. + * green: The green component of the color. + * blue: The blue component of the color. + */ +class Color +{ + _CLASS_BOXEDTYPE(Color, GdkColor, NONE, gdk_color_copy, gdk_color_free) +public: + + _CUSTOM_DEFAULT_CTOR + + /** Instantiate a new Gdk::Color. + * You should then use the set methods and call Gdk::Colormap::alloc_color(). + */ + Color(); + + /** Instantiate a new Gdk::Color. + * The color is not allocated - you must call Gdk::Colormap::alloc_color() yourself. + * The text string can be in any of the forms accepted by XParseColor; these include names for a color from rgb.txt, + * such as DarkSlateGray, or a hex specification such as 305050. + * @param value the string specifying the color.. + */ + explicit Color(const Glib::ustring& value); + + /** Set a grey color, by using the same value for all color components. + * @param value The value to be used for the red, green, and blue components. + */ + void set_grey(gushort value); + void set_grey_p(double g); + + /** Set the color, by specifying red, green, and blue color component values. + * @param red_ The red component of the color. + * @param green_ The green component of the color. + * @param blue_ The blue component of the color. + */ + void set_rgb(gushort red_, gushort green_, gushort blue_); + + /** Set the color, by specifying red, green, and blue color component values, as percentages. + * @param red_ The red component of the color, as a percentage. + * @param green_ The green component of the color, as a percentage. + * @param blue_ The blue component of the color, as a percentage. + */ + void set_rgb_p(double red_, double green_, double blue_); + + void set_hsv(double h, double s, double v); + void set_hsl(double h, double s, double l); + + /** Parses a textual specification of a color and fills in the red, green, and blue values. + * The color is not allocated - you must call Gdk::Colormap::alloc_color() yourself. + * The text string can be in any of the forms accepted by XParseColor; these include names for a color from rgb.txt, + * such as DarkSlateGray, or a hex specification such as 305050. + * + * @param value the string specifying the color. + * @result true if the parsing succeeded. + */ + bool set(const Glib::ustring& value); + + _DEPRECATE_IFDEF_START + /** + * @deprecated See set(). + */ + bool parse(const Glib::ustring& spec); + _DEPRECATE_IFDEF_END + + /** Get the red component of the color. + * @result The red component of the color. + */ + gushort get_red() const; + + /** Get the green component of the color. + * @result The green component of the color. + */ + gushort get_green() const; + + /** Get the blue component of the color. + * @result The blue component of the color. + */ + gushort get_blue() const; + + /** Set the red component of the color. + * @param value The red component of the color. + */ + void set_red(gushort value); + + /** Set the green component of the color. + * @param value The green component of the color. + */ + void set_green(gushort value); + + /** Set the blue component of the color. + * @param value The blue component of the color. + */ + void set_blue(gushort value); + + /** This will fill in the pixel field with the best matching pixel from a color cube. + * The color is then ready to be used for drawing, e.g. you can call Gdk::GC::set_foreground() which expects pixel to be initialized. + * Call this after setting the red, green, and blue fields. + * + * In many cases, you can avoid this whole issue by calling Gdk::GC::set_rgb_fg_color() or Gdk::GC::set_rgb_bg_color(), + * which do not expect pixels to be initialized in advance. If you use those methods, there's no need for this method(). + * + * @param map The colormap for the graphics context and drawable you're using to draw. If you're drawing to a Gtk::Widget, call Gtk::Widget::get_colormap(). + */ + void rgb_find_color(const Glib::RefPtr& map); + + /** Get the pixel value, for allocated colors. + * @result For allocated colors, the value used to draw this color on the screen. + */ + guint get_pixel() const; + + /** Get the red component of the color, as a percentage. + * @result The red component of the color, as a percentage. + */ + double get_red_p() const; + + /** Get the green component of the color, as a percentage. + * @result The green component of the color, as a percentage. + */ + double get_green_p() const; + + /** Get the blue component of the color, as a percentage. + * @result The blue component of the color, as a percentage. + */ + double get_blue_p() const; + +#m4begin + _WRAP_EQUAL(gdk_color_equal) +#m4end +}; + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +/* These traits are for arrays of GdkColor structs -- not pointer arrays. + */ +struct ColorTraits +{ + typedef Gdk::Color CppType; + typedef GdkColor CType; + typedef GdkColor CTypeNonConst; + + static CType to_c_type (const CppType& obj) { return *obj.gobj(); } + static CType to_c_type (const CType& obj) { return obj; } + static CppType to_cpp_type (const CType& obj) { return CppType(const_cast(&obj), true); } + static void release_c_type (const CType&) {} +}; +#endif //DOXYGEN_SHOULD_SKIP_THIS + +typedef Glib::ArrayHandle ArrayHandle_Color; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/colormap.ccg b/libs/gtkmm2/gdk/src/colormap.ccg new file mode 100644 index 0000000000..12958f4cd6 --- /dev/null +++ b/libs/gtkmm2/gdk/src/colormap.ccg @@ -0,0 +1,51 @@ +// -*- c++ -*- +/* $Id: colormap.ccg,v 1.3 2005/11/29 16:38:10 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gdk +{ + +Colormap::Colormap(const Glib::RefPtr& visual, bool allocate) +: Glib::Object( G_OBJECT( gdk_colormap_new(visual->gobj(), (gboolean)allocate) ) ) + {} + +_DEPRECATE_IFDEF_START +int Colormap::alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle& success) +{ + return gdk_colormap_alloc_colors(gobj(), const_cast(colors.data()), ncolors, static_cast(writeable), static_cast(best_match), (gboolean*)(success.data())); +} + +void Colormap::free_colors(Color& colors, int ncolors) +{ + gdk_colormap_free_colors(gobj(), (colors).gobj(), ncolors); +} +_DEPRECATE_IFDEF_END + +void Colormap::free_color(Color& color) +{ + gdk_colormap_free_colors(gobj(), color.gobj(), 1); +} + +} // namespace Gdk + + diff --git a/libs/gtkmm2/gdk/src/colormap.hg b/libs/gtkmm2/gdk/src/colormap.hg new file mode 100644 index 0000000000..43a3f5671d --- /dev/null +++ b/libs/gtkmm2/gdk/src/colormap.hg @@ -0,0 +1,85 @@ +/* $Id: colormap.hg,v 1.7 2006/04/12 11:11:24 murrayc Exp $ */ + +/* box.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +// This is for including the config header before any code (such as +// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated: +_CONFIGINCLUDE(gdkmmconfig.h) + +#include +#include +#include +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +/** A Colormap is an object that contains the mapping between the color values stored in memory and the RGB values that are + * used to display color values. In general, colormaps only contain significant information for pseudo-color visuals, but + * even for other visual types, a colormap object is required in some circumstances. + * + * There are a couple of special colormaps that can be retrieved. The system colormap (retrieved with get_system()) is the + * default colormap of the system. If you are using GdkRGB, there is another colormap that is important - the colormap in + * which GdkRGB works, retrieved with Gdk::rgb_get_colormap(). However, when using GdkRGB, it is not generally necessary to + * allocate colors directly. + */ +class Colormap : public Glib::Object +{ + _CLASS_GOBJECT(Colormap, GdkColormap, GDK_COLORMAP, Glib::Object, GObject) + _IGNORE(gdk_colormap_ref, gdk_colormap_unref) + _IGNORE(gdk_colormap_get_system_size, gdk_colormap_change) +protected: + explicit Colormap(const Glib::RefPtr& visual, bool allocate); + +public: + + _WRAP_CREATE(const Glib::RefPtr& visual, bool allocate) + + _WRAP_METHOD(static Glib::RefPtr get_system(), gdk_colormap_get_system, refreturn) + + //_WRAP_METHOD(void change(int ncolors), gdk_colormap_change) + + _DEPRECATE_IFDEF_START + ///@deprecated Use alloc_color(). + int alloc_colors(ArrayHandle_Color& colors, int ncolors, bool writeable, bool best_match, Glib::ArrayHandle& success); + _IGNORE(gdk_colormap_alloc_colors) + + ///@deprecated Use free_color() + void free_colors(Color& colors, int ncolors); + _IGNORE(gdk_colormap_free_colors) + _DEPRECATE_IFDEF_END + + _WRAP_METHOD(bool alloc_color(Color& color, bool writeable = false, bool best_match = true), gdk_colormap_alloc_color) + void free_color(Color& color); + + _WRAP_METHOD(void query_color (gulong pixel, Color& result), gdk_colormap_query_color) + + _WRAP_METHOD(Glib::RefPtr get_visual(), gdk_colormap_get_visual, refreturn) + _WRAP_METHOD(Glib::RefPtr get_visual() const, gdk_colormap_get_visual, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_screen(), gdk_colormap_get_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_screen() const, gdk_colormap_get_screen, refreturn, constversion) + +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/cursor.ccg b/libs/gtkmm2/gdk/src/cursor.ccg new file mode 100644 index 0000000000..f6015740dc --- /dev/null +++ b/libs/gtkmm2/gdk/src/cursor.ccg @@ -0,0 +1,59 @@ +// -*- c++ -*- +/* $Id: cursor.ccg,v 1.3 2005/07/10 19:24:21 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gdk +{ + +Cursor::Cursor(CursorType cursor_type) +{ + gobject_ = gdk_cursor_new((GdkCursorType)cursor_type); +} + +Cursor::Cursor(const Glib::RefPtr& source, const Glib::RefPtr& mask, + const Color& fg, const Color& bg, + int x, int y) +{ + gobject_ = gdk_cursor_new_from_pixmap(source->gobj(), mask->gobj(), + const_cast(fg.gobj()), + const_cast(bg.gobj()), + x, y); +} + +Cursor::Cursor(const Glib::RefPtr& display, CursorType cursor_type) +{ + gobject_ = gdk_cursor_new_for_display(display->gobj(), (GdkCursorType)cursor_type); +} + +Cursor::Cursor(const Glib::RefPtr& display, const Glib::RefPtr& pixbuf, int x, int y) +{ + gobject_ = gdk_cursor_new_from_pixbuf(display->gobj(), pixbuf->gobj(), x, y); +} + +Cursor::Cursor(const Glib::RefPtr& display, const Glib::ustring& name) +{ + gobject_ = gdk_cursor_new_from_name(display->gobj(), name.c_str()); +} + +} //namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/cursor.hg b/libs/gtkmm2/gdk/src/cursor.hg new file mode 100644 index 0000000000..0826a4d61d --- /dev/null +++ b/libs/gtkmm2/gdk/src/cursor.hg @@ -0,0 +1,62 @@ +/* $Id: cursor.hg,v 1.8 2006/04/12 11:11:24 murrayc Exp $ */ + +/* drawable.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(CursorType, GdkCursorType) + +/** This represents a cursor. + */ +class Cursor +{ + _CLASS_BOXEDTYPE(Cursor, GdkCursor, NONE, gdk_cursor_ref, gdk_cursor_unref) + _IGNORE(gdk_cursor_ref, gdk_cursor_unref) + +public: + explicit Cursor(CursorType cursor_type); + Cursor(const Glib::RefPtr& source, const Glib::RefPtr& mask, + const Color& fg, const Color& bg, + int x, int y); + explicit Cursor(const Glib::RefPtr& display, CursorType cursor_type); + Cursor(const Glib::RefPtr& display, const Glib::RefPtr& pixbuf, int x, int y); + explicit Cursor(const Glib::RefPtr& display, const Glib::ustring& name); + + _WRAP_METHOD(Glib::RefPtr get_display(), gdk_cursor_get_display, refreturn) + _WRAP_METHOD(Glib::RefPtr get_display() const, gdk_cursor_get_display, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_image(), gdk_cursor_get_image) + _WRAP_METHOD(Glib::RefPtr get_image() const, gdk_cursor_get_image, constversion) +}; + +} //namespace Gdk + + diff --git a/libs/gtkmm2/gdk/src/device.ccg b/libs/gtkmm2/gdk/src/device.ccg new file mode 100644 index 0000000000..e0fd597725 --- /dev/null +++ b/libs/gtkmm2/gdk/src/device.ccg @@ -0,0 +1,28 @@ +// -*- c++ -*- +/* $Id: device.ccg,v 1.1 2003/01/21 13:38:07 murrayc Exp $ */ + +/* Copyright 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gdk +{ + + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/device.hg b/libs/gtkmm2/gdk/src/device.hg new file mode 100644 index 0000000000..bca9a9d7cd --- /dev/null +++ b/libs/gtkmm2/gdk/src/device.hg @@ -0,0 +1,83 @@ +/* $Id: device.hg,v 1.3 2004/02/10 17:29:54 mxpxpod Exp $ */ + +/* Copyright (C) 2002-2004 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_WRAP_ENUM(InputMode, GdkInputMode) +_WRAP_ENUM(InputSource, GdkInputSource) + +/** A Gdk::Device instance contains a detailed description of an extended input device. + */ +class Device : public Glib::Object +{ + _CLASS_GOBJECT(Device,GdkDevice,GDK_DEVICE,Glib::Object,GObject) + +protected: + _CTOR_DEFAULT() + +public: + + _WRAP_METHOD(void set_source(InputSource source), gdk_device_set_source) + _WRAP_METHOD(bool set_mode(InputMode mode), gdk_device_set_mode) + _WRAP_METHOD(void set_key(guint index_, guint keyval, ModifierType modifiers), gdk_device_set_key) + _WRAP_METHOD(void set_axis_use(guint index_, AxisUse use), gdk_device_set_axis_use) + _WRAP_METHOD(void get_state(const Glib::RefPtr& window, double& axes, ModifierType& mask), gdk_device_get_state) + _WRAP_METHOD(bool get_history(const Glib::RefPtr& window, guint32 start, guint32 stop, GdkTimeCoord**& events, int& n_events), gdk_device_get_history) + _WRAP_METHOD(bool get_axis(double& axes, AxisUse use, double& value) const, gdk_device_get_axis) + + /** Gets the name of this device. + * @result The name of this device. + */ + _MEMBER_GET(name, name, Glib::ustring, gchar*) + + /** Gets the type of this device. + * @result The type of this device. + */ + _MEMBER_GET(source, source, InputSource, GdkInputSource) + + /** Gets the mode of this device. + * @result The mode of this device. + */ + _MEMBER_GET(mode, mode, InputMode, GdkInputMode) + + /** Discover whether the pointer follows device motion. + * @result true if the pointer follows device motion. + */ + _MEMBER_GET(has_cursor, has_cursor, bool, gboolean) + + //TODO: Add suitable accessor for the information in these fields. For now, people must use gobj() and access them directly. + //gint num_axes the length of the axes array. + //GdkDeviceAxis *axes an array of GdkDeviceAxis, describing the axes of this device. + // + //gint num_keys the length of the keys array. + //GdkDeviceKey *keys an array of GdkDeviceKey, describing the mapped macro buttons of this device. +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/display.ccg b/libs/gtkmm2/gdk/src/display.ccg new file mode 100644 index 0000000000..3d7e4d0d62 --- /dev/null +++ b/libs/gtkmm2/gdk/src/display.ccg @@ -0,0 +1,114 @@ +// -*- c++ -*- +/* $Id: display.ccg,v 1.5 2005/01/05 17:30:16 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +namespace Gdk +{ + +bool Display::set_selection_owner(const Glib::RefPtr& owner, Glib::ustring& selection, guint32 time_, bool send_event) +{ + return gdk_selection_owner_set_for_display(gobj(), owner->gobj(), Gdk::AtomString::to_c_type(selection), time_, (gboolean)send_event); +} + +Glib::RefPtr Display::get_selection_owner(const Glib::ustring& selection) +{ + return Glib::wrap( (GdkWindowObject*)gdk_selection_owner_get_for_display(gobj(), Gdk::AtomString::to_c_type(selection)) , true); +} + +void Display::selection_send_notify(guint32 requestor, Glib::ustring& selection, Glib::ustring& target, Glib::ustring& property, guint32 time_) +{ + gdk_selection_send_notify_for_display(gobj(), requestor, Gdk::AtomString::to_c_type(selection), Gdk::AtomString::to_c_type(target), Gdk::AtomString::to_c_type(property), time_); +} + +void Display::get_pointer(Glib::RefPtr& screen, int& x, int& y, ModifierType& mask) +{ + GdkScreen* cScreen = 0; + GdkModifierType cMask = (GdkModifierType)mask; + gdk_display_get_pointer(gobj(), &cScreen, &x, &y, &cMask); + screen = Glib::wrap(cScreen); + mask = (ModifierType)cMask; +} + +void Display::get_pointer(int& x, int& y, ModifierType& mask) +{ + GdkModifierType cMask = (GdkModifierType)mask; + gdk_display_get_pointer(gobj(), 0, &x, &y, &cMask); + mask = (ModifierType)cMask; +} + + +Glib::RefPtr Display::get_window_at_pointer() +{ + + Glib::RefPtr retvalue = Glib::wrap((GdkWindowObject*)(gdk_display_get_window_at_pointer(gobj(), 0, 0))); + + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; +} + +Glib::RefPtr Display::get_window_at_pointer() const +{ + + Glib::RefPtr retvalue = Glib::wrap((GdkWindowObject*)(gdk_display_get_window_at_pointer(const_cast(gobj()), 0, 0))); + + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; +} + +GdkDisplayPointerHooks* Display::unset_pointer_hooks() +{ + return gdk_display_set_pointer_hooks(gobj(), 0 /* See GDK docs */); +} + + void Display::store_clipboard(const Glib::RefPtr& clipboard_window, guint32 time_) + { + gdk_display_store_clipboard(gobj(), clipboard_window->gobj(), time_, 0 /* see the C docs */, 0); + } + + void Display::store_clipboard(const Glib::RefPtr& clipboard_window, guint32 time_, const Glib::StringArrayHandle& targets) + { + //Put it into a real container that we can use: + std::vector targets_copy = targets; + + //Create array of target GdkAtoms from target strings: + if(!targets_copy.empty()) + { + GdkAtom* pAtoms = new GdkAtom[targets_copy.size()]; + + for(guint i = 0; i < targets_copy.size(); ++i) + { + *pAtoms = Gdk::AtomString::to_c_type(targets_copy[i]); + } + + gdk_display_store_clipboard(gobj(), clipboard_window->gobj(), time_, 0 /* see the C docs */, 0); + + delete[] pAtoms; + } + } + +} //Gdk + + diff --git a/libs/gtkmm2/gdk/src/display.hg b/libs/gtkmm2/gdk/src/display.hg new file mode 100644 index 0000000000..0d2e17c25e --- /dev/null +++ b/libs/gtkmm2/gdk/src/display.hg @@ -0,0 +1,200 @@ +/* $Id: display.hg,v 1.22 2006/04/12 11:11:24 murrayc Exp $ */ + +/* display.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include //For ModifierType +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) + +class Drawable; + + /** Gdk::Display object's purpose is two fold: + * To grab/ungrab keyboard focus and mouse pointer + * To manage and provide information about the Gdk::Screen(s) available for this Gdk::Display + * + * Gdk::Display objects are the GDK representation of the X Display which can be described as a workstation consisting + * of a keyboard a pointing device (such as a mouse) and one or more screens. It is used to open and keep track of + * various Gdk::Screen objects currently instantiated by the application. It is also used to grab and release the keyboard + * and the mouse pointer. + */ +class Display : public Glib::Object +{ + _CLASS_GOBJECT(Display,GdkDisplay,GDK_DISPLAY,Glib::Object,GObject) +protected: + _CTOR_DEFAULT + +public: + _WRAP_METHOD(static Glib::RefPtr open(const Glib::ustring& display_name), gdk_display_open, refreturn) + + _WRAP_METHOD(Glib::ustring get_name() const, gdk_display_get_name) + + _WRAP_METHOD(int get_n_screens() const, gdk_display_get_n_screens) + _WRAP_METHOD(Glib::RefPtr get_screen(int screen_num), gdk_display_get_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_screen(int screen_num) const, gdk_display_get_screen, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_default_screen(), gdk_display_get_default_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_default_screen() const, gdk_display_get_default_screen, refreturn, constversion) + + _WRAP_METHOD(void pointer_ungrab(guint32 timestamp), gdk_display_pointer_ungrab) + _WRAP_METHOD(void keyboard_ungrab(guint32 timestamp), gdk_display_keyboard_ungrab) + _WRAP_METHOD(bool pointer_is_grabbed() const, gdk_display_pointer_is_grabbed) + _WRAP_METHOD(void beep(), gdk_display_beep) + _WRAP_METHOD(void sync(), gdk_display_sync) + _WRAP_METHOD(void close(), gdk_display_close) + + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > list_devices(), gdk_display_list_devices) + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > list_devices() const, gdk_display_list_devices) + + //TODO: Use C++ Gdk::Event: + //TODO: get_event() might remove the event - if so, then there should not be a const version: + _WRAP_METHOD(GdkEvent* get_event(), gdk_display_get_event) + _WRAP_METHOD(const GdkEvent* get_event() const, gdk_display_get_event, constversion) + + _WRAP_METHOD(GdkEvent* peek_event(), gdk_display_peek_event) + _WRAP_METHOD(GdkEvent* peek_event() const, gdk_display_peek_event, constversion) + _WRAP_METHOD(void put_event(GdkEvent* event), gdk_display_put_event) + + //TODO: Use a slot here, though this is probably never used anyway: + //Find out whether we can use a string representation for the atom - look for examples of this function's use. + _WRAP_METHOD(void add_client_message_filter(Glib::ustring& message_type, GdkFilterFunc func, gpointer data), gdk_display_add_client_message_filter) + + _WRAP_METHOD(void set_double_click_time(guint msec), gdk_display_set_double_click_time) + _WRAP_METHOD(void set_double_click_distance(guint distance), gdk_display_set_double_click_distance) + + + _WRAP_METHOD(static Glib::RefPtr get_default(), gdk_display_get_default, refreturn) + + _WRAP_METHOD(Glib::RefPtr get_core_pointer(), gdk_display_get_core_pointer, refreturn) + _WRAP_METHOD(Glib::RefPtr get_core_pointer() const, gdk_display_get_core_pointer, refreturn) + + /** Gets the current location of the pointer and the current modifier + * mask for a given display. + * + * @param screen location to store the screen that the cursor is on. + * @param x location to store root window X coordinate of pointer. + * @param y location to store root window Y coordinate of pointer. + * @param mask location to store current modifier mask. + * + **/ + void get_pointer(Glib::RefPtr& screen, int& x, int& y, ModifierType& mask); + + // In fact, any one of these gdk_display_get_pointer() args can be NULL, but we don't need so many overloads. + /** + * Gets the current location of the pointer and the current modifier + * mask for a given display. + * + * @param x location to store root window X coordinate of pointer. + * @param y location to store root window Y coordinate of pointer. + * @param mask location to store current modifier mask. + * + **/ + void get_pointer(int& x, int& y, ModifierType& mask); + _IGNORE(gdk_display_get_pointer) + + _WRAP_METHOD(Glib::RefPtr get_window_at_pointer(int& win_x, int& win_y), gdk_display_get_window_at_pointer, refreturn) + _WRAP_METHOD(Glib::RefPtr get_window_at_pointer(int& win_x, int& win_y) const, gdk_display_get_window_at_pointer, refreturn, constversion) + + /** Obtains the window underneath the mouse pointer. Returns a null RefPtr if the window + * under the mouse pointer is not known to GDK (for example, belongs to + * another application). + * @result The window underneath the mouse pointer. + */ + Glib::RefPtr get_window_at_pointer(); + + /** Obtains the window underneath the mouse pointer. Returns a null RefPtr if the window + * under the mouse pointer is not known to GDK (for example, belongs to + * another application). + * @result The window underneath the mouse pointer. + */ + Glib::RefPtr get_window_at_pointer() const; + + _WRAP_METHOD(void warp_pointer(const Glib::RefPtr& screen, int x, int y), gdk_display_warp_pointer) + + _WRAP_METHOD(GdkDisplayPointerHooks* set_pointer_hooks(const GdkDisplayPointerHooks* new_hooks), gdk_display_set_pointer_hooks) + GdkDisplayPointerHooks* unset_pointer_hooks(); + + _WRAP_METHOD(static Glib::RefPtr open_default_libgtk_only(), gdk_display_open_default_libgtk_only, refreturn) + + _WRAP_METHOD(guint32 get_drag_protocol(guint32 xid, GdkDragProtocol& protocol), gdk_drag_get_protocol_for_display) + + _WRAP_METHOD(GdkKeymap* get_keymap(), gdk_keymap_get_for_display) + _WRAP_METHOD(const GdkKeymap* get_keymap() const, gdk_keymap_get_for_display, constversion) + + bool set_selection_owner(const Glib::RefPtr& owner, Glib::ustring& selection, guint32 time_, bool send_event); + Glib::RefPtr get_selection_owner(const Glib::ustring& selection); + void selection_send_notify(guint32 requestor, Glib::ustring& selection, Glib::ustring& target, Glib::ustring& property, guint32 time_); + + _WRAP_METHOD(Glib::RefPtr lookup_pixmap(NativeWindow anid), gdk_pixmap_lookup_for_display) + _WRAP_METHOD(Glib::RefPtr lookup_pixmap(NativeWindow anid) const, gdk_pixmap_lookup_for_display, constversion) + + _WRAP_METHOD(void flush(), gdk_display_flush) + _WRAP_METHOD(bool supports_cursor_alpha() const, gdk_display_supports_cursor_alpha) + _WRAP_METHOD(bool supports_cursor_color() const, gdk_display_supports_cursor_color) + _WRAP_METHOD(guint get_default_cursor_size() const, gdk_display_get_default_cursor_size) + _WRAP_METHOD(void get_maximal_cursor_size(guint& width, guint& height), gdk_display_get_maximal_cursor_size) + + _WRAP_METHOD(Glib::RefPtr get_default_group(), gdk_display_get_default_group, refreturn) + _WRAP_METHOD(Glib::RefPtr get_default_group() const, gdk_display_get_default_group, refreturn, constversion) + + //TODO: wrap the vfuncs, though they are not very useful because people will not derive from this class? murrayc. + + + _WRAP_METHOD(bool supports_selection_notification() const, gdk_display_supports_selection_notification) + _WRAP_METHOD(bool request_selection_notification(const Glib::ustring& selection), gdk_display_request_selection_notification) + + _WRAP_METHOD(bool supports_clipboard_persistence() const, gdk_display_supports_clipboard_persistence) + + /** Issues a request to the clipboard manager to store the clipboard data, + * saving all available targets. + * On X11, this is a special program that works according to the freedesktop clipboard specification, + * available at http://www.freedesktop.org/Standards/clipboard-manager-spec. + * @newin2p6 + * + * @param clipboard_window A Gdk::Window belonging to the clipboard owner. + * @param time_ A timestamp. + */ + void store_clipboard(const Glib::RefPtr& clipboard_window, guint32 time_); + + void store_clipboard(const Glib::RefPtr& clipboard_window, guint32 time_, const Glib::StringArrayHandle& targets); + _IGNORE(gdk_display_store_clipboard) + + _WRAP_METHOD(bool supports_shapes() const, gdk_display_supports_shapes) + _WRAP_METHOD(bool supports_input_shapes() const, gdk_display_supports_input_shapes) + _WRAP_METHOD(bool supports_composite() const, gdk_display_supports_composite) + + + /** The closed signal is emitted when the connection to the windowing + * system for this display is closed. + * + * @param is_error true if the display was closed due to an error + */ + _WRAP_SIGNAL(void closed(bool is_error), closed) +}; + +} /* namespace Gdk */ + diff --git a/libs/libglademm/libglademm.h b/libs/gtkmm2/gdk/src/displaymanager.ccg similarity index 67% rename from libs/libglademm/libglademm.h rename to libs/gtkmm2/gdk/src/displaymanager.ccg index fb37dfb10d..43933dcd13 100644 --- a/libs/libglademm/libglademm.h +++ b/libs/gtkmm2/gdk/src/displaymanager.ccg @@ -1,7 +1,9 @@ -/* $Id$ */ -/* libglademm - a C++ wrapper for libglade +// -*- c++ -*- +/* $Id: displaymanager.ccg,v 1.1 2003/01/21 13:38:07 murrayc Exp $ */ + +/* * - * Copyright 1999-2001 Free Software Foundation + * Copyright 2002 The gtkmm Development Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,14 +20,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef LIBGLADEMM_H -#define LIBGLADEMM_H +#include +namespace Gdk +{ -/* libglademm version. */ -extern const int libglademm_major_version; -extern const int libglademm_minor_version; -extern const int libglademm_micro_version; -#include +} //Gdk -#endif /* #ifndef LIBGLADEMM_H */ diff --git a/libs/gtkmm2/gdk/src/displaymanager.hg b/libs/gtkmm2/gdk/src/displaymanager.hg new file mode 100644 index 0000000000..38d8917eca --- /dev/null +++ b/libs/gtkmm2/gdk/src/displaymanager.hg @@ -0,0 +1,65 @@ +/* $Id: displaymanager.hg,v 1.8 2006/04/12 11:11:24 murrayc Exp $ */ + +/* displaymanager.h + * + * Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +/** The purpose of the GdkDisplayManager singleton object is to offer notification when displays appear or disappear or the + * default display changes. + */ +class DisplayManager : public Glib::Object +{ + _CLASS_GOBJECT(DisplayManager,GdkDisplayManager,GDK_DISPLAY_MANAGER,Glib::Object,GObject) +protected: + +public: + + _WRAP_METHOD(static Glib::RefPtr get(), gdk_display_manager_get, refreturn) + _WRAP_METHOD(Glib::RefPtr get_default_display(), gdk_display_manager_get_default_display, refreturn) + _WRAP_METHOD(Glib::RefPtr get_default_display() const, gdk_display_manager_get_default_display, refreturn, constversion) + + _WRAP_METHOD(void set_default_display(const Glib::RefPtr& display), gdk_display_manager_set_default_display) + + _WRAP_METHOD(Glib::SListHandle< Glib::RefPtr > list_displays(), gdk_display_manager_list_displays) + + _WRAP_PROPERTY("default-display", Glib::RefPtr) + + +#m4 _CONVERSION(`GdkDisplay*',`const Glib::RefPtr&', Glib::wrap($3, true)) + + /** The display_opened signal is emitted when a display is opened. + * + * @newin2p2 + * + * @param display the opened display + */ + _WRAP_SIGNAL(void display_opened(const Glib::RefPtr& display), display-opened) +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/dragcontext.ccg b/libs/gtkmm2/gdk/src/dragcontext.ccg new file mode 100644 index 0000000000..5758fd4ca3 --- /dev/null +++ b/libs/gtkmm2/gdk/src/dragcontext.ccg @@ -0,0 +1,49 @@ +// -*- c++ -*- +/* $Id: dragcontext.ccg,v 1.7 2005/02/13 13:01:36 murrayc Exp $ */ + +/* + * + * Copyright 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include //For ScopedPtr<>. + +namespace Gdk +{ + +void DragContext::find_window_for_screen(const Glib::RefPtr& drag_window, const Glib::RefPtr& screen, int x_root, int y_root, Glib::RefPtr& dest_window, DragProtocol* protocol) const +{ + GdkWindow* cWindow = 0; + gdk_drag_find_window_for_screen(const_cast(gobj()), drag_window->gobj(), screen->gobj(), x_root, y_root, &cWindow, (GdkDragProtocol*)(protocol)); + dest_window = Glib::wrap((GdkWindowObject*)cWindow); +} + +void DragContext::drag_refuse(guint32 time) +{ + gdk_drag_status(gobj(), ((GdkDragAction)(0)) /* see GDK docs */, time); +} + +Gdk::ListHandle_AtomString DragContext::get_targets() const +{ + //Note that we don't free the GList* (or it's items), because we are accessing the struct directly: + return ListHandle_AtomString( gobj()->targets, Glib::OWNERSHIP_NONE); +} + +} /* namespace Gdk */ diff --git a/libs/gtkmm2/gdk/src/dragcontext.hg b/libs/gtkmm2/gdk/src/dragcontext.hg new file mode 100644 index 0000000000..e8d7925279 --- /dev/null +++ b/libs/gtkmm2/gdk/src/dragcontext.hg @@ -0,0 +1,132 @@ +/* $Id: dragcontext.hg,v 1.11 2006/03/22 16:53:21 murrayc Exp $ */ + +/* dragcontext.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + +namespace Gtk +{ + class Widget; +} /* namespace Gtk */ + +//typedef struct _GdkAtom *GdkAtom; + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(DragAction, GdkDragAction) +_WRAP_ENUM(DragProtocol, GdkDragProtocol) + +/** A Gdk::DragContext holds information about a drag in progress. It is used on both source and destination sides. + */ +class DragContext : public Glib::Object +{ + _CLASS_GOBJECT(DragContext, GdkDragContext, GDK_DRAG_CONTEXT, Glib::Object,GObject) + _IGNORE(gdk_drag_context_ref, gdk_drag_context_unref) +protected: + _CTOR_DEFAULT + +public: + _WRAP_CREATE() + + _WRAP_METHOD(void drag_status(DragAction action, guint32 time), gdk_drag_status) + void drag_refuse(guint32 time); + + _IGNORE(gdk_drag_motion) //gdk_drag_motion is only used in GDK internally. + + _WRAP_METHOD(void drop_reply(bool ok, guint32 time), gdk_drop_reply) + _WRAP_METHOD(void drop_finish(bool success, guint32 time), gdk_drop_finish) + _WRAP_METHOD(Glib::ustring get_selection() const, gdk_drag_get_selection) + + _WRAP_METHOD(void drag_finish(bool success, bool del, guint32 time), gtk_drag_finish) + //Gtk::Widget* get_source_widget() - see Gtk::Widget::drag_get_source_widget() + + // void set_icon(Gtk::Widget* widget, int hot_x, int hot_y) - see Gtk::Widget::set_as_icon(). + _WRAP_METHOD(void set_icon(const Glib::RefPtr& colormap, const Glib::RefPtr& pixmap, const Glib::RefPtr& mask, int hot_x, int hot_y), gtk_drag_set_icon_pixmap) + _WRAP_METHOD(void set_icon(const Glib::RefPtr& pixbuf, int hot_x, int hot_y), gtk_drag_set_icon_pixbuf) + + // The first argument was changed from StockID to ustring to avoid + // cross-dependence between gdkmm and gtkmm. + // See http://bugzilla.gnome.org/show_bug.cgi?id=79124 for details + _WRAP_METHOD(void set_icon(const Glib::ustring& stock_id, int hot_x, int hot_y), gtk_drag_set_icon_stock) + _WRAP_METHOD(void set_icon_name(const Glib::ustring& name, int hot_x, int hot_y), gtk_drag_set_icon_name) + _WRAP_METHOD(void set_icon(), gtk_drag_set_icon_default) + + /** Get the the source window of this drag. + * @result the source window of this drag. + */ + _MEMBER_GET_GOBJECT(source_window, source_window, Window, GdkWindow*) + + /** Get the the source window of this drag. + * @result the source window of this drag. + */ + _MEMBER_GET_GOBJECT(destination_window, dest_window, Window, GdkWindow*) + + /** Get a list of targets offered by the source. + * @result a list of targets offered by the source. + */ + Gdk::ListHandle_AtomString get_targets() const; + + /** Get the DND protocol which governs this drag. + * @result the DND protocol which governs this drag. + */ + _MEMBER_GET(protocol, protocol, DragProtocol, GdkDragProtocol) + + /** Discover whether the context is used on the source side. + * @result true if the context is used on the source side. + */ + _MEMBER_GET(is_source, is_source, bool, gboolean) + + /** Get a bitmask of actions proposed by the source when the suggested_action is Gdk::ACTION_ASK + * @result a bitmask of actions proposed by the source when the suggested_action is Gdk::ACTION_ASK + */ + _MEMBER_GET(actions, actions, DragAction, GdkDragAction) + + /** Get the action suggested by the source. + * @result The action suggested by the source. + */ + _MEMBER_GET(suggested_action, suggested_action, DragAction, GdkDragAction) + + /** Get the action chosen by the destination. + * @result the action chosen byt the destination. + */ + _MEMBER_GET(action, action, DragAction, GdkDragAction) + + /** Get a timestamp recording the start time of this drag. + * @result a timestamp recording the start time of this drag. + */ + _MEMBER_GET(start_time, start_time, guint32, guint32) + + _WRAP_METHOD_DOCS_ONLY(gdk_drag_find_window_for_screen) + void find_window_for_screen(const Glib::RefPtr& drag_window, const Glib::RefPtr& screen, int x_root, int y_root, Glib::RefPtr& dest_window, DragProtocol* protocol) const; + _IGNORE(gdk_drag_find_window_for_screen) +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/drawable.ccg b/libs/gtkmm2/gdk/src/drawable.ccg new file mode 100644 index 0000000000..c35d547e54 --- /dev/null +++ b/libs/gtkmm2/gdk/src/drawable.ccg @@ -0,0 +1,64 @@ +// -*- c++ -*- +/* $Id: drawable.ccg,v 1.2 2004/01/19 19:48:41 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + +namespace Gdk +{ + +void Drawable::draw_points(const Glib::RefPtr& gc, const Glib::ArrayHandle& points) +{ + // Don't assume the reinterpret_cast<> works everywhere. Gdk::Point is *special*. + gdk_draw_points( + gobj(), const_cast(Glib::unwrap(gc)), + reinterpret_cast(const_cast(points.data())), + points.size()); +} + +void Drawable::draw_lines(const Glib::RefPtr& gc, const Glib::ArrayHandle& points) +{ + // Don't assume the reinterpret_cast<> works everywhere. Gdk::Point is *special*. + gdk_draw_lines( + gobj(), const_cast(Glib::unwrap(gc)), + reinterpret_cast(const_cast(points.data())), + points.size()); +} + +void Drawable::draw_polygon(const Glib::RefPtr& gc, bool filled, + const Glib::ArrayHandle& points) +{ + // Don't assume the reinterpret_cast<> works everywhere. Gdk::Point is *special*. + gdk_draw_polygon( + gobj(), const_cast(Glib::unwrap(gc)), filled, + reinterpret_cast(const_cast(points.data())), + points.size()); +} + +void Drawable::copy_to_image(const Glib::RefPtr& image, int src_x, int src_y, int dest_x, int dest_y, int width, int height) const +{ + gdk_drawable_copy_to_image(const_cast(gobj()), Glib::unwrap(image), src_x, src_y, dest_x, dest_y, width, height); +} + + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/drawable.hg b/libs/gtkmm2/gdk/src/drawable.hg new file mode 100644 index 0000000000..03500c2c90 --- /dev/null +++ b/libs/gtkmm2/gdk/src/drawable.hg @@ -0,0 +1,175 @@ +/* $Id: drawable.hg,v 1.12 2006/12/03 17:21:37 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include + + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(RgbDither, GdkRgbDither) + +class GC; +class Pixbuf; + +/** Drawing Primitives. + * Gdk::Drawable is the base class for all of the objects that accept drawing + * commands. The available drawables include pixmaps, windows, and bitmaps. + * Drawable is abstract as there is no such type on the server side. + * + * To use a drawable, create a concrete Drawable of the type you wish to use + * and a Gdk::GC (graphics context) for that Drawable. With the GC you can + * draw lines, text, arcs and such. + * + * An alternative is to create a Cairo::Context with get_cairo_context() + * while you handle the 'exposed' event of the drawable. For more about + * this, please see "Using cairo with GTK+" in the "Common questions" section + * of the GTK+ Reference Manual. + */ +class Drawable : public Glib::Object +{ + _CLASS_GOBJECT(Drawable,GdkDrawable,GDK_DRAWABLE,Glib::Object,GObject) + _IGNORE(gdk_drawable_ref, gdk_drawable_unref, gdk_drawable_set_data, gdk_drawable_get_data) + +protected: + _CTOR_DEFAULT() + +public: + _WRAP_CREATE() + + _WRAP_METHOD(void get_size(int& width, int& height), gdk_drawable_get_size) + _WRAP_METHOD(int get_depth() const, gdk_drawable_get_depth) + + _WRAP_METHOD(void set_colormap(const Glib::RefPtr& colormap), gdk_drawable_set_colormap) + _WRAP_METHOD(Glib::RefPtr get_colormap(), gdk_drawable_get_colormap, refreturn) + _WRAP_METHOD(Glib::RefPtr get_visual(), gdk_drawable_get_visual, refreturn) + + _WRAP_METHOD(void draw_point(const Glib::RefPtr& gc, int x, int y), gdk_draw_point) + void draw_points(const Glib::RefPtr& gc, const Glib::ArrayHandle& points); + + _WRAP_METHOD(void draw_line(const Glib::RefPtr& gc, int x1, int y1, int x2, int y2), gdk_draw_line) + void draw_lines(const Glib::RefPtr& gc, const Glib::ArrayHandle& points); + + _WRAP_METHOD(void draw_rectangle(const Glib::RefPtr& gc, bool filled, int x, int y, int width, int height), gdk_draw_rectangle) + _WRAP_METHOD(void draw_arc(const Glib::RefPtr& gc, bool filled, int x, int y, int width, int height, int angle1, int angle2), gdk_draw_arc) + void draw_polygon(const Glib::RefPtr& gc, bool filled, const Glib::ArrayHandle& points); + + _WRAP_METHOD(void draw_drawable(const Glib::RefPtr& gc, const Glib::RefPtr& src, int xsrc, int ysrc, int xdest, int ydest, int width = -1, int height = -1), gdk_draw_drawable) + _WRAP_METHOD(void draw_image(const Glib::RefPtr& gc, const Glib::RefPtr& image, int xsrc, int ysrc, int xdest, int ydest, int width = -1, int height = -1), gdk_draw_image) + + //segs is an array, and this function will be used so little that it doesn't seem worth wrapping it to use a container of C++ types. + _WRAP_METHOD(void draw_segments(const Glib::RefPtr& gc, GdkSegment* segs, int nsegs), gdk_draw_segments) // TODO + + //glyphs is not an array. I went down to pango_xft_render in pango and saw that PangoGlyphString here is not an array. -Bryan + _WRAP_METHOD(void draw_glyphs(const Glib::RefPtr& gc, const Glib::RefPtr& font, int x, int y, const Pango::GlyphString& glyphs), gdk_draw_glyphs) + + _WRAP_METHOD(void draw_layout_line(const Glib::RefPtr& gc, int x, int y, const Glib::RefPtr& line), gdk_draw_layout_line) + _WRAP_METHOD(void draw_layout_line(const Glib::RefPtr& gc, int x, int y, const Glib::RefPtr& line, const Color& foreground, const Color& background), gdk_draw_layout_line_with_colors) + + _WRAP_METHOD(void draw_layout(const Glib::RefPtr& gc, int x, int y, const Glib::RefPtr& layout), gdk_draw_layout) + _WRAP_METHOD(void draw_layout(const Glib::RefPtr& gc, int x, int y, const Glib::RefPtr& layout, const Color& foreground, const Color& background), gdk_draw_layout_with_colors) + + _WRAP_METHOD(void draw_pixbuf(const Glib::RefPtr& gc, const Glib::RefPtr& pixbuf, + int src_x, int src_y, int dest_x, int dest_y, + int width, int height, + RgbDither dither, int x_dither, int y_dither), gdk_draw_pixbuf) + + // Note: This has no 'refreturn' because get_image() returns a newly created Image object. + _WRAP_METHOD(Glib::RefPtr get_image(int x, int y, int width, int height) const, gdk_drawable_get_image) + + // gdk_drawable_copy_to_image() returns a new GdkImage when the image parameter is NULL, but that seems to be much the + // same as gdk_drawable_get_image(). + void copy_to_image(const Glib::RefPtr& image, int src_x, int src_y, int dest_x, int dest_y, int width, int height) const; + _IGNORE(gdk_drawable_copy_to_image) + + _WRAP_METHOD(Region get_clip_region() const, gdk_drawable_get_clip_region) + _WRAP_METHOD(Region get_visible_region() const, gdk_drawable_get_visible_region) + + + // **** RGB stuff **** + + _WRAP_METHOD(void draw_rgb_image( + const Glib::RefPtr& gc, + int x, int y, int width, int height, + RgbDither dith, const guchar* rgb_buf, int rowstride), + gdk_draw_rgb_image) + + _WRAP_METHOD(void draw_rgb_image_dithalign( + const Glib::RefPtr& gc, + int x, int y, int width, int height, + RgbDither dith, const guchar* rgb_buf, int rowstride, + int xdith, int ydith), + gdk_draw_rgb_image_dithalign) + + _WRAP_METHOD(void draw_rgb_32_image( + const Glib::RefPtr& gc, + int x, int y, int width, int height, + RgbDither dith, const guchar* rgb_buf, int rowstride), + gdk_draw_rgb_32_image) + + _WRAP_METHOD(void draw_rgb_32_image_dithalign( + const Glib::RefPtr& gc, + int x, int y, int width, int height, + RgbDither dith, const guchar* buf, int rowstride, + int xdith, int ydith), + gdk_draw_rgb_32_image_dithalign) + + _WRAP_METHOD(void draw_gray_image( + const Glib::RefPtr& gc, + int x, int y, int width, int height, + RgbDither dith, const guchar* rgb_buf, int rowstride), + gdk_draw_gray_image) + + _WRAP_METHOD(void draw_indexed_image( + const Glib::RefPtr& gc, + int x, int y, int width, int height, + RgbDither dith, const guchar* rgb_buf, int rowstride, + const RgbCmap& cmap), + gdk_draw_indexed_image) + + _WRAP_METHOD(Glib::RefPtr get_screen(), gdk_drawable_get_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_screen() const, gdk_drawable_get_screen, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_display(), gdk_drawable_get_display, refreturn) + _WRAP_METHOD(Glib::RefPtr get_display() const, gdk_drawable_get_display, refreturn, constversion) + + #m4 _CONVERSION(`cairo_t*',`Cairo::RefPtr',`Cairo::RefPtr(new Cairo::Context($3, true /* has_reference */))') + _WRAP_METHOD(Cairo::RefPtr create_cairo_context(), gdk_cairo_create) +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/event.ccg b/libs/gtkmm2/gdk/src/event.ccg new file mode 100644 index 0000000000..442e1ca63b --- /dev/null +++ b/libs/gtkmm2/gdk/src/event.ccg @@ -0,0 +1,34 @@ +// -*- c++ -*- +/* $Id: event.ccg,v 1.2 2004/02/10 17:29:54 mxpxpod Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gdk +{ + +bool Event::send_client_message(const Glib::RefPtr& display, NativeWindow winid) +{ + return gdk_event_send_client_message_for_display(display->gobj(), gobj(), winid); +} + +} //namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/event.hg b/libs/gtkmm2/gdk/src/event.hg new file mode 100644 index 0000000000..ca8f2be2dc --- /dev/null +++ b/libs/gtkmm2/gdk/src/event.hg @@ -0,0 +1,88 @@ +/* $Id: event.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(gdkmm,gdk) +_CC_INCLUDE(gdk/gdkenumtypes.h) + +#include +#include + +/* Shadow DELETE macro (from winnt.h). + */ +#if defined(DELETE) && !defined(GTKMM_MACRO_SHADOW_DELETE) +enum { GTKMM_MACRO_DEFINITION_DELETE = DELETE }; +#undef DELETE +enum { DELETE = GTKMM_MACRO_DEFINITION_DELETE }; +#define DELETE DELETE +#define GTKMM_MACRO_SHADOW_DELETE 1 +#endif + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { typedef union _GdkEvent GdkEvent; } +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gdk +{ + +_WRAP_ENUM(EventType, GdkEventType, + s#^2BUTTON_PRESS#DOUBLE_BUTTON_PRESS#, + s#^3BUTTON_PRESS#TRIPLE_BUTTON_PRESS# +) + +_WRAP_ENUM(ExtensionMode, GdkExtensionMode) +_WRAP_ENUM(AxisUse, GdkAxisUse) + +//TODO: Actually use this class instead of GdkEvent? +class Event +{ + _CLASS_BOXEDTYPE(Event, GdkEvent, NONE, gdk_event_copy, gdk_event_free) + _CUSTOM_STRUCT_PROTOTYPE + _IGNORE(gdk_event_copy, gdk_event_free) +public: + + _WRAP_METHOD(static Event get(), gdk_event_get) + _WRAP_METHOD(static Event peek(), gdk_event_peek) + _WRAP_METHOD(static Event get_graphics_expose(const Glib::RefPtr& window), gdk_event_get_graphics_expose) + _WRAP_METHOD(void put(), gdk_event_put) + + _WRAP_METHOD(static bool events_pending(), gdk_events_pending) + + _WRAP_METHOD(guint32 get_time() const, gdk_event_get_time) + _WRAP_METHOD(bool get_state(ModifierType& state) const, gdk_event_get_state) + _WRAP_METHOD(bool get_coords(double& x_win, double& y_win) const, gdk_event_get_coords) + _WRAP_METHOD(bool get_root_coords(double& x_root, double& y_root) const, gdk_event_get_root_coords) + _WRAP_METHOD(bool get_axis(AxisUse axis_use, double& value) const, gdk_event_get_axis) + //_WRAP_METHOD(void gdk_event_handler_set(GdkEventFunc func, gpointer data, GDestroyNotify notify), gdk_event_handler_set) + + _WRAP_METHOD(static void set_show_events(bool show_events), gdk_set_show_events) + _WRAP_METHOD(static bool get_show_events(), gdk_get_show_events) + + _WRAP_METHOD(void set_screen(const Glib::RefPtr& screen), gdk_event_set_screen) + _WRAP_METHOD(Glib::RefPtr get_screen(), gdk_event_get_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_screen() const, gdk_event_get_screen, refreturn, constversion) + + _WRAP_METHOD(bool send_client_message(NativeWindow winid), gdk_event_send_client_message) + bool send_client_message(const Glib::RefPtr& display, NativeWindow winid); + _IGNORE(gdk_event_send_client_message_for_display) +}; + +} // namespace Gdk + + diff --git a/libs/gtkmm2/gdk/src/gc.ccg b/libs/gtkmm2/gdk/src/gc.ccg new file mode 100644 index 0000000000..f5e5863151 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gc.ccg @@ -0,0 +1,41 @@ +// -*- c++ -*- +/* $Id: gc.ccg,v 1.1 2003/01/21 13:38:08 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +//#include +//#include +#include +#include + +namespace Gdk +{ + +GC::GC(const Glib::RefPtr& drawable) +: Object( G_OBJECT( gdk_gc_new(drawable->gobj()) ) ) +{ + //We need a construct function if we really want to use our own GClass. Bug #86867 +} + + +} + diff --git a/libs/gtkmm2/gdk/src/gc.hg b/libs/gtkmm2/gdk/src/gc.hg new file mode 100644 index 0000000000..d47d6788a0 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gc.hg @@ -0,0 +1,102 @@ +/* $Id: gc.hg,v 1.8 2006/04/12 11:11:24 murrayc Exp $ */ + +/* gc.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(LineStyle, GdkLineStyle) +_WRAP_ENUM(CapStyle, GdkCapStyle) +_WRAP_ENUM(JoinStyle, GdkJoinStyle) +_WRAP_ENUM(Fill, GdkFill) +_WRAP_ENUM(Function, GdkFunction) +_WRAP_ENUM(SubwindowMode, GdkSubwindowMode) +_WRAP_ENUM(GCValuesMask, GdkGCValuesMask) + + +class Drawable; + +/** All drawing operations in GDK take a graphics context (GC) argument. + * A graphics context encapsulates information about the way things are drawn, such as the foreground color or line width. + * By using graphics contexts, the number of arguments to each drawing call is greatly reduced, and communication overhead + * is minimized, since identical arguments do not need to be passed repeatedly. + */ +class GC : public Glib::Object +{ + _CLASS_GOBJECT(GC,GdkGC,GDK_GC,Glib::Object,GObject) + _IGNORE(gdk_gc_unref, gdk_gc_ref, gdk_gc_copy, gdk_gc_set_font, gdk_gc_set_values, gdk_gc_get_values) +protected: + _CTOR_DEFAULT + explicit GC(const Glib::RefPtr& drawable); + +public: + _WRAP_CREATE() + _WRAP_CREATE(const Glib::RefPtr& drawable) + + // Custom wrap these?, maybe with a Gdk::GC::Value class. Need to do take care of refcounts of GdkGCValue's fields. + // Actually, I don't see the need for these methods. murrayc. + //_WRAP_METHOD(void get_values(GdkGCValues& values) const, gdk_gc_get_values) + //_WRAP_METHOD(void set_values(const GdkGCValues& values, GCValuesMask values_mask), gdk_gc_set_values) + //_IGNORE(gdk_gc_get_values, gdk_gc_set_values) + + _WRAP_METHOD(void set_foreground(const Color& color), gdk_gc_set_foreground) + _WRAP_METHOD(void set_background(const Color& color), gdk_gc_set_background) + _WRAP_METHOD(void set_function(Function function), gdk_gc_set_function) + _WRAP_METHOD(void set_fill(Fill fill), gdk_gc_set_fill) + _WRAP_METHOD(void set_tile(const Glib::RefPtr& tile), gdk_gc_set_tile) + _WRAP_METHOD(void set_stipple(const Glib::RefPtr& stipple), gdk_gc_set_stipple) + _WRAP_METHOD(void set_ts_origin(int x, int y), gdk_gc_set_ts_origin) + _WRAP_METHOD(void set_clip_origin(int x, int y), gdk_gc_set_clip_origin) + _WRAP_METHOD(void set_clip_mask(const Glib::RefPtr& mask), gdk_gc_set_clip_mask) + + /** @deprecated Use set_clip_rectangle(const Rectangle& rectangle) instead. + */ + _WRAP_METHOD(void set_clip_rectangle(Rectangle& rectangle), gdk_gc_set_clip_rectangle) + _WRAP_METHOD(void set_clip_rectangle(const Rectangle& rectangle), gdk_gc_set_clip_rectangle) + + _WRAP_METHOD(void set_clip_region(const Region& region), gdk_gc_set_clip_region) + _WRAP_METHOD(void set_subwindow(SubwindowMode mode), gdk_gc_set_subwindow) + _WRAP_METHOD(void set_exposures(bool exposures), gdk_gc_set_exposures) + _WRAP_METHOD(void set_line_attributes(int line_width, LineStyle line_style, CapStyle cap_style, JoinStyle join_style), gdk_gc_set_line_attributes) + _WRAP_METHOD(void set_dashes(int dash_offset, gint8* dash_list, int n), gdk_gc_set_dashes) + _WRAP_METHOD(void offset(int x_offset, int y_offset), gdk_gc_offset) + _WRAP_METHOD(void set_colormap(const Glib::RefPtr& colormap), gdk_gc_set_colormap) + _WRAP_METHOD(Glib::RefPtr get_colormap(), gdk_gc_get_colormap, refreturn) + _WRAP_METHOD(void set_rgb_fg_color(const Color& color), gdk_gc_set_rgb_fg_color) + _WRAP_METHOD(void set_rgb_bg_color(const Color& color), gdk_gc_set_rgb_bg_color) + + _WRAP_METHOD(Glib::RefPtr get_screen(), gdk_gc_get_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_screen() const, gdk_gc_get_screen, refreturn, constversion) +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/gdk.defs b/libs/gtkmm2/gdk/src/gdk.defs new file mode 100644 index 0000000000..ce06839a34 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk.defs @@ -0,0 +1,7 @@ +(include gdk_methods.defs) +(include gdk_pixbuf.defs) +(include gdk_pixbuf_enums.defs) +(include gdk_signals.defs) +(include gdk_extra.defs) +(include gdk_enums.defs) + diff --git a/libs/gtkmm2/gdk/src/gdk_docs.xml b/libs/gtkmm2/gdk/src/gdk_docs.xml new file mode 100644 index 0000000000..003d6910fa --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_docs.xml @@ -0,0 +1,16345 @@ + + + +Determines the total height of a given character. +This value is not generally useful, because you cannot +determine how this total height will be drawn in +relation to the baseline. See gdk_text_extents(). + + + + + + a #GdkFont + + + + the character to measure. + + + + the height of the character in pixels. + +Deprecated: Use gdk_text_extents() instead. + + + + + +Adds a filter to the default display to be called when X ClientMessage events +are received. See gdk_display_add_client_message_filter(). + + + + + the type of ClientMessage events to receive. This will be +checked against the &lt;structfield&gt;message_type&lt;/structfield&gt; field of the +XClientMessage event struct. + + + + the function to call to process the event. + + + + user data to pass to @func. + + + + + + + + +Returns: the #GdkScreen object + + + + + a #GdkDisplay + + + + the screen number + + + + the #GdkScreen object + +Since: 2.2 + + + + + + + + + + a #GdkScreen. + + + + an Xlib &lt;type&gt;Screen*&lt;/type&gt; +the screen of a #GdkScreen. + +Since: 2.2 + + + + + +Send a response to SelectionRequest event. + +Since: 2.2 + + + + + the #GdkDisplay where @requestor is realized + + + + window to which to deliver response. + + + + selection that was requested. + + + + target that was selected. + + + + property in which the selection owner stored the data, +or %GDK_NONE to indicate that the request was rejected. + + + + timestamp. + + + + + + + + +Move the part of @window indicated by @region by @dy pixels in the Y +direction and @dx pixels in the X direction. The portions of @region +that not covered by the new position of @region are invalidated. + +Child windows are not moved. + +Since: 2.8 + + + + + a #GdkWindow + + + + The #GdkRegion to move + + + + Amount to move in the X direction + + + + Amount to move in the Y direction + + + + + + + + +Return value: the width of the default screen in pixels. + + + + + the width of the default screen in pixels. + + + + + +Retrieves the current values from a graphics context. Note that +only the pixel values of the @values-&gt;foreground and @values-&gt;background +are filled, use gdk_colormap_query_color() to obtain the rgb values +if you need them. + + + + + a #GdkGC. + + + + the #GdkGCValues structure in which to store the results. + + + + + + + + +Finds out if a point is in a region. + + + + + + a #GdkRegion + + + + the x coordinate of a point + + + + the y coordinate of a point + + + + %TRUE if the point is in @region. + + + + + +Frees colors allocated with gdk_colors_alloc(). This +function is obsolete. See gdk_colormap_free_colors(). + + + + + a #GdkColormap. + + + + the pixel values of the colors to free. + + + + the number of values in @pixels. + + + + the plane masks for all planes to free, OR'd together. + + + + + + + + +Return value: an Xlib &lt;type&gt;Cursor&lt;/type&gt;. + + + + + a #GdkCursor. + + + + an Xlib &lt;type&gt;Cursor&lt;/type&gt;. + + + + + +Selects one of the actions offered by the drag source. + +This function is called by the drag destination in response to +gdk_drag_motion() called by the drag source. + + + + + a #GdkDragContext. + + + + the selected action which will be taken when a drop happens, +or 0 to indicate that a drop will not be accepted. + + + + the timestamp for this operation. + + + + + + + + +Applies a shape mask to @window. Pixels in @window corresponding to +set bits in the @mask will be visible; pixels in @window +corresponding to unset bits in the @mask will be transparent. This +gives a non-rectangular window. + +If @mask is %NULL, the shape mask will be unset, and the @x/@y +parameters are not used. + +On the X11 platform, this uses an X server extension which is +widely available on most common platforms, but not available on +very old X servers, and occasionally the implementation will be +buggy. On servers without the shape extension, this function +will do nothing. + +On the Win32 platform the functionality is always present. + +This function works on both toplevel and child windows. + + + + + + a #GdkWindow + + + + shape mask + + + + X position of shape mask with respect to @window + + + + Y position of shape mask with respect to @window + + + + + + + + +Return value: whether pixbufs can be saved in the given format. + + + + + a #GdkPixbufFormat + + + + whether pixbufs can be saved in the given format. + +Since: 2.2 + + + + + +Makes a copy of a color structure. The result +must be freed using gdk_color_free(). + + + + + + a #GdkColor. + + + + a copy of @color. + + + + + +Checks all open displays for a #GdkEvent to process,to be processed +on, fetching events from the windowing system if necessary. +See gdk_display_get_event(). + + + + + + the next #GdkEvent to be processed, or %NULL if no events +are pending. The returned #GdkEvent should be freed with gdk_event_free(). + + + + + +Sets the clip mask for a graphics context from a +rectangle. The clip mask is interpreted relative to the clip +origin. (See gdk_gc_set_clip_origin()). + + + + + a #GdkGC. + + + + the rectangle to clip to. + + + + + + + + +Return value: The default group leader window for @display + + + + + a #GdkDisplay + + + + The default group leader window for @display + +Since: 2.4 + + + + + +Create a new GC with the given initial values. + + + + + + a #GdkDrawable. The created GC must always be used +with drawables of the same depth as this one. + + + + a structure containing initial values for the GC. + + + + a bit mask indicating which fields in @values +are set. + + + + the new graphics context. + + + + + +Sets the mouse pointer for a #GdkWindow. Use gdk_cursor_new() or +gdk_cursor_new_from_pixmap() to create the cursor. +To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create +a cursor with no pixels in it. Passing %NULL for the @cursor argument +to gdk_window_set_cursor() means that @window will use the cursor of +its parent window. Most windows should use this default. + + + + + + a #GdkWindow + + + + a cursor + + + + + + + + +Deprecated function; use g_object_unref() instead. + + + + + a #GdkDragContext. + + + + + + + + +Sets the GC the renderer draws with. Note that the GC must not be +modified until it is unset by calling the function again with +%NULL for the @gc parameter, since GDK may make internal copies +of the GC which won't be updated to follow changes to the +original GC. + +Since: 2.6 + + + + + a #GdkPangoRenderer + + + + the new GC to use for drawing, or %NULL + + + + + + + + +Like g_spawn_async_with_pipes(), except the child process is +spawned in such an environment that on calling gdk_display_open() +it would be returned a #GdkDisplay with @screen as the default +screen. + +This is useful for applications which wish to launch an application +on a specific screen. + + + + + + a #GdkScreen + + + + child's current working directory, or %NULL to +inherit parent's + + + + child's argument vector + + + + child's environment, or %NULL to inherit parent's + + + + flags from #GSpawnFlags + + + + function to run in the child just before exec() + + + + user data for @child_setup + + + + return location for child process ID, or %NULL + + + + return location for file descriptor to write to +child's stdin, or %NULL + + + + return location for file descriptor to read child's +stdout, or %NULL + + + + return location for file descriptor to read child's +stderr, or %NULL + + + + return location for error + + + + %TRUE on success, %FALSE if an error was set + +Since: 2.4 + + + + + +Get the default #GdkScreen for @display. + + + + + + a #GdkDisplay + + + + the default #GdkScreen object for @display + +Since: 2.2 + + + + + +Creates a new pixbuf loader object that always attempts to parse +image data as if it were an image of type @image_type, instead of +identifying the type automatically. Useful if you want an error if +the image isn't the expected type, for loading image formats +that can't be reliably identified by looking at the data, or if +the user manually forces a specific type. + +The list of supported image formats depends on what image loaders +are installed, but typically "png", "jpeg", "gif", "tiff" and +"xpm" are among the supported formats. To obtain the full list of +supported image formats, call gdk_pixbuf_format_get_name() on each +of the #GdkPixbufFormat structs returned by gdk_pixbuf_get_formats(). + + + + + + name of the image format to be loaded with the image + + + + return location for an allocated #GError, or %NULL to ignore errors + + + + A newly-created pixbuf loader. + + + + + +Return value: the height of the default screen in pixels. + + + + + the height of the default screen in pixels. + + + + + +Creates a new #GdkWindow using the attributes from +@attributes. See #GdkWindowAttr and #GdkWindowAttributesType for +more details. Note: to use this on displays other than the default +display, @parent must be specified. + + + + + + a #GdkWindow, or %NULL to create the window as a child of +the default root window for the default display. + + + + attributes of the new window + + + + mask indicating which fields in @attributes are valid + + + + the new #GdkWindow + + + + + +Transfers ownership of the update area from @window to the caller +of the function. That is, after calling this function, @window will +no longer have an invalid/dirty region; the update area is removed +from @window and handed to you. If a window has no update area, +gdk_window_get_update_area() returns %NULL. You are responsible for +calling gdk_region_destroy() on the returned region if it's non-%NULL. + + + + + + a #GdkWindow + + + + the update area for @window + + + + + +Deprecated function; use g_object_ref() instead. + + + + + + a #GdkColormap + + + + the colormap + + + + + +Decreases the reference count of a font by one. +If the result is zero, destroys the font. + + + + + a #GdkFont + + + + + + + + +Wraps a native window in a #GdkWindow. +This may fail if the window has been destroyed. If the window +was already known to GDK, a new reference to the existing +#GdkWindow is returned. + +For example in the X backend, a native window handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + the #GdkDisplay where the window handle comes from. + + + + a native window handle. + + + + a #GdkWindow wrapper for the native window or +%NULL if the window has been destroyed. The wrapper will be +newly created, if one doesn't exist already. + +Since: 2.2 + + + + + +Given the root window ID of one of the screen's of a #GdkDisplay, +finds the screen. + + + + + + a #GdkDisplay + + + + window ID for one of of the screen's of the display. + + + + the #GdkScreen corresponding to @xrootwin, or %NULL. + + + + + +Creates a new attribute specifying the color to emboss text with. + + + + + + a GdkColor representing the color to emboss with + + + + new #PangoAttribute + +Since: 2.12 + + + + + +Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + a #GdkDrawable. + + + + an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + +Converts an UTF-8 string into the best possible representation +as a STRING. The representation of characters not in STRING +is not specified; it may be as pseudo-escape sequences +\x{ABCD}, or it may be in some other form of approximation. + + + + + + a UTF-8 string + + + + the newly-allocated string, or %NULL if the +conversion failed. (It should not fail for +any properly formed UTF-8 string unless system +limits like memory or file descriptors are exceeded.) + + + + + +Returns: the default cursor size. + + + + + a #GdkDisplay + + + + the default cursor size. + +Since: 2.4 + + + + + +Obtains the available information about the image formats supported +by GdkPixbuf. + + + + + + A list of #GdkPixbufFormat&lt;!-- --&gt;s describing the supported +image formats. The list should be freed when it is no longer needed, +but the structures themselves are owned by #GdkPixbuf and should not be +freed. + +Since: 2.2 + + + + + +Locates the RGB color in @colormap corresponding to the given +hardware pixel @pixel. @pixel must be a valid pixel in the +colormap; it's a programmer error to call this function with a +pixel which is not in the colormap. Hardware pixels are normally +obtained from gdk_colormap_alloc_colors(), or from a #GdkImage. (A +#GdkImage contains image data in hardware format, a #GdkPixbuf +contains image data in a canonical 24-bit RGB format.) + +This function is rarely useful; it's used for example to +implement the eyedropper feature in #GtkColorSelection. + + + + + + a #GdkColormap + + + + pixel value in hardware display format + + + + #GdkColor with red, green, blue fields initialized + + + + + + + + +Sets the double click distance (two clicks within this distance +count as a double click and result in a #GDK_2BUTTON_PRESS event). +See also gdk_display_set_double_click_time(). +Applications should &lt;emphasis&gt;not&lt;/emphasis&gt; set this, it is a global +user-configured setting. + +Since: 2.4 + + + + + a #GdkDisplay + + + + distance in pixels + + + + + + + + +Gets the index of @screen among the screens in the display +to which it belongs. (See gdk_screen_get_display()) + + + + + + a #GdkScreen + + + + the index + +Since: 2.2 + + + + + +Frees previously allocated colors. + + + + + a #GdkColormap. + + + + the colors to free. + + + + the number of colors in @colors. + + + + + + + + +Saves pixbuf to a new buffer in format @type, which is currently "jpeg", +"png", "tiff", "ico" or "bmp". This is a convenience function that uses +gdk_pixbuf_save_to_callback() to do the real work. Note that the buffer +is not nul-terminated and may contain embedded nuls. +If @error is set, %FALSE will be returned and @string will be set to +%NULL. Possible errors include those in the #GDK_PIXBUF_ERROR +domain. + +See gdk_pixbuf_save() for more details. + + + + + + a #GdkPixbuf. + + + + location to receive a pointer to the new buffer. + + + + location to receive the size of the new buffer. + + + + name of file format. + + + + return location for error, or %NULL + + + + list of key-value save options + + + + whether an error was set + +Since: 2.4 + + + + + +This signal is emitted when gdk_pixbuf_loader_close() is called. +It can be used by different parts of an application to receive +notification when an image loader is closed by the code that +drives it. + + + + + the object which received the signal. + + + + + + + + +The application can use this call to update the _NET_WM_USER_TIME +property on a toplevel window. This property stores an Xserver +time which represents the time of the last user input event +received for this window. This property may be used by the window +manager to alter the focus, stacking, and/or placement behavior of +windows when they are mapped depending on whether the new window +was created by a user action or is a "pop-up" window activated by a +timer or some other event. + +Note that this property is automatically updated by GDK, so this +function should only be used by applications which handle input +events bypassing GDK. + +Since: 2.6 + + + + + A toplevel #GdkWindow + + + + An XServer timestamp to which the property should be set + + + + + + + + +Signal to the window system that the application has finished +handling Configure events it has received. Window Managers can +use this to better synchronize the frame repaint with the +application. GTK+ applications will automatically call this +function when appropriate. + +This function can only be called if gdk_window_enable_synchronized_configure() +was called previously. + +Since: 2.6 + + + + + a toplevel #GdkWindow + + + + + + + + +Sets the background color of @window. (However, when using GTK+, +set the background of a widget with gtk_widget_modify_bg() - if +you're an application - or gtk_style_set_background() - if you're +implementing a custom widget.) + +The @color must be allocated; gdk_rgb_find_color() is the best way +to allocate a color. + +See also gdk_window_set_back_pixmap(). + + + + + + a #GdkWindow + + + + an allocated #GdkColor + + + + + + + + +Retrieves a desktop-wide setting such as double-click time +for the #GdkScreen @screen. + +FIXME needs a list of valid settings here, or a link to +more information. + + + + + + the #GdkScreen where the setting is located + + + + the name of the setting + + + + location to store the value of the setting + + + + %TRUE if the setting existed and a value was stored +in @value, %FALSE otherwise. + +Since: 2.2 + + + + + + + + + + the #GdkDisplay. + + + + the #GdkKeymap attached to @display. +the #GdkKeymap attached to @display. + +Since: 2.2 + + + + + +Compares two fonts for equality. Single fonts compare equal +if they have the same X font ID. This operation does +not currently work correctly for fontsets. + + + + + + a #GdkFont. + + + + another #GdkFont. + + + + %TRUE if the fonts are equal. + + + + + +Set a tile pixmap for a graphics context. +This will only be used if the fill mode +is %GDK_TILED. + + + + + a #GdkGC. + + + + the new tile pixmap. + + + + + + + + +Return value: an Xlib &lt;type&gt;GC&lt;/type&gt;. + + + + + a #GdkGC. + + + + an Xlib &lt;type&gt;GC&lt;/type&gt;. + + + + + +Set the foreground color of a GC using an unallocated color. The +pixel value for the color will be determined using GdkRGB. If the +colormap for the GC has not previously been initialized for GdkRGB, +then for pseudo-color colormaps (colormaps with a small modifiable +number of colors), a colorcube will be allocated in the colormap. + +Calling this function for a GC without a colormap is an error. + + + + + a #GdkGC + + + + an unallocated #GdkColor. + + + + + + + + +Begins a window move operation (for a toplevel window). You might +use this function to implement a "window move grip," for +example. The function works best with window managers that support +the &lt;ulink url="http://www.freedesktop.org/Standards/wm-spec"&gt;Extended +Window Manager Hints&lt;/ulink&gt;, but has a fallback implementation for +other window managers. + + + + + + a toplevel #GdkWindow + + + + the button being used to drag + + + + root window X coordinate of mouse click that began the drag + + + + root window Y coordinate of mouse click that began the drag + + + + timestamp of mouse click that began the drag + + + + + + + + +Get the best available depth for the default GDK screen. "Best" +means "largest," i.e. 32 preferred over 24 preferred over 8 bits +per pixel. + + + + + + best available depth + + + + + +Creates a transformation of the source image @src by scaling by +@scale_x and @scale_y then translating by @offset_x and @offset_y, +then renders the rectangle (@dest_x, @dest_y, @dest_width, +@dest_height) of the resulting image onto the destination image +replacing the previous contents. + +Try to use gdk_pixbuf_scale_simple() first, this function is +the industrial-strength power tool you can fall back to if +gdk_pixbuf_scale_simple() isn't powerful enough. + + + + + a #GdkPixbuf + + + + the #GdkPixbuf into which to render the results + + + + the left coordinate for region to render + + + + the top coordinate for region to render + + + + the width of the region to render + + + + the height of the region to render + + + + the offset in the X direction (currently rounded to an integer) + + + + the offset in the Y direction (currently rounded to an integer) + + + + the scale factor in the X direction + + + + the scale factor in the Y direction + + + + the interpolation type for the transformation. + + + + + + + + +Changes the value of the first @ncolors colors in +a private colormap. This function is obsolete and +should not be used. See gdk_color_change(). + + + + + a #GdkColormap. + + + + the new color values. + + + + the number of colors to change. + + + + + + + + +Loads a #GdkFont based on a Pango font description for use on @display. +This font will only be an approximation of the Pango font, and +internationalization will not be handled correctly. This function +should only be used for legacy code that cannot be easily converted +to use Pango. Using Pango directly will produce better results. + + + + + + a #GdkDisplay + + + + a #PangoFontDescription. + + + + the newly loaded font, or %NULL if the font +cannot be loaded. + +Since: 2.2 + + + + + +Set the double click time for the default display. See +gdk_display_set_double_click_time(). +See also gdk_display_set_double_click_distance(). +Applications should &lt;emphasis&gt;not&lt;/emphasis&gt; set this, it is a +global user-configured setting. + + + + + double click time in milliseconds (thousandths of a second) + + + + + + + + +Loads a font. + +The font may be newly loaded or looked up the font in a cache. +You should make no assumptions about the initial reference count. + + + + + + a XLFD describing the font to load. + + + + a #GdkFont, or %NULL if the font could not be loaded. + + + + + +Removes a reference from an animation. + +Deprecated: Use g_object_unref(). + + + + + An animation. + + + + + + + + +Returns: a string describing the license of @format. + + + + + a #GdkPixbufFormat + + + + a string describing the license of @format. + +Since: 2.6 + + + + + +Calls a function on each span in the intersection of @region and @spans. + + + + + a #GdkRegion + + + + an array of #GdkSpans + + + + the length of @spans + + + + %TRUE if @spans is sorted wrt. the y coordinate + + + + function to call on each span in the intersection + + + + data to pass to @function + + + + + + + + +Takes an existing pixbuf and checks for the presence of an +associated "orientation" option, which may be provided by the +jpeg loader (which reads the exif orientation tag) or the +tiff loader (which reads the tiff orientation tag, and +compensates it for the partial transforms performed by +libtiff). If an orientation option/tag is present, the +appropriate transform will be performed so that the pixbuf +is oriented correctly. + + + + + + A #GdkPixbuf. + + + + A newly-created pixbuf, or a reference to the +input pixbuf (with an increased reference count). + +Since 2.12 + + + + + +Queries the color space of a pixbuf. + + + + + + A pixbuf. + + + + Color space. + + + + + +Returns: %TRUE if shaped windows are supported + + + + + a #GdkDisplay + + + + %TRUE if shaped windows are supported + +Since: 2.10 + + + + + +Calculates the union of two rectangles. +The union of rectangles @src1 and @src2 is the smallest rectangle which +includes both @src1 and @src2 within it. +It is allowed for @dest to be the same as either @src1 or @src2. + + + + + a #GdkRectangle + + + + a #GdkRectangle + + + + return location for the union of @src1 and @src2 + + + + + + + + +Interprets an array of double as axis values for a given device, +and locates the value in the array for a given axis use. + + + + + + a #GdkDevice + + + + pointer to an array of axes + + + + the use to look for + + + + location to store the found value. + + + + %TRUE if the given axis use was found, otherwise %FALSE + + + + + +Looks up @key in the list of options that may have been attached to the +@pixbuf when it was loaded, or that may have been attached by another +function using gdk_pixbuf_set_option(). + +For instance, the ANI loader provides "Title" and "Artist" options. +The ICO, XBM, and XPM loaders provide "x_hot" and "y_hot" hot-spot +options for cursor definitions. The PNG loader provides the tEXt ancillary +chunk key/value pairs as options. Since 2.12, the TIFF and JPEG loaders +return an "orientation" option string that corresponds to the embedded +TIFF/Exif orientation tag (if present). + + + + + + a #GdkPixbuf + + + + a nul-terminated string. + + + + the value associated with @key. This is a nul-terminated +string that should not be freed or %NULL if @key was not found. + + + + + +Sets whether a trace of received events is output. +Note that GTK+ must be compiled with debugging (that is, +configured using the &lt;option&gt;--enable-debug&lt;/option&gt; option) +to use this option. + + + + + %TRUE to output event debugging information. + + + + + + + + +Routine to get the current X server time stamp. + + + + + + a #GdkWindow, used for communication with the server. +The window must have GDK_PROPERTY_CHANGE_MASK in its +events mask or a hang will result. + + + + the time stamp. + + + + + +Ungrab the default display after it has been grabbed with +gdk_x11_grab_server(). + + + + + + + + + +Obtains the position of the window as reported in the +most-recently-processed #GdkEventConfigure. Contrast with +gdk_window_get_geometry() which queries the X server for the +current window position, regardless of which events have been +received or processed. + +The position coordinates are relative to the window's parent window. + + + + + + a #GdkWindow + + + + X coordinate of window + + + + Y coordinate of window + + + + + + + + +Adds a reference to @cursor. + + + + + + a #GdkCursor + + + + Same @cursor that was passed in + + + + + +Sets the area of @source1 to the exclusive-OR of the areas of @source1 +and @source2. The resulting area is the set of pixels contained in one +or the other of the two sources but not in both. + + + + + a #GdkRegion + + + + another #GdkRegion + + + + + + + + +Aborts a drag without dropping. + +This function is called by the drag source. + + + + + a #GdkDragContext. + + + + the timestamp for this operation. + + + + + + + + +Creates a new pixbuf by loading an image from a file. The file format is +detected automatically. If %NULL is returned, then @error will be set. +Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. +The image will be scaled to fit in the requested size, preserving +the image's aspect ratio. + + + + + + Name of file to load, in the GLib file name encoding + + + + The width the image should have or -1 to not constrain the width + + + + The height the image should have or -1 to not constrain the height + + + + Return location for an error + + + + A newly-created pixbuf with a reference count of 1, or +%NULL if any of several error conditions occurred: the file could not +be opened, there was no loader for the file's format, there was not +enough memory to allocate the image buffer, or the image file contained +invalid data. + +Since: 2.4 + + + + + +Render a #PangoLayout onto a #GdkDrawable, overriding the +layout's normal colors with @foreground and/or @background. +@foreground and @background need not be allocated. + +If the layout's #PangoContext has a transformation matrix set, then +@x and @y specify the position of the top left corner of the +bounding box (in device space) of the transformed layout. + +If you're using GTK+, the ususal way to obtain a #PangoLayout +is gtk_widget_create_pango_layout(). + + + + + the drawable on which to draw string + + + + base graphics context to use + + + + the X position of the left of the layout (in pixels) + + + + the Y position of the top of the layout (in pixels) + + + + a #PangoLayout + + + + foreground override color, or %NULL for none + + + + background override color, or %NULL for none + + + + + + + + +Transfers image data from a #GdkDrawable and converts it to an RGB(A) +representation inside a #GdkPixbuf. In other words, copies +image data from a server-side drawable to a client-side RGB(A) buffer. +This allows you to efficiently read individual pixels on the client side. + +If the drawable @src has no colormap (gdk_drawable_get_colormap() +Return value: The same pixbuf as @dest if it was non-%NULL, or a newly-created + + + + + Destination pixbuf, or %NULL if a new pixbuf should be created. + + + + Source drawable. + + + + A colormap if @src doesn't have one set. + + + + Source X coordinate within drawable. + + + + Source Y coordinate within drawable. + + + + Destination X coordinate in pixbuf, or 0 if @dest is NULL. + + + + Destination Y coordinate in pixbuf, or 0 if @dest is NULL. + + + + Width in pixels of region to get. + + + + Height in pixels of region to get. + + + + The same pixbuf as @dest if it was non-%NULL, or a newly-created +pixbuf with a reference count of 1 if no destination pixbuf was specified, or %NULL on error + + + + + +Gets the list of children of @window known to GDK. +This function only returns children created via GDK, +so for example it's useless when used with the root window; +it only returns windows an application created itself. + +The returned list must be freed, but the elements in the +list need not be. + + + + + + a #GdkWindow + + + + list of child windows inside @window + + + + + +Return value: the width of the default screen in millimeters, + + + + + the width of the default screen in millimeters, +though it is not always correct. + + + + + +Convert a text string from the encoding as it is stored +in a property into an array of strings in the encoding of +the current locale. (The elements of the array represent the +nul-separated elements of the original text string.) + + + + + + The #GdkDisplay where the encoding is defined. + + + + an atom representing the encoding. The most +common values for this are STRING, or COMPOUND_TEXT. +This is value used as the type for the property. + + + + the format of the property. + + + + The text data. + + + + The number of items to transform. + + + + location to store a terminated array of strings in +the encoding of the current locale. This array should be +freed using gdk_free_text_list(). + + + + the number of strings stored in list, or 0, +if the conversion failed. + +Since: 2.2 + + + + + +Obtains a list of all toplevel windows known to GDK on the screen @screen. +A toplevel window is a child of the root window (see +gdk_get_default_root_window()). + +The returned list should be freed with g_list_free(), but +its elements need not be freed. + + + + + + The #GdkScreen where the toplevels are located. + + + + list of toplevel windows, free with g_list_free() + +Since: 2.2 + + + + + +Return value: Whether windows with RGBA visuals can reasonably be + + + + + a #GdkScreen + + + + Whether windows with RGBA visuals can reasonably be +expected to have their alpha channels drawn correctly on the screen. + +Since: 2.10 + + + + + +Ungrab @display after it has been grabbed with +gdk_x11_display_grab(). + +Since: 2.2 + + + + + a #GdkDisplay + + + + + + + + +Returns: the timestamp of the last user interaction + + + + + a #GdkDisplay + + + + the timestamp of the last user interaction + +Since: 2.8 + + + + + +Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + a #GdkImage. + + + + an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + +Removes a reference from a pixbuf. + +Deprecated: Use g_object_unref(). + + + + + A pixbuf. + + + + + + + + +Sets the given pixmap as the source pattern for the Cairo context. +The pattern has an extend mode of %CAIRO_EXTEND_NONE and is aligned +so that the origin of @pixmap is @pixmap_x, @pixmap_y + +Since: 2.10 + + + + + a #Cairo context + + + + a #GdkPixmap + + + + X coordinate of location to place upper left corner of @pixmap + + + + Y coordinate of location to place upper left corner of @pixmap + + + + + + + + +Appends a copy of the given event onto the front of the event +queue for @display. + +Since: 2.2 + + + + + a #GdkDisplay + + + + a #GdkEvent. + + + + + + + + +Creates a new pixbuf by loading an image from a file. The file format is +detected automatically. If %NULL is returned, then @error will be set. +Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. + + + + + + Name of file to load, in the GLib file name encoding + + + + Return location for an error + + + + A newly-created pixbuf with a reference count of 1, or %NULL if +any of several error conditions occurred: the file could not be opened, +there was no loader for the file's format, there was not enough memory to +allocate the image buffer, or the image file contained invalid data. + + + + + +Creates a new region containing the area @rectangle. + + + + + + a #GdkRectangle + + + + a new region + + + + + +Return value: the name of the format. + + + + + a #GdkPixbufFormat + + + + the name of the format. + +Since: 2.2 + + + + + +Return value: the height of the default screen in millimeters, + + + + + the height of the default screen in millimeters, +though it is not always correct. + + + + + +Sets the font for a graphics context. (Note that +all text-drawing functions in GDK take a @font +argument; the value set here is used when that +argument is %NULL.) + + + + + a #GdkGC. + + + + the new font. + + + + + + + + +Gets the default colormap for @screen. + + + + + + a #GdkScreen + + + + the default #GdkColormap. + +Since: 2.2 + + + + + +Converts a multi-byte string to a wide character string. +(The function name comes from an acronym of 'Multi-Byte String TO Wide +Character String'). + + + + + + the space to place the converted wide character string into. + + + + the multi-byte string to convert, which must be nul-terminated. + + + + the maximum number of wide characters to place in @dest. + + + + the number of wide characters written into @dest, or -1 if +the conversion failed. + + + + + +Request the windowing system to make @window partially transparent, +with opacity 0 being fully transparent and 1 fully opaque. (Values +of the opacity parameter are clamped to the [0,1] range.) + +On X11, this works only on X screens with a compositing manager +running. + +For setting up per-pixel alpha, see gdk_screen_get_rgba_colormap(). +For making non-toplevel windows translucent, see +gdk_window_set_composited(). + +Since: 2.12 + + + + + a top-level #GdkWindow + + + + opacity + + + + + + + + +Render a #PangoLayoutLine onto a #GdkDrawable, overriding the +layout's normal colors with @foreground and/or @background. +@foreground and @background need not be allocated. + +If the layout's #PangoContext has a transformation matrix set, then +@x and @y specify the position of the left edge of the baseline +(left is in before-tranform user coordinates) in after-transform +device coordinates. + + + + + the drawable on which to draw the line + + + + base graphics to use + + + + the x position of start of string (in pixels) + + + + the y position of baseline (in pixels) + + + + a #PangoLayoutLine + + + + foreground override color, or %NULL for none + + + + background override color, or %NULL for none + + + + + + + + +Sets a function to be called at regular intervals holding the GDK lock, +with the given priority. The function is called repeatedly until it +Return value: the ID (greater than 0) of the event source. + + + + + the priority of the timeout source. Typically this will be in the +range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. + + + + the time between calls to the function, in milliseconds +(1/1000ths of a second) + + + + function to call + + + + data to pass to @function + + + + function to call when the timeout is removed, or %NULL + + + + the ID (greater than 0) of the event source. + +Since: 2.12 + + + + + +Initializes GDK so that it can be used from multiple threads +in conjunction with gdk_threads_enter() and gdk_threads_leave(). +g_thread_init() must be called previous to this function. + +This call must be made before any use of the main loop from +GTK+; to be safe, call it before gtk_init(). + + + + + + + + + +Determines the distance from the origin to the rightmost +portion of a nul-terminated string when drawn. This is not the +correct value for determining the origin of the next +portion when drawing text in multiple pieces. +See gdk_string_width(). + + + + + + a #GdkFont + + + + the nul-terminated string to measure. + + + + the right bearing of the string in pixels. + + + + + +Renders a rectangular portion of a pixbuf to a drawable. The destination +drawable must have a colormap. All windows have a colormap, however, pixmaps +only have colormap by default if they were created with a non-%NULL window +argument. Otherwise a colormap must be set on them with +gdk_drawable_set_colormap(). + +On older X servers, rendering pixbufs with an alpha channel involves round +trips to the X server, and may be somewhat slow. + +The clip mask of @gc is ignored, but clip rectangles and clip regions work +fine. + +If GDK is built with the Sun mediaLib library, the gdk_draw_pixbuf +function is accelerated using mediaLib, which provides hardware +acceleration on Intel, AMD, and Sparc chipsets. If desired, mediaLib +support can be turned off by setting the GDK_DISABLE_MEDIALIB environment +variable. + +Since: 2.2 + + + + + Destination drawable. + + + + a #GdkGC, used for clipping, or %NULL + + + + a #GdkPixbuf + + + + Source X coordinate within pixbuf. + + + + Source Y coordinates within pixbuf. + + + + Destination X coordinate within drawable. + + + + Destination Y coordinate within drawable. + + + + Width of region to render, in pixels, or -1 to use pixbuf width. + + + + Height of region to render, in pixels, or -1 to use pixbuf height. + + + + Dithering mode for #GdkRGB. + + + + X offset for dither. + + + + Y offset for dither. + + + + + + + + +Withdraws a window (unmaps it and asks the window manager to forget about it). +This function is not really useful as gdk_window_hide() automatically +withdraws toplevel windows before hiding them. + + + + + + a toplevel #GdkWindow + + + + + + + + +If you bypass the GDK layer and use windowing system primitives to +draw directly onto a #GdkWindow, then you need to deal with two +details: there may be an offset between GDK coordinates and windowing +system coordinates, and GDK may have redirected drawing to a offscreen +pixmap as the result of a gdk_window_begin_paint_region() calls. +This function allows retrieving the information you need to compensate +for these effects. + +This function exposes details of the GDK implementation, and is thus +likely to change in future releases of GDK. + + + + + a #GdkWindow + + + + location to store the drawable to which drawing should be +done. + + + + location to store the X offset between coordinates in @window, +and the underlying window system primitive coordinates for +*@real_drawable. + + + + location to store the Y offset between coordinates in @window, +and the underlying window system primitive coordinates for +*@real_drawable. + + + + + + + + +Sets the foreground color for a graphics context. +Note that this function uses @color-&gt;pixel, use +gdk_gc_set_rgb_fg_color() to specify the foreground +color as red, green, blue components. + + + + + a #GdkGC. + + + + the new foreground color. + + + + + + + + +Gets the current file style for the GC + + + + + + a #GdkGC + + + + the file style for the GC + + + + + +returns #GDK_CURRENT_TIME. If @event is %NULL, returns #GDK_CURRENT_TIME. +Return value: time stamp field from @event + + + + + a #GdkEvent + + + + time stamp field from @event + + + + + +A hash function suitable for using for a hash +table that stores #GdkColor's. + + + + + + a #GdkColor. + + + + The hash function applied to @colora + + + + + +Sets the screen for @event to @screen. The event must +have been allocated by GTK+, for instance, by +gdk_event_copy(). + +Since: 2.2 + + + + + a #GdkEvent + + + + a #GdkScreen + + + + + + + + +Sets the stipple for one render part (foreground, background, underline, +etc.) Note that this is overwritten when iterating through the individual +styled runs of a #PangoLayout or #PangoLayoutLine. This function is thus +only useful when you call low level functions like pango_renderer_draw_glyphs() +directly, or in the 'prepare_run' virtual function of a subclass of +#GdkPangoRenderer. + +Since: 2.6 + + + + + a #GdkPangoRenderer + + + + the part to render with the stipple + + + + the new stipple value. + + + + + + + + +Extract the axis value for a particular axis use from +an event structure. + + + + + + a #GdkEvent + + + + the axis use to look for + + + + location to store the value found + + + + %TRUE if the specified axis was found, otherwise %FALSE + + + + + +Retrieves the #GdkRectangle representing the size and position of +the individual monitor within the entire screen area. + +Note that the size of the entire screen area can be retrieved via +gdk_screen_get_width() and gdk_screen_get_height(). + +Since: 2.2 + + + + + a #GdkScreen. + + + + the monitor number. + + + + a #GdkRectangle to be filled with the monitor geometry + + + + + + + + +Appends an event onto the tail of the event queue. + + + + + + a #GdkDisplay + + + + Event to append. + + + + the newly appended list node. + + + + + +Creates a #PangoContext for the default GDK screen. + +The context must be freed when you're finished with it. + +When using GTK+, normally you should use gtk_widget_get_pango_context() +instead of this function, to get the appropriate context for +the widget you intend to render text onto. + +The newly created context will have the default font options (see +#cairo_font_options_t) for the default screen; if these options +change it will not be updated. Using gtk_widget_get_pango_context() +is more convenient if you want to keep a context around and track +changes to the screen's font rendering settings. + + + + + + a new #PangoContext for the default display + + + + + +Return value: %TRUE if the allocation succeeded. + + + + + a #GdkColormap. + + + + the location to store the color. + + + + %TRUE if the allocation succeeded. + + + + + +Like gdk_window_clear_area(), but also generates an expose event for +the cleared area. + +This function has a stupid name because it dates back to the mists +time, pre-GDK-1.0. + + + + + + a #GdkWindow + + + + x coordinate of rectangle to clear + + + + y coordinate of rectangle to clear + + + + width of rectangle to clear + + + + height of rectangle to clear + + + + + + + + +Queries the #GdkPixbuf that a pixbuf loader is currently creating. +In general it only makes sense to call this function after the +"area_prepared" signal has been emitted by the loader; this means +that enough data has been read to know the size of the image that +will be allocated. If the loader has not received enough data via +gdk_pixbuf_loader_write(), then this function returns %NULL. The +returned pixbuf will be the same in all future calls to the loader, +so simply calling g_object_ref() should be sufficient to continue +using it. Additionally, if the loader is an animation, it will +return the "static image" of the animation +(see gdk_pixbuf_animation_get_static_image()). + + + + + + A pixbuf loader. + + + + The #GdkPixbuf that the loader is creating, or %NULL if not +enough data has been read to determine how to create the image buffer. + + + + + +Warps the pointer of @display to the point @x,@y on +the screen @screen, unless the pointer is confined +to a window by a grab, in which case it will be moved +as far as allowed by the grab. Warping the pointer +creates events as if the user had moved the mouse +instantaneously to the destination. + +Note that the pointer should normally be under the +control of the user. This function was added to cover +some rare use cases like keyboard navigation support +for the color picker in the #GtkColorSelectionDialog. + +Since: 2.8 + + + + + a #GdkDisplay + + + + the screen of @display to warp the pointer to + + + + the x coordinate of the destination + + + + the y coordinate of the destination + + + + + + + + +Offset attributes such as the clip and tile-stipple origins +of the GC so that drawing at x - x_offset, y - y_offset with +the offset GC has the same effect as drawing at x, y with the original +GC. + + + + + a #GdkGC + + + + amount by which to offset the GC in the X direction + + + + amount by which to offset the GC in the Y direction + + + + + + + + +This is a deprecated wrapper for gdk_drawable_get_image(); +gdk_drawable_get_image() should be used instead. Or even better: in +most cases gdk_pixbuf_get_from_drawable() is the most convenient +choice. + + + + + + a #GdkDrawable + + + + x coordinate in @window + + + + y coordinate in @window + + + + width of area in @window + + + + height of area in @window + + + + a new #GdkImage or %NULL + + + + + +Create a new #GdkPixbuf containing a copy of @src scaled to +@dest_width x @dest_height. Leaves @src unaffected. @interp_type +should be #GDK_INTERP_NEAREST if you want maximum speed (but when +scaling down #GDK_INTERP_NEAREST is usually unusably ugly). The +default @interp_type should be #GDK_INTERP_BILINEAR which offers +reasonable quality and speed. + +You can scale a sub-portion of @src by creating a sub-pixbuf +pointing into @src; see gdk_pixbuf_new_subpixbuf(). + +For more complicated scaling/compositing see gdk_pixbuf_scale() +and gdk_pixbuf_composite(). + + + + + + a #GdkPixbuf + + + + the width of destination image + + + + the height of destination image + + + + the interpolation type for the transformation. + + + + the new #GdkPixbuf, or %NULL if not enough memory could be +allocated for it. + + + + + +Return value: the numeric X Font ID + + + + + a #GdkFont. + + + + the numeric X Font ID + + + + + +Looks up the #GdkWindow that wraps the given native window handle. + +For example in the X backend, a native window handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + a native window handle. + + + + the #GdkWindow wrapper for the native window, +or %NULL if there is none. + + + + + +Used to determine how to respond to the area_updated signal on +#GdkPixbufLoader when loading an animation. area_updated is emitted +for an area of the frame currently streaming in to the loader. So if +you're on the currently loading frame, you need to redraw the screen for +the updated area. + + + + + + a #GdkPixbufAnimationIter + + + + %TRUE if the frame we're on is partially loaded, or the last frame + + + + + +Sets the area of @source1 to the intersection of the areas of @source1 +and @source2. The resulting area is the set of pixels contained in +both @source1 and @source2. + + + + + a #GdkRegion + + + + another #GdkRegion + + + + + + + + +Converts a text property in the given encoding to +a list of UTF-8 strings. + + + + + + a #GdkDisplay + + + + an atom representing the encoding of the text + + + + the format of the property + + + + the text to convert + + + + the length of @text, in bytes + + + + location to store the list of strings or %NULL. The +list should be freed with g_strfreev(). + + + + the number of strings in the resulting +list. + +Since: 2.2 + + + + + +Determines the total height of a given nul-terminated +string. This value is not generally useful, because you +cannot determine how this total height will be drawn in +relation to the baseline. See gdk_string_extents(). + + + + + + a #GdkFont + + + + the nul-terminated string to measure. + + + + the height of the string in pixels. + + + + + +Set if @window must be kept above other windows. If the +window was already above, then this function does nothing. + +On X11, asks the window manager to keep @window above, if the window +manager supports this operation. Not all window managers support +this, and some deliberately ignore it or don't have a concept of +"keep above"; so you can't rely on the window being kept above. +But it will happen with most standard window managers, +and GDK makes a best effort to get it to happen. + +Since: 2.4 + + + + + a toplevel #GdkWindow + + + + whether to keep @window above other windows + + + + + + + + +With update debugging enabled, calls to +gdk_window_invalidate_region() clear the invalidated region of the +screen to a noticeable color, and GDK pauses for a short time +before sending exposes to windows during +gdk_window_process_updates(). The net effect is that you can see +the invalid region for each window and watch redraws as they +occur. This allows you to diagnose inefficiencies in your application. + +In essence, because the GDK rendering model prevents all flicker, +if you are redrawing the same region 400 times you may never +notice, aside from noticing a speed problem. Enabling update +debugging causes GTK to flicker slowly and noticeably, so you can +see exactly what's being redrawn when, in what order. + +The --gtk-debug=updates command line option passed to GTK+ programs +enables this debug option at application startup time. That's +usually more useful than calling gdk_window_set_debug_updates() +yourself, though you might want to use this function to enable +updates sometime after application startup time. + + + + + + %TRUE to turn on update debugging + + + + + + + + +Deprecated function; use g_object_ref() instead. + + + + + a #GdkDragContext. + + + + + + + + +Obtains the root window (parent all other windows are inside) +for the default display and screen. + + + + + + the default root window + + + + + +Gets the stipple pixmap for @gc, if any + + + + + + a #GdkGC + + + + the stipple set on the GC, or %NULL. The +value is owned by the GC and must not be freed. + + + + + +The event mask for a window determines which events will be reported +for that window. For example, an event mask including #GDK_BUTTON_PRESS_MASK +means the window should report button press events. The event mask +is the bitwise OR of values from the #GdkEventMask enumeration. + + + + + + a #GdkWindow + + + + event mask for @window + + + + + + + + +This function returns the available visual types for the default +screen. It's equivalent to listing the visuals +(gdk_list_visuals()) and then looking at the type field in each +visual, removing duplicates. + +The array returned by this function should not be freed. + + + + + return location for the available visual types + + + + return location for the number of available visual types + + + + + + + + +Checks to see if an unmap request or event causes the current +grab window to become not viewable, and if so, clear the +the pointer we keep to it. + + + + + a #GdkWindow + + + + serial from Unmap event (or from NextRequest(display) +if the unmap is being done by this client.) + + + + + + + + +Closes the connection to the windowing system for the given display, +and cleans up associated resources. + +Since: 2.2 + + + + + a #GdkDisplay + + + + + + + + +This function returns the available bit depths for the default +screen. It's equivalent to listing the visuals +(gdk_list_visuals()) and then looking at the depth field in each +visual, removing duplicates. + +The array returned by this function should not be freed. + + + + + + return location for available depths + + + + return location for number of available depths + + + + + + + + +Determines the distance from the origin to the rightmost +portion of a character when drawn. This is not the +correct value for determining the origin of the next +portion when drawing text in multiple pieces. + + + + + + a #GdkFont + + + + the character to measure. + + + + the right bearing of the character in pixels. + + + + + +Like g_spawn_async(), except the child process is spawned in such +an environment that on calling gdk_display_open() it would be +returned a #GdkDisplay with @screen as the default screen. + +This is useful for applications which wish to launch an application +on a specific screen. + + + + + + a #GdkScreen + + + + child's current working directory, or %NULL to +inherit parent's + + + + child's argument vector + + + + child's environment, or %NULL to inherit parent's + + + + flags from #GSpawnFlags + + + + function to run in the child just before exec() + + + + user data for @child_setup + + + + return location for child process ID, or %NULL + + + + return location for error + + + + %TRUE on success, %FALSE if error is set + +Since: 2.4 + + + + + +Return value: a newly-allocated text string + + + + + a #GdkColor + + + + a newly-allocated text string + +Since: 2.12 + + + + + +Wraps a native pixmap in a #GdkPixmap. +This may fail if the pixmap has been destroyed. + +For example in the X backend, a native pixmap handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + +This function is an alternative to gdk_pixmap_foreign_new_for_display() +for cases where the dimensions of the pixmap are known. For the X +backend, this avoids a roundtrip to the server. + + + + + + a #GdkScreen + + + + a native pixmap handle + + + + the width of the pixmap identified by @anid + + + + the height of the pixmap identified by @anid + + + + the depth of the pixmap identified by @anid + + + + the newly-created #GdkPixmap wrapper for the +native pixmap or %NULL if the pixmap has been destroyed. + +Since: 2.10 + + + + + +Obtains the available information about the format of the +currently loading image file. + + + + + + A pixbuf loader. + + + + A #GdkPixbufFormat or %NULL. The return value is owned +by GdkPixbuf and should not be freed. + +Since: 2.2 + + + + + +Sets the &lt;literal&gt;SM_CLIENT_ID&lt;/literal&gt; property on the application's leader window so that +the window manager can save the application's state using the X11R6 ICCCM +session management protocol. + +See the X Session Management Library documentation for more information on +session management and the Inter-Client Communication Conventions Manual +(ICCCM) for information on the &lt;literal&gt;WM_CLIENT_LEADER&lt;/literal&gt; property. +(Both documents are part of the X Window System distribution.) + + + + + the client id assigned by the session manager when the +connection was opened, or %NULL to remove the property. + + + + + + + + +Reverse operation for gdk_window_stick(); see gdk_window_stick(), +and gtk_window_unstick(). + + + + + + a toplevel #GdkWindow + + + + + + + + +Retrieves selection data that was stored by the selection +data in response to a call to gdk_selection_convert(). This function +will not be used by applications, who should use the #GtkClipboard +API instead. + + + + + + the window on which the data is stored + + + + location to store a pointer to the retrieved data. + If the retrieval failed, %NULL we be stored here, otherwise, it + will be non-%NULL and the returned data should be freed with g_free() + when you are finished using it. The length of the + allocated memory is one more than the length + of the returned data, and the final byte will always + be zero, to ensure nul-termination of strings. + + + + location to store the type of the property. + + + + location to store the format of the property. + + + + the length of the retrieved data. + + + + + +Get the system'sdefault visual for the default GDK screen. +This is the visual for the root window of the display. +The return value should not be freed. + + + + + + system visual + + + + + +Removes a specified list node from the event queue. + + + + + a #GdkDisplay + + + + node to remove + + + + + + + + +Convert from an X atom for the default display to the corresponding +#GdkAtom. + + + + + + an X atom for the default GDK display + + + + the corresponding G#dkAtom. + + + + + +Internal function to destroy a window. Like gdk_window_destroy(), +but does not drop the reference count created by gdk_window_new(). + + + + + a #GdkWindow + + + + If TRUE, then this is being called because a parent +was destroyed. This generally means that the call to the +windowing system to destroy the window can be omitted, since +it will be destroyed as a result of the parent being destroyed. +Unless @foreign_destroy. + + + + If TRUE, the window or a parent was destroyed by some +external agency. The window has already been destroyed and no +windowing system calls should be made. (This may never happen +for some windowing systems.) + + + + + + + + +Sets the clip mask for a graphics context from a bitmap. +The clip mask is interpreted relative to the clip +origin. (See gdk_gc_set_clip_origin()). + + + + + the #GdkGC. + + + + a bitmap. + + + + + + + + +Gets the #GdkScreen associated with a #GdkDrawable. + + + + + + a #GdkDrawable + + + + the #GdkScreen associated with @drawable + +Since: 2.2 + + + + + +Draws a set of anti-aliased trapezoids. The trapezoids are +combined using saturation addition, then drawn over the background +as a set. This is low level functionality used internally to implement +rotated underlines and backgrouds when rendering a PangoLayout and is +likely not useful for applications. + +Since: 2.6 + + + + + a #GdkDrawable + + + + a #GdkGC + + + + an array of #GdkTrapezoid structures + + + + the number of trapezoids to draw + + + + + + + + +Fills *@width and *@height with the size of @drawable. +@width or @height can be %NULL if you only want the other one. + +On the X11 platform, if @drawable is a #GdkWindow, the returned +size is the size reported in the most-recently-processed configure +event, rather than the current size on the X server. + + + + + + a #GdkDrawable + + + + location to store drawable's width, or %NULL + + + + location to store drawable's height, or %NULL + + + + + + + + +Return the X Logical Font Description (for font-&gt;type == GDK_FONT_FONT) +or comma separated list of XLFDs (for font-&gt;type == GDK_FONT_FONTSET) +that was used to load the font. If the same font was loaded +via multiple names, which name is returned is undefined. + + + + + + a #GdkFont. + + + + the name of the font. This string is owned +by GDK and must not be modified or freed. + + + + + +Gets the toplevel window that's an ancestor of @window. + + + + + + a #GdkWindow + + + + the toplevel window containing @window + + + + + +Moves a region the specified distance. + + + + + a #GdkRegion + + + + the distance to move the region horizontally + + + + the distance to move the region vertically + + + + + + + + +Adds a reference to a pixbuf. + + + + + + A pixbuf. + + + + The same as the @pixbuf argument. + +Deprecated: Use g_object_ref(). + + + + + +Obtains the parent of @window, as known to GDK. Does not query the +X server; thus this returns the parent as passed to gdk_window_new(), +not the actual parent. This should never matter unless you're using +Xlib calls mixed with GDK calls on the X11 platform. It may also +matter for toplevel windows, because the window manager may choose +to reparent them. + + + + + + a #GdkWindow + + + + parent of @window + + + + + +Request #GdkEventOwnerChange events for ownership changes +of the selection named by the given atom. + + + + + + a #GdkDisplay + + + + the #GdkAtom naming the selection for which +ownership change notification is requested + + + + whether #GdkEventOwnerChange events will +be sent. + +Since: 2.6 + + + + + +Flushes any requests queued for the windowing system and waits until all +requests have been handled. This is often used for making sure that the +display is synchronized with the current state of the program. Calling +gdk_display_sync() before gdk_error_trap_pop() makes sure that any errors +generated from earlier requests are handled before the error trap is +removed. + +This is most useful for X11. On windowing systems where requests are +handled synchronously, this function will do nothing. + +Since: 2.2 + + + + + a #GdkDisplay + + + + + + + + +Any of the return location arguments to this function may be %NULL, +if you aren't interested in getting the value of that field. + +The X and Y coordinates returned are relative to the parent window +of @window, which for toplevels usually means relative to the +window decorations (titlebar, etc.) rather than relative to the +root window (screen-size background window). + +On the X11 platform, the geometry is obtained from the X server, +so reflects the latest position of @window; this may be out-of-sync +with the position of @window delivered in the most-recently-processed +#GdkEventConfigure. gdk_window_get_position() in contrast gets the +position from the most recent configure event. + +&lt;note&gt; +If @window is not a toplevel, it is &lt;emphasis&gt;much&lt;/emphasis&gt; better +to call gdk_window_get_position() and gdk_drawable_get_size() instead, +because it avoids the roundtrip to the X server and because +gdk_drawable_get_size() supports the full 32-bit coordinate space, +whereas gdk_window_get_geometry() is restricted to the 16-bit +coordinates of X11. +&lt;/note&gt; + + + + + a #GdkWindow + + + + return location for X coordinate of window (relative to its parent) + + + + return location for Y coordinate of window (relative to its parent) + + + + return location for width of window + + + + return location for height of window + + + + return location for bit depth of window + + + + + + + + +Queries a pointer to the pixel data of a pixbuf. + + + + + + A pixbuf. + + + + A pointer to the pixbuf's pixel data. Please see &lt;xref linkend="image-data"/&gt; +for information about how the pixel data is stored in +memory. + + + + + +Creates a new attribute containing a stipple bitmap to be used when +rendering the text. + + + + + + a bitmap to be set as stipple + + + + new #PangoAttribute + + + + + +Raises @window to the top of the Z-order (stacking order), so that +other windows with the same parent window appear below @window. +This is true whether or not the windows are visible. + +If @window is a toplevel, the window manager may choose to deny the +request to move the window in the Z-order, gdk_window_raise() only +requests the restack, does not guarantee it. + + + + + + a #GdkWindow + + + + + + + + +Toggles whether a window needs the user's +urgent attention. + +Since: 2.8 + + + + + a toplevel #GdkWindow + + + + %TRUE if the window is urgent + + + + + + + + +Lowers @window to the bottom of the Z-order (stacking order), so that +other windows with the same parent window appear above @window. +This is true whether or not the other windows are visible. + +If @window is a toplevel, the window manager may choose to deny the +request to move the window in the Z-order, gdk_window_lower() only +requests the restack, does not guarantee it. + +Note that gdk_window_show() raises the window again, so don't call this +function before gdk_window_show(). (Try gdk_window_show_unraised().) + + + + + + a #GdkWindow + + + + + + + + + + + + + the #GdkKeymap attached to the default display. +the #GdkKeymap attached to the default display. + + + + + +On X11, sends an X ClientMessage event to all toplevel windows on +@screen. + +Toplevel windows are determined by checking for the WM_STATE property, +as described in the Inter-Client Communication Conventions Manual (ICCCM). +If no windows are found with the WM_STATE property set, the message is +sent to all children of the root window. + +On Windows, broadcasts a message registered with the name +GDK_WIN32_CLIENT_MESSAGE to all top-level windows. The amount of +data is limited to one long, i.e. four bytes. + +Since: 2.2 + + + + + the #GdkScreen where the event will be broadcasted. + + + + the #GdkEvent. + + + + + + + + +Sets a list of icons for the window. One of these will be used +to represent the window when it has been iconified. The icon is +usually shown in an icon box or some sort of task bar. Which icon +size is shown depends on the window manager. The window manager +can scale the icon but setting several size icons can give better +image quality since the window manager may only need to scale the +icon by a small amount or not at all. + + + + + + The #GdkWindow toplevel window to set the icon of. + + + + A list of pixbufs, of different sizes. + + + + + + + + +Gets the #GdkScreen for which @gc was created + + + + + + a #GdkGC. + + + + the #GdkScreen for @gc. + +Since: 2.2 + + + + + +Create a #GdkPixbuf from a flat representation that is suitable for +storing as inline data in a program. This is useful if you want to +ship a program with images, but don't want to depend on any +external files. + +GTK+ ships with a program called &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt; +which allows for conversion of #GdkPixbufs into such a inline representation. +In almost all cases, you should pass the &lt;option&gt;--raw&lt;/option&gt; flag to +&lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;. A sample invocation would be: + +&lt;informalexample&gt;&lt;programlisting&gt; +gdk-pixbuf-csource --raw --name=myimage_inline myimage.png +&lt;/programlisting&gt;&lt;/informalexample&gt; + +For the typical case where the inline pixbuf is read-only static data, +you don't need to copy the pixel data unless you intend to write to +it, so you can pass %FALSE for @copy_pixels. (If you pass +&lt;option&gt;--rle&lt;/option&gt; to &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt;, a copy +will be made even if @copy_pixels is %FALSE, so using this option is +generally a bad idea.) + +If you create a pixbuf from const inline data compiled into your +program, it's probably safe to ignore errors and disable length checks, +since things will always succeed: +&lt;informalexample&gt;&lt;programlisting&gt; +pixbuf = gdk_pixbuf_new_from_inline (-1, myimage_inline, FALSE, NULL); +&lt;/programlisting&gt;&lt;/informalexample&gt; + +For non-const inline data, you could get out of memory. For untrusted +inline data located at runtime, you could have corrupt inline data in +addition. + + + + + + Length in bytes of the @data argument or -1 to +disable length checks + + + + Byte data containing a serialized #GdkPixdata structure + + + + Whether to copy the pixel data, or use direct pointers +@data for the resulting pixbuf + + + + #GError return location, may be %NULL to ignore errors + + + + A newly-created #GdkPixbuf structure with a reference, +count of 1, or %NULL if an error occurred. + + + + + +Creates a new cursor from a pixbuf. + +Not all GDK backends support RGBA cursors. If they are not +supported, a monochrome approximation will be displayed. +The functions gdk_display_supports_cursor_alpha() and +gdk_display_supports_cursor_color() can be used to determine +whether RGBA cursors are supported; +gdk_display_get_default_cursor_size() and +gdk_display_get_maximal_cursor_size() give information about +cursor sizes. + +On the X backend, support for RGBA cursors requires a +sufficently new version of the X Render extension. + + + + + + the #GdkDisplay for which the cursor will be created + + + + the #GdkPixbuf containing the cursor image + + + + the horizontal offset of the 'hotspot' of the cursor. + + + + the vertical offset of the 'hotspot' of the cursor. + + + + a new #GdkCursor. + +Since: 2.4 + + + + + +Decrement the reference count of @gc. + +Deprecated: Use g_object_unref() instead. + + + + + a #GdkGC + + + + + + + + +For most purposes this function is deprecated in favor of +g_object_set_data(). However, for historical reasons GTK+ stores +the #GtkWidget that owns a #GdkWindow as user data on the +#GdkWindow. So, custom widget implementations should use +this function for that. If GTK+ receives an event for a #GdkWindow, +and the user data for the window is non-%NULL, GTK+ will assume the +user data is a #GtkWidget, and forward the event to that widget. + + + + + + a #GdkWindow + + + + user data + + + + + + + + +Returns: TRUE if the window has decorations set, FALSE otherwise. + + + + + The toplevel #GdkWindow to get the decorations from + + + + The window decorations will be written here + + + + TRUE if the window has decorations set, FALSE otherwise. + + + + + +Determines if keyboard layouts for both right-to-left and left-to-right +languages are in use. + +@Returns: %TRUE if there are layouts in both directions, %FALSE otherwise + +Since: 2.12 + + + + + a #GdkKeymap or %NULL to use the default keymap + + + + + + + + +Determines information about the current pointer grab. +This is not public API and must not be used by applications. + + + + + + the #GdkDisplay for which to get the grab information + + + + location to store current grab window + + + + location to store boolean indicating whether +the @owner_events flag to gdk_pointer_grab() was %TRUE. + + + + %TRUE if this application currently has the +pointer grabbed. + + + + + +Draws a line, using the foreground color and other attributes of +the #GdkGC. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + the x coordinate of the start point. + + + + the y coordinate of the start point. + + + + the x coordinate of the end point. + + + + the y coordinate of the end point. + + + + + + + + +Queries the height of the bounding box of a pixbuf animation. + + + + + + An animation. + + + + Height of the bounding box of the animation. + + + + + +Drops on the current destination. + +This function is called by the drag source. + + + + + a #GdkDragContext. + + + + the timestamp for this operation. + + + + + + + + +Like gdk_window_shape_combine_mask(), but the shape applies +only to event handling. Mouse events which happen while +the pointer position corresponds to an unset bit in the +mask will be passed on the window below @window. + +An input shape is typically used with RGBA windows. +The alpha channel of the window defines which pixels are +invisible and allows for nicely antialiased borders, +and the input shape controls where the window is +"clickable". + +On the X11 platform, this requires version 1.1 of the +shape extension. + +On the Win32 platform, this functionality is not present and the +function does nothing. + +Since: 2.10 + + + + + a #GdkWindow + + + + shape mask + + + + X position of shape mask with respect to @window + + + + Y position of shape mask with respect to @window + + + + + + + + +Return value: the screen for the event + + + + + a #GdkEvent + + + + the screen for the event + +Since: 2.2 + + + + + +Obtains the bit depth of the drawable, that is, the number of bits +that make up a pixel in the drawable's visual. Examples are 8 bits +per pixel, 24 bits per pixel, etc. + + + + + + a #GdkDrawable + + + + number of bits per pixel + + + + + +List all currently open displays. + + + + + + a #GdkDisplayManager + + + + a newly allocated #GSList of #GdkDisplay objects. +Free this list with g_slist_free() when you are done with it. + +Since: 2.2 + + + + + +Return value: the associated Gdk object, which may be a #GdkPixmap, + + + + + an X id. + + + + the associated Gdk object, which may be a #GdkPixmap, +a #GdkWindow or a #GdkFont. + + + + + +On X11, sends an X ClientMessage event to a given window. On +Windows, sends a message registered with the name +GDK_WIN32_CLIENT_MESSAGE. + +This could be used for communicating between different +applications, though the amount of data is limited to 20 bytes on +X11, and to just four bytes on Windows. + + + + + + the #GdkDisplay for the window where the message is to be sent. + + + + the #GdkEvent to send, which should be a #GdkEventClient. + + + + the window to send the client message to. + + + + non-zero on success. + +Since: 2.2 + + + + + +Begins a window resize operation (for a toplevel window). +You might use this function to implement a "window resize grip," for +example; in fact #GtkStatusbar uses it. The function works best +with window managers that support the &lt;ulink url="http://www.freedesktop.org/Standards/wm-spec"&gt;Extended Window Manager Hints&lt;/ulink&gt;, but has a +fallback implementation for other window managers. + + + + + + a toplevel #GdkWindow + + + + the edge or corner from which the drag is started + + + + the button being used to drag + + + + root window X coordinate of mouse click that began the drag + + + + root window Y coordinate of mouse click that began the drag + + + + timestamp of mouse click that began the drag (use gdk_event_get_time()) + + + + + + + + +Setting @accept_focus to %FALSE hints the desktop environment that the +window doesn't want to receive input focus. + +On X, it is the responsibility of the window manager to interpret this +hint. ICCCM-compliant window manager usually respect it. + +Since: 2.4 + + + + + a toplevel #GdkWindow + + + + %TRUE if the window should receive input focus + + + + + + + + +Returns: the #GdkDisplay associated to @cursor + + + + + a #GdkCursor. + + + + the #GdkDisplay associated to @cursor + +Since: 2.2 + + + + + +Draws a #GdkImage onto a drawable. +The depth of the #GdkImage must match the depth of the #GdkDrawable. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + the #GdkImage to draw. + + + + the left edge of the source rectangle within @image. + + + + the top of the source rectangle within @image. + + + + the x coordinate of the destination within @drawable. + + + + the y coordinate of the destination within @drawable. + + + + the width of the area to be copied, or -1 to make the area +extend to the right edge of @image. + + + + the height of the area to be copied, or -1 to make the area +extend to the bottom edge of @image. + + + + + + + + +Gets the foreground pixel value for @gc. If the +foreground pixel has never been set, returns the +default value 0. + + + + + + a #GdkGC + + + + the foreground pixel value of the GC + + + + + +Return value: %TRUE if the pointer is currently grabbed by this application.* + + + + + %TRUE if the pointer is currently grabbed by this application.* + + + + + +Sets a #GdkWindow as composited, or unsets it. Composited +windows do not automatically have their contents drawn to +the screen. Drawing is redirected to an offscreen buffer +and an expose event is emitted on the parent of the composited +window. It is the responsibility of the parent's expose handler +to manually merge the off-screen content onto the screen in +whatever way it sees fit. See &lt;xref linkend="composited-window-example"/&gt; +for an example. + +It only makes sense for child windows to be composited; see +gdk_window_set_opacity() if you need translucent toplevel +windows. + +An additional effect of this call is that the area of this +window is no longer clipped from regions marked for +invalidation on its parent. Draws done on the parent +window are also no longer clipped by the child. + +This call is only supported on some systems (currently, +only X11 with new enough Xcomposite and Xdamage extensions). +You must call gdk_display_supports_composite() to check if +setting a window as composited is supported before +attempting to do so. + +Since: 2.12 + + + + + a #GdkWindow + + + + %TRUE to set the window as composited + + + + + + + + +Like g_spawn_command_line_async(), except the child process is +spawned in such an environment that on calling gdk_display_open() +it would be returned a #GdkDisplay with @screen as the default +screen. + +This is useful for applications which wish to launch an application +on a specific screen. + + + + + + a #GdkScreen + + + + a command line + + + + return location for errors + + + + %TRUE on success, %FALSE if error is set. + +Since: 2.4 + + + + + +Converts a #GdkPixdata to a #GdkPixbuf. If @copy_pixels is %TRUE or +if the pixel data is run-length-encoded, the pixel data is copied into +newly-allocated memory; otherwise it is reused. + + + + + + a #GdkPixdata to convert into a #GdkPixbuf. + + + + whether to copy raw pixel data; run-length encoded +pixel data is always copied. + + + + location to store possible errors. + + + + a new #GdkPixbuf. + + + + + +Sets the color for a particular render part (foreground, +background, underline, etc.), overriding any attributes on the layouts +renderered with this renderer. + +Since: 2.6 + + + + + a #GdkPangoRenderer + + + + the part to render to set the color of + + + + the color to use, or %NULL to unset a previously +set override color. + + + + + + + + +Convert a string from the encoding of the current +locale into a form suitable for storing in a window property. + + + + + + the #GdkDisplay where the encoding is defined. + + + + a nul-terminated string. + + + + location to store the encoding atom +(to be used as the type for the property). + + + + location to store the format of the property + + + + location to store newly allocated data for the property. + + + + the length of @text, in bytes + + + + 0 upon sucess, non-zero upon failure. + +Since: 2.2 + + + + + +Gets the colormap for @drawable, if one is set; returns +%NULL otherwise. + + + + + + a #GdkDrawable + + + + the colormap, or %NULL + + + + + +Deprecated function; use g_object_unref() instead. + + + + + + a #GdkImage + + + + + + + + +Returns: %TRUE if windows with modified input shape are supported + + + + + a #GdkDisplay + + + + %TRUE if windows with modified input shape are supported + +Since: 2.10 + + + + + +Gets the event mask for @window. See gdk_window_set_events(). + + + + + + a #GdkWindow + + + + event mask for @window + + + + + +Adds a new frame to @animation. The @pixbuf must +have the dimensions specified when the animation +was constructed. + +Since: 2.8 + + + + + a #GdkPixbufSimpleAnim + + + + the pixbuf to add + + + + + + + + +Indicates to the window manager that @window is a transient dialog +associated with the application window @parent. This allows the +window manager to do things like center @window on @parent and +keep @window above @parent. + +See gtk_window_set_transient_for() if you're using #GtkWindow or +#GtkDialog. + + + + + + a toplevel #GdkWindow + + + + another toplevel #GdkWindow + + + + + + + + +Destroys the window system resources associated with @window and decrements @window's +reference count. The window system resources for all children of @window are also +destroyed, but the children's reference counts are not decremented. + +Note that a window will not be destroyed automatically when its reference count +reaches zero. You must call this function yourself before that happens. + + + + + + a #GdkWindow + + + + + + + + +Sets whether copying non-visible portions of a drawable +using this graphics context generate exposure events +for the corresponding regions of the destination +drawable. (See gdk_draw_drawable()). + + + + + a #GdkGC. + + + + if %TRUE, exposure events will be generated. + + + + + + + + +Returns: the monitor number in which the point (@x,@y) lies, or + + + + + a #GdkScreen. + + + + the x coordinate in the virtual screen. + + + + the y coordinate in the virtual screen. + + + + the monitor number in which the point (@x,@y) lies, or +a monitor close to (@x,@y) if the point is not in any monitor. + +Since: 2.2 + + + + + +The application can use this hint to tell the window manager +that a certain window has modal behaviour. The window manager +can use this information to handle modal windows in a special +way. + +You should only use this on windows for which you have +previously called gdk_window_set_transient_for() + + + + + A toplevel #GdkWindow + + + + %TRUE if the window is modal, %FALSE otherwise. + + + + + + + + +Finds out the DND protocol supported by a window. + +Since: 2.2 + + + + + the #GdkDisplay where the destination window resides + + + + the X id of the destination window. + + + + location where the supported DND protocol is returned. + + + + the X id of the window where the drop should happen. This +may be @xid or the X id of a proxy window, or None if @xid doesn't +support Drag and Drop. + + + + + +Increases the reference count of a font by one. + + + + + + a #GdkFont + + + + @font + + + + + +Determines information about the current keyboard grab. +This is not public API and must not be used by applications. + + + + + + the display for which to get the grab information + + + + location to store current grab window + + + + location to store boolean indicating whether +the @owner_events flag to gdk_keyboard_grab() was %TRUE. + + + + %TRUE if this application currently has the +keyboard grabbed. + + + + + +Looks up the #GdkPixmap that wraps the given native pixmap handle. + +For example in the X backend, a native pixmap handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + a native pixmap handle. + + + + the #GdkWindow wrapper for the native window, +or %NULL if there is none. + + + + + +Draws a series of lines connecting the given points. +The way in which joins between lines are draw is determined by the +#GdkCapStyle value in the #GdkGC. This can be set with +gdk_gc_set_line_attributes(). + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + an array of #GdkPoint structures specifying the endpoints of the + + + + the size of the @points array. + + + + + + + + +Gets a copy of the first #GdkEvent in the @display's event queue, without +removing the event from the queue. (Note that this function will +not get more events from the windowing system. It only checks the events +that have already been moved to the GDK event queue.) + + + + + + a #GdkDisplay + + + + a copy of the first #GdkEvent on the event queue, or %NULL +if no events are in the queue. The returned #GdkEvent should be freed with +gdk_event_free(). + +Since: 2.2 + + + + + +Set the background color of a GC using an unallocated color. The +pixel value for the color will be determined using GdkRGB. If the +colormap for the GC has not previously been initialized for GdkRGB, +then for pseudo-color colormaps (colormaps with a small modifiable +number of colors), a colorcube will be allocated in the colormap. + +Calling this function for a GC without a colormap is an error. + + + + + a #GdkGC + + + + an unallocated #GdkColor. + + + + + + + + +Repositions a window relative to its parent window. +For toplevel windows, window managers may ignore or modify the move; +you should probably use gtk_window_move() on a #GtkWindow widget +anyway, instead of using GDK functions. For child windows, +the move will reliably succeed. + +If you're also planning to resize the window, use gdk_window_move_resize() +to both move and resize simultaneously, for a nicer visual effect. + + + + + a #GdkWindow + + + + X coordinate relative to window's parent + + + + Y coordinate relative to window's parent + + + + + + + + +Moves the window to the correct workspace when running under a +window manager that supports multiple workspaces, as described +in the &lt;ulink url="http://www.freedesktop.org/Standards/wm-spec"&gt;Extended +Window Manager Hints&lt;/ulink&gt;. Will not do anything if the +window is already on all workspaces. + +Since: 2.8 + + + + + a #GdkWindow + + + + + + + + +Gets the background pixel value for @gc.If the +foreground pixel has never been set, returns the +default value 1. + + + + + + a #GdkGC + + + + the foreground pixel value of the GC + + + + + +Copies a rectangular area from @src_pixbuf to @dest_pixbuf. Conversion of +pixbuf formats is done automatically. + + + + + Source pixbuf. + + + + Source X coordinate within @src_pixbuf. + + + + Source Y coordinate within @src_pixbuf. + + + + Width of the area to copy. + + + + Height of the area to copy. + + + + Destination pixbuf. + + + + X coordinate within @dest_pixbuf. + + + + Y coordinate within @dest_pixbuf. + + + + + + + + +Gets the default #GdkDisplay. + + + + + + a #GdkDisplayManager + + + + a #GdkDisplay, or %NULL if there is no default +display. + +Since: 2.2 + + + + + +Adds a reference to an animation. + + + + + + An animation. + + + + The same as the @animation argument. + +Deprecated: Use g_object_ref(). + + + + + +Ends the drag operation after a drop. + +This function is called by the drag destination. + + + + + a #GtkDragContext. + + + + %TRUE if the data was successfully received. + + + + the timestamp for this operation. + + + + + + + + +Maximizes the window. If the window was already maximized, then +this function does nothing. + +On X11, asks the window manager to maximize @window, if the window +manager supports this operation. Not all window managers support +this, and some deliberately ignore it or don't have a concept of +"maximized"; so you can't rely on the maximization actually +happening. But it will happen with most standard window managers, +and GDK makes a best effort to get it to happen. + +On Windows, reliably maximizes the window. + + + + + + a toplevel #GdkWindow + + + + + + + + +Calculates the intersection of two rectangles. +It is allowed for @dest to be the same as either @src1 or @src2. + + + + + + a #GdkRectangle + + + + a #GdkRectangle + + + + return location for the intersection of @src1 and @src2 + + + + %TRUE if the rectangles intersect. + + + + + +Calls gdk_window_process_updates() for all windows (see #GdkWindow) +in the application. + + + + + + + + + + +Toggles whether a window should appear in a pager (workspace +switcher, or other desktop utility program that displays a small +thumbnail representation of the windows on the desktop). If a +window's semantic type as specified with gdk_window_set_type_hint() +already fully describes the window, this function should +&lt;emphasis&gt;not&lt;/emphasis&gt; be called in addition, instead you should +allow the window to be treated according to standard policy for +its semantic type. + +Since: 2.2 + + + + + a toplevel #GdkWindow + + + + %TRUE to skip the pager + + + + + + + + +Gets the display name specified in the command line arguments passed +to gdk_init() or gdk_parse_args(), if any. + + + + + + the display name, if specified explicitely, otherwise %NULL +this string is owned by GTK+ and must not be modified or freed. + +Since: 2.2 + + + + + +Obtains the area covered by the region as a list of rectangles. +The array returned in @rectangles must be freed with g_free(). + + + + + a #GdkRegion + + + + return location for an array of rectangles + + + + length of returned array + + + + + + + + +Return value: the size of the system's default colormap. + + + + + the size of the system's default colormap. + + + + + +Set the stipple bitmap for a graphics context. The +stipple will only be used if the fill mode is +%GDK_STIPPLED or %GDK_OPAQUE_STIPPLED. + + + + + a #GdkGC. + + + + the new stipple bitmap. + + + + + + + + +Emits a short beep associated to @window in the appropriate +display, if supported. Otherwise, emits a short beep on +the display just as gdk_display_beep(). + +Since: 2.12 + + + + + a toplevel #GdkWindow + + + + + + + + +Checks to see if window is the current grab window, and if +so, clear the current grab window. + + + + + a #GdkWindow + + + + + + + + +Performs necessary cleanup prior to freeing a pixmap or +destroying a window. + + + + + a #GdkDrawableImplX11. + + + + + + + + +Gets a "preferred visual" chosen by GdkRGB for rendering image data +on @screen. In previous versions of +GDK, this was the only visual GdkRGB could use for rendering. In +current versions, it's simply the visual GdkRGB would have chosen as +the optimal one in those previous versions. GdkRGB can now render to +drawables with any visual. + + + + + + a #GdkScreen + + + + The #GdkVisual chosen by GdkRGB. + +Since: 2.2 + + + + + +Clears a pixbuf to the given RGBA value, converting the RGBA value into +the pixbuf's pixel format. The alpha will be ignored if the pixbuf +doesn't have an alpha channel. + + + + + + a #GdkPixbuf + + + + RGBA pixel to clear to +(0xffffffff is opaque white, 0x00000000 transparent black) + + + + + + + + +Creates a #PangoContext for @screen. + +The context must be freed when you're finished with it. + +When using GTK+, normally you should use gtk_widget_get_pango_context() +instead of this function, to get the appropriate context for +the widget you intend to render text onto. + +The newly created context will have the default font options +(see #cairo_font_options_t) for the screen; if these options +change it will not be updated. Using gtk_widget_get_pango_context() +is more convenient if you want to keep a context around and track +changes to the screen's font rendering settings. + + + + + + the #GdkScreen for which the context is to be created. + + + + a new #PangoContext for @screen + +Since: 2.2 + + + + + +Returns: a GDK object associated with the given X id. + + + + + the #GdkDisplay. + + + + an X id. + + + + a GDK object associated with the given X id. + +Since: 2.2 + + + + + +Takes an existing pixbuf and adds an alpha channel to it. +If the existing pixbuf already had an alpha channel, the channel +values are copied from the original; otherwise, the alpha channel +is initialized to 255 (full opacity). + +If @substitute_color is %TRUE, then the color specified by (@r, @g, @b) will be +assigned zero opacity. That is, if you pass (255, 255, 255) for the +substitute color, all white pixels will become fully transparent. + + + + + + A #GdkPixbuf. + + + + Whether to set a color to zero opacity. If this +is %FALSE, then the (@r, @g, @b) arguments will be ignored. + + + + Red value to substitute. + + + + Green value to substitute. + + + + Blue value to substitute. + + + + A newly-created pixbuf with a reference count of 1. + + + + + +Deprecated function; use g_object_ref() instead. + + + + + a #GdkColormap + + + + + + + + +Remove a filter previously added with gdk_window_add_filter(). + + + + + + a #GdkWindow + + + + previously-added filter function + + + + user data for previously-added filter function + + + + + + + + +Extract the event window relative x/y coordinates from an event. + + + + + + a #GdkEvent + + + + location to put event window x coordinate + + + + location to put event window y coordinate + + + + %TRUE if the event delivered event window coordinates + + + + + +Sends an X ClientMessage event to all toplevel windows on the default +#GdkScreen. + +Toplevel windows are determined by checking for the WM_STATE property, as +described in the Inter-Client Communication Conventions Manual (ICCCM). +If no windows are found with the WM_STATE property set, the message is sent +to all children of the root window. + + + + + the #GdkEvent to send, which should be a #GdkEventClient. + + + + + + + + +Draws an arc or a filled 'pie slice'. The arc is defined by the bounding +rectangle of the entire ellipse, and the start and end angles of the part +of the ellipse to be drawn. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + %TRUE if the arc should be filled, producing a 'pie slice'. + + + + the x coordinate of the left edge of the bounding rectangle. + + + + the y coordinate of the top edge of the bounding rectangle. + + + + the width of the bounding rectangle. + + + + the height of the bounding rectangle. + + + + the start angle of the arc, relative to the 3 o'clock position, +counter-clockwise, in 1/64ths of a degree. + + + + the end angle of the arc, relative to @angle1, in 1/64ths +of a degree. + + + + + + + + +Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + a #GdkCursor. + + + + an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + +Obtains a clip region which contains the areas where the given ranges +of text would be drawn. @x_origin and @y_origin are the same position +you would pass to gdk_draw_layout_line(). @index_ranges should contain +ranges of bytes in the layout's text. + +Note that the regions returned correspond to logical extents of the text +ranges, not ink extents. So the drawn layout may in fact touch areas out of +the clip region. The clip region is mainly useful for highlightling parts +of text, such as when text is selected. + + + + + + a #PangoLayout + + + + X pixel where you intend to draw the layout with this clip + + + + Y pixel where you intend to draw the layout with this clip + + + + array of byte indexes into the layout, where even members of array are start indexes and odd elements are end indexes + + + + number of ranges in @index_ranges, i.e. half the size of @index_ranges + + + + a clip region containing the given ranges + + + + + +Indicates to the GUI environment that the application has finished +loading. If the applications opens windows, this function is +normally called after opening the application's initial set of +windows. + +GTK+ will call this function automatically after opening the first +#GtkWindow unless gtk_window_set_auto_startup_notification() is called +to disable that feature. + +Since: 2.2 + + + + + + + + + +Saves pixbuf to a file in format @type. By default, "jpeg", "png", "ico" +and "bmp" are possible file formats to save in, but more formats may be +installed. The list of all writable formats can be determined in the +following way: + +&lt;informalexample&gt;&lt;programlisting&gt; +void add_if_writable (GdkPixbufFormat *data, GSList **list) +{ +if (gdk_pixbuf_format_is_writable (data)) +*list = g_slist_prepend (*list, data); +} +&lt;!-- --&gt; +GSList *formats = gdk_pixbuf_get_formats (&lt;!-- --&gt;); +GSList *writable_formats = NULL; +g_slist_foreach (formats, add_if_writable, &amp;writable_formats); +g_slist_free (formats); +&lt;/programlisting&gt;&lt;/informalexample&gt; + +If @error is set, %FALSE will be returned. Possible errors include +those in the #GDK_PIXBUF_ERROR domain and those in the #G_FILE_ERROR domain. + +The variable argument list should be %NULL-terminated; if not empty, +it should contain pairs of strings that modify the save +parameters. For example: +&lt;informalexample&gt;&lt;programlisting&gt; +gdk_pixbuf_save (pixbuf, handle, "jpeg", &amp;error, +"quality", "100", NULL); +&lt;/programlisting&gt;&lt;/informalexample&gt; + +Currently only few parameters exist. JPEG images can be saved with a +"quality" parameter; its value should be in the range [0,100]. + +Text chunks can be attached to PNG images by specifying parameters of +the form "tEXt::key", where key is an ASCII string of length 1-79. +The values are UTF-8 encoded strings. The PNG compression level can +be specified using the "compression" parameter; it's value is in an +integer in the range of [0,9]. + +ICO images can be saved in depth 16, 24, or 32, by using the "depth" +parameter. When the ICO saver is given "x_hot" and "y_hot" parameters, +it produces a CUR instead of an ICO. + + + + + + a #GdkPixbuf. + + + + name of file to save. + + + + name of file format. + + + + return location for error, or %NULL + + + + list of key-value save options + + + + whether an error was set + + + + + +Converts a #GdkPixbuf to a #GdkPixdata. If @use_rle is %TRUE, the +pixel data is run-length encoded into newly-allocated memory and a +pointer to that memory is returned. + + + + + + a #GdkPixdata to fill. + + + + the data to fill @pixdata with. + + + + whether to use run-length encoding for the pixel data. + + + + If @ure_rle is %TRUE, a pointer to the newly-allocated memory +for the run-length encoded pixel data, otherwise %NULL. + + + + + +Informs a pixbuf loader that no further writes with +gdk_pixbuf_loader_write() will occur, so that it can free its +internal loading structures. Also, tries to parse any data that +hasn't yet been parsed; if the remaining data is partial or +corrupt, an error will be returned. If %FALSE is returned, @error +will be set to an error from the #GDK_PIXBUF_ERROR or #G_FILE_ERROR +domains. If you're just cancelling a load rather than expecting it +to be finished, passing %NULL for @error to ignore it is +reasonable. + + + + + + A pixbuf loader. + + + + return location for a #GError, or %NULL to ignore errors + + + + %TRUE if all image data written so far was successfully + passed out via the update_area signal + + + + + +A convenience wrapper around gdk_window_invalidate_region() which +invalidates a rectangular region. See +gdk_window_invalidate_region() for details. + + + + + a #GdkWindow + + + + rectangle to invalidate or %NULL to invalidate the whole +window + + + + whether to also invalidate child windows + + + + + + + + +Resizes @window; for toplevel windows, asks the window manager to resize +the window. The window manager may not allow the resize. When using GTK+, +use gtk_window_resize() instead of this low-level GDK function. + +Windows may not be resized below 1x1. + +If you're also planning to move the window, use gdk_window_move_resize() +to both move and resize simultaneously, for a nicer visual effect. + + + + + a #GdkWindow + + + + new width of the window + + + + new height of the window + + + + + + + + +The ::composited_changed signal is emitted when the composited +status of the screen changes + +Since: 2.10 + + + + + the object on which the signal is emitted + + + + + + + + +Clears an area of @window to the background color or background pixmap. + + + + + + a #GdkWindow + + + + x coordinate of rectangle to clear + + + + y coordinate of rectangle to clear + + + + width of rectangle to clear + + + + height of rectangle to clear + + + + + + + + +Gets the #GdkDisplay associated with a #GdkDrawable. + + + + + + a #GdkDrawable + + + + the #GdkDisplay associated with @drawable + +Since: 2.2 + + + + + +Deprecated function; use g_object_ref() instead. + + + + + + a #GdkGC + + + + the gc. + + + + + +Draws a rectangular outline or filled rectangle, using the foreground color +and other attributes of the #GdkGC. + +A rectangle drawn filled is 1 pixel smaller in both dimensions than a +rectangle outlined. Calling +&lt;literal&gt;gdk_draw_rectangle (window, gc, TRUE, 0, 0, 20, 20)&lt;/literal&gt; +results in a filled rectangle 20 pixels wide and 20 pixels high. Calling +&lt;literal&gt;gdk_draw_rectangle (window, gc, FALSE, 0, 0, 20, 20)&lt;/literal&gt; +results in an outlined rectangle with corners at (0, 0), (0, 20), (20, 20), +and (20, 0), which makes it 21 pixels wide and 21 pixels high. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + %TRUE if the rectangle should be filled. + + + + the x coordinate of the left edge of the rectangle. + + + + the y coordinate of the top edge of the rectangle. + + + + the width of the rectangle. + + + + the height of the rectangle. + + + + + + + + +Sets the group leader window for @window. By default, +GDK sets the group leader for all toplevel windows +to a global window implicitly created by GDK. With this function +you can override this default. + +The group leader window allows the window manager to distinguish +all windows that belong to a single application. It may for example +allow users to minimize/unminimize all windows belonging to an +application at once. You should only set a non-default group window +if your application pretends to be multiple applications. + + + + + a toplevel #GdkWindow + + + + group leader window, or %NULL to restore the default group leader window + + + + + + + + +Call gdk_x11_display_grab() on the default display. +To ungrab the server again, use gdk_x11_ungrab_server(). + +gdk_x11_grab_server()/gdk_x11_ungrab_server() calls can be nested. + + + + + + + + + +Obtains the upper- and lower-case versions of the keyval @symbol. +Examples of keyvals are #GDK_a, #GDK_Enter, #GDK_F1, etc. + + + + + + a keyval + + + + return location for lowercase version of @symbol + + + + return location for uppercase version of @symbol + + + + + + + + +Draws a point, using the foreground color and other attributes of +the #GdkGC. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + the x coordinate of the point. + + + + the y coordinate of the point. + + + + + + + + +Issues a request to the clipboard manager to store the +clipboard data. On X11, this is a special program that works +according to the freedesktop clipboard specification, available at +&lt;ulink url="http://www.freedesktop.org/Standards/clipboard-manager-spec"&gt; +http://www.freedesktop.org/Standards/clipboard-manager-spec&lt;/ulink&gt;. + +Since: 2.6 + + + + + a #GdkDisplay + + + + a #GdkWindow belonging to the clipboard owner + + + + a timestamp + + + + an array of targets that should be saved, or %NULL +if all available targets should be saved. + + + + length of the @targets array + + + + + + + + +Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + a #GdkFont. + + + + an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + +Return value: A #GdkGC suitable for drawing on @drawable + + + + + A #GdkDrawable + + + + Whether the returned #GdkGC should generate graphics exposures + + + + A #GdkGC suitable for drawing on @drawable + +Since: 2.4 + + + + + +Draws a number of characters in the given font or fontset. + +Deprecated: Use gdk_draw_layout() instead. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkFont. + + + + a #GdkGC. + + + + the x coordinate of the left edge of the text. + + + + the y coordinate of the baseline of the text. + + + + the characters to draw. + + + + the number of characters of @text to draw. + + + + + + + + +Return value: a description of the format. + + + + + a #GdkPixbufFormat + + + + a description of the format. + +Since: 2.2 + + + + + +Looks up the #GdkVisual for a particular screen and X Visual ID. + + + + + + a #GdkScreen. + + + + an X Visual ID. + + + + the #GdkVisual (owned by the screen object), or %NULL +if the visual ID wasn't found. + +Since: 2.2 + + + + + +Renders a #PangoGlyphString onto a drawable, possibly +transforming the layed-out coordinates through a transformation +matrix. Note that the transformation matrix for @font is not +changed, so to produce correct rendering results, the @font +must have been loaded using a #PangoContext with an identical +transformation matrix to that passed in to this function. + +See also gdk_draw_glyphs(), gdk_draw_layout(). + +Since: 2.6 + + + + + a #GdkDrawable + + + + a #GdkGC + + + + a #PangoMatrix, or %NULL to use an identity transformation + + + + the font in which to draw the string + + + + the x position of the start of the string (in Pango +units in user space coordinates) + + + + the y position of the baseline (in Pango units +in user space coordinates) + + + + the glyph string to draw + + + + + + + + +This function deallocates the Windows device context allocated by +&lt;funcion&gt;gdk_win32_hdc_get()&lt;/function&gt;. It should be called with +the same parameters. + + + + + destination #GdkDrawable + + + + #GdkGC to use for drawing on @drawable + + + + mask indicating what properties were set up + + + + + + + + +Return value: whether #GdkEventOwnerChange events will + + + + + a #GdkDisplay + + + + whether #GdkEventOwnerChange events will +be sent. + +Since: 2.6 + + + + + +Gets the display to which the @screen belongs. + + + + + + a #GdkScreen + + + + the display to which @screen belongs + +Since: 2.2 + + + + + +@colormap should be the colormap for the graphics context and +drawable you're using to draw. If you're drawing to a #GtkWidget, +call gtk_widget_get_colormap(). + +@color should have its %red, %green, and %blue fields initialized; +gdk_rgb_find_color() will fill in the %pixel field with the best +matching pixel from a color cube. The color is then ready to be +used for drawing, e.g. you can call gdk_gc_set_foreground() which +expects %pixel to be initialized. + +In many cases, you can avoid this whole issue by calling +gdk_gc_set_rgb_fg_color() or gdk_gc_set_rgb_bg_color(), which +do not expect %pixel to be initialized in advance. If you use those +functions, there's no need for gdk_rgb_find_color(). + + + + + + a #GdkColormap + + + + a #GdkColor + + + + + + + + + + + + + a #GdkScreen. + + + + the position of @screen among the screens of +its display. +the index of a #GdkScreen. + +Since: 2.2 + + + + + +Adds a function to be called whenever there are no higher priority +events pending. If the function returns %FALSE it is automatically +removed from the list of event sources and will not be called again. + +This variant of g_idle_add_full() calls @function with the GDK lock +held. It can be thought of a MT-safe version for GTK+ widgets for the +following use case, where you have to worry about idle_callback() +running in thread A and accessing @self after it has been finalized +in thread B: + +&lt;informalexample&gt;&lt;programlisting&gt; +static gboolean +idle_callback (gpointer data) +{ +// gdk_threads_enter(); would be needed for g_idle_add() + +SomeWidget *self = data; +/&lt;!-- --&gt;* do stuff with self *&lt;!-- --&gt;/ + +self-&gt;idle_id = 0; + +// gdk_threads_leave(); would be needed for g_idle_add() +return FALSE; +} + +static void +some_widget_do_stuff_later (SomeWidget *self) +{ +self-&gt;idle_id = gdk_threads_add_idle (idle_callback, self) +// using g_idle_add() here would require thread protection in the callback +} + +static void +some_widget_finalize (GObject *object) +{ +SomeWidget *self = SOME_WIDGET (object); +if (self-&gt;idle_id) +g_source_remove (self-&gt;idle_id); +G_OBJECT_CLASS (parent_class)-&gt;finalize (object); +} +&lt;/programlisting&gt;&lt;/informalexample&gt; + + + + + + the priority of the idle source. Typically this will be in the +range btweeen #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE + + + + function to call + + + + data to pass to @function + + + + function to call when the idle is removed, or %NULL + + + + the ID (greater than 0) of the event source. + +Since: 2.12 + + + + + +Retrieves the user data for @window, which is normally the widget +that @window belongs to. See gdk_window_set_user_data(). + + + + + + a #GdkWindow + + + + return location for user data + + + + + + + + +Return value: an Xlib &lt;type&gt;XFontStruct*&lt;/type&gt; or an &lt;type&gt;XFontSet&lt;/type&gt;. + + + + + a #GdkFont. + + + + an Xlib &lt;type&gt;XFontStruct*&lt;/type&gt; or an &lt;type&gt;XFontSet&lt;/type&gt;. + + + + + +Return value: the core pointer device; this is owned by the + + + + + a #GdkDisplay + + + + the core pointer device; this is owned by the +display and should not be freed. + +Since: 2.2 + + + + + +If an animation is really just a plain image (has only one frame), +this function returns that image. If the animation is an animation, +this function returns a reasonable thing to display as a static +unanimated image, which might be the first frame, or something more +sophisticated. If an animation hasn't loaded any frames yet, this +function will return %NULL. + + + + + + a #GdkPixbufAnimation + + + + unanimated image representing the animation + + + + + +Indicates to the GUI environment that the application has finished +loading, using a given identifier. + +GTK+ will call this function automatically for #GtkWindow with custom +startup-notification identifier unless +gtk_window_set_auto_startup_notification() is called to disable +that feature. + +Since: 2.12 + + + + + a startup-notification identifier, for which notification +process should be completed + + + + + + + + +Call XGrabServer() on @display. +To ungrab the display again, use gdk_x11_display_ungrab(). + +gdk_x11_display_grab()/gdk_x11_display_ungrab() calls can be nested. + +Since: 2.2 + + + + + a #GdkDisplay + + + + + + + + +Release any keyboard grab + +Since: 2.2 + + + + + a #GdkDisplay. + + + + a timestap (e.g #GDK_CURRENT_TIME). + + + + + + + + +This function is specific to the X11 backend of GDK, and indicates +whether the window manager for the default screen supports a certain +hint from the Extended Window Manager Hints Specification. See +gdk_x11_screen_supports_net_wm_hint() for complete details. + + + + + + a property atom. + + + + %TRUE if the window manager supports @property + + + + + +"Pins" a window such that it's on all workspaces and does not scroll +with viewports, for window managers that have scrollable viewports. +(When using #GtkWindow, gtk_window_stick() may be more useful.) + +On the X11 platform, this function depends on window manager +support, so may have no effect with many window managers. However, +GDK will do the best it can to convince the window manager to stick +the window. For window managers that don't support this operation, +there's nothing you can do to force it to happen. + + + + + + a toplevel #GdkWindow + + + + + + + + +Gets the system's default colormap for @screen + + + + + + a #GdkScreen + + + + the default colormap for @screen. + +Since: 2.2 + + + + + +Convert from an X atom for a #GdkDisplay to the corresponding +#GdkAtom. + + + + + + A #GdkDisplay + + + + an X atom + + + + the corresponding #GdkAtom. + +Since: 2.2 + + + + + +Unmaximizes the window. If the window wasn't maximized, then this +function does nothing. + +On X11, asks the window manager to unmaximize @window, if the +window manager supports this operation. Not all window managers +support this, and some deliberately ignore it or don't have a +concept of "maximized"; so you can't rely on the unmaximization +actually happening. But it will happen with most standard window +managers, and GDK makes a best effort to get it to happen. + +On Windows, reliably unmaximizes the window. + + + + + + a toplevel #GdkWindow + + + + + + + + +Render a #PangoLayout onto a GDK drawable + +If the layout's #PangoContext has a transformation matrix set, then +@x and @y specify the position of the top left corner of the +bounding box (in device space) of the transformed layout. + +If you're using GTK+, the usual way to obtain a #PangoLayout +is gtk_widget_create_pango_layout(). + + + + + the drawable on which to draw string + + + + base graphics context to use + + + + the X position of the left of the layout (in pixels) + + + + the Y position of the top of the layout (in pixels) + + + + a #PangoLayout + + + + + + + + +Removes a reference from @cursor, deallocating the cursor +if no references remain. + + + + + + a #GdkCursor + + + + + + + + +Sets keyboard focus to @window. In most cases, gtk_window_present() +should be used on a #GtkWindow, rather than calling this function. + + + + + + a #GdkWindow + + + + timestamp of the event triggering the window focus + + + + + + + + +Gets the client ID set with gdk_set_sm_client_id(), if any. + + + + + + Session ID, or %NULL if gdk_set_sm_client_id() +has never been called. + + + + + +Draws a number of unconnected lines. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + an array of #GdkSegment structures specifying the start and +end points of the lines to be drawn. + + + + the number of line segments to draw, i.e. the size of the +@segs array. + + + + + + + + +Indicates that you are beginning the process of redrawing @region. +A backing store (offscreen buffer) large enough to contain @region +will be created. The backing store will be initialized with the +background color or background pixmap for @window. Then, all +drawing operations performed on @window will be diverted to the +backing store. When you call gdk_window_end_paint(), the backing +store will be copied to @window, making it visible onscreen. Only +the part of @window contained in @region will be modified; that is, +drawing operations are clipped to @region. + +The net result of all this is to remove flicker, because the user +sees the finished product appear all at once when you call +gdk_window_end_paint(). If you draw to @window directly without +calling gdk_window_begin_paint_region(), the user may see flicker +as individual drawing operations are performed in sequence. The +clipping and background-initializing features of +gdk_window_begin_paint_region() are conveniences for the +programmer, so you can avoid doing that work yourself. + +When using GTK+, the widget system automatically places calls to +gdk_window_begin_paint_region() and gdk_window_end_paint() around +emissions of the expose_event signal. That is, if you're writing an +expose event handler, you can assume that the exposed area in +#GdkEventExpose has already been cleared to the window background, +is already set as the clip region, and already has a backing store. +Therefore in most cases, application code need not call +gdk_window_begin_paint_region(). (You can disable the automatic +calls around expose events on a widget-by-widget basis by calling +gtk_widget_set_double_buffered().) + +If you call this function multiple times before calling the +matching gdk_window_end_paint(), the backing stores are pushed onto +a stack. gdk_window_end_paint() copies the topmost backing store +onscreen, subtracts the topmost region from all other regions in +the stack, and pops the stack. All drawing operations affect only +the topmost backing store in the stack. One matching call to +gdk_window_end_paint() is required for each call to +gdk_window_begin_paint_region(). + + + + + + a #GdkWindow + + + + region you intend to draw to + + + + + + + + +Lists the available visuals for the default screen. +(See gdk_screen_list_visuals()) +A visual describes a hardware image data format. +For example, a visual might support 24-bit color, or 8-bit color, +and might expect pixels to be in a certain format. + +Call g_list_free() on the return value when you're finished with it. + + + + + + a list of visuals; the list must be freed, but not its contents + + + + + +Return value: %TRUE if the drop was successful. + + + + + a #GdkDragContext + + + + %TRUE if the drop was successful. + +Since: 2.6 + + + + + +This function allows for hooking into the operation +of getting the current location of the pointer. This +is only useful for such low-level tools as an +event recorder. Applications should never have any +reason to use this facility. + +This function is not multihead safe. For multihead operation, +see gdk_display_set_pointer_hooks(). + + + + + + a table of pointers to functions for getting +quantities related to the current pointer position, +or %NULL to restore the default table. + + + + the previous pointer hook table + + + + + +This function is specific to the DirectFB backend. It allows +to specify a GdkVisual by @pixel_format. + +At startup, only those visuals that can be blitted +hardware-accelerated are registered. By using +gdk_directfb_visual_by_format() you can retrieve visuals that +don't match this criteria since this function will try to create +a new visual for the desired @pixel_format for you. + + + + + + the pixel_format of the requested visual + + + + a pointer to the GdkVisual or %NULL if the +pixel_format is unsupported. + + + + + +Convert a text property in the giving encoding to +a list of UTF-8 strings. + + + + + + an atom representing the encoding of the text + + + + the format of the property + + + + the text to convert + + + + the length of @text, in bytes + + + + location to store the list of strings or %NULL. The +list should be freed with g_strfreev(). + + + + the number of strings in the resulting +list. + + + + + +Convert from a ISO10646 character to a key symbol. + + + + + + a ISO10646 encoded character + + + + the corresponding GDK key symbol, if one exists. +or, if there is no corresponding symbol, +wc | 0x01000000 + + + + + +Converts from a #GdkAtom to the X atom for the default GDK display +with the same string value. + + + + + + A #GdkAtom + + + + the X atom corresponding to @atom. + + + + + +If the event contains a "state" field, puts that field in @state. Otherwise +stores an empty state (0). Returns %TRUE if there was a state field +in the event. @event may be %NULL, in which case it's treated +as if the event had no state field. + + + + + + a #GdkEvent or NULL + + + + return location for state + + + + %TRUE if there was a state field in the event + + + + + +Returns: whether cursors can have multiple colors. + + + + + a #GdkDisplay + + + + whether cursors can have multiple colors. + +Since: 2.4 + + + + + +Retrieves the colormap for a given GC, if it exists. +A GC will have a colormap if the drawable for which it was created +has a colormap, or if a colormap was set explicitely with +gdk_gc_set_colormap. + + + + + + a #GdkGC + + + + the colormap of @gc, or %NULL if @gc doesn't have one. + + + + + +Opens a display. + +Since: 2.2 + + + + + the name of the display to open + + + + a #GdkDisplay, or %NULL if the display +could not be opened. + + + + + +Return value: name of the X atom; this string is owned by GTK+, + + + + + an X atom for GDK's default display + + + + name of the X atom; this string is owned by GTK+, +so it shouldn't be modifed or freed. + + + + + +Return value: a %NULL-terminated array of filename extensions which must be + + + + + a #GdkPixbufFormat + + + + a %NULL-terminated array of filename extensions which must be +freed with g_strfreev() when it is no longer needed. + +Since: 2.2 + + + + + +Emits a short beep on @display + +Since: 2.2 + + + + + a #GdkDisplay + + + + + + + + +Returns: %TRUE if there were any entries + + + + + a #GdkKeymap or %NULL to use the default keymap + + + + a keycode + + + + return location for array of #GdkKeymapKey, or %NULL + + + + return location for array of keyvals, or %NULL + + + + length of @keys and @keyvals + + + + %TRUE if there were any entries + + + + + +Obtains the position of a window in root window coordinates. +(Compare with gdk_window_get_position() and +gdk_window_get_geometry() which return the position of a window +relative to its parent window.) + + + + + + a #GdkWindow + + + + return location for X coordinate + + + + return location for Y coordinate + + + + not meaningful, ignore + + + + + +Creates a new animation by loading it from a file. The file format is +detected automatically. If the file's format does not support multi-frame +images, then an animation with a single frame will be created. Possible errors +are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. + + + + + + Name of file to load, in the GLib file name encoding + + + + return location for error + + + + A newly-created animation with a reference count of 1, or %NULL +if any of several error conditions ocurred: the file could not be opened, +there was no loader for the file's format, there was not enough memory to +allocate the image buffer, or the image file contained invalid data. + + + + + +Gets the type of the window. See #GdkWindowType. + + + + + + a #GdkWindow + + + + type of window + + + + + +Sets the clip mask for a graphics context from a region structure. +The clip mask is interpreted relative to the clip origin. (See +gdk_gc_set_clip_origin()). + + + + + a #GdkGC. + + + + the #GdkRegion. + + + + + + + + +Allocates colors from a colormap. + + + + + + a #GdkColormap. + + + + The color values to allocate. On return, the pixel +values for allocated colors will be filled in. + + + + The number of colors in @colors. + + + + If %TRUE, the colors are allocated writeable +(their values can later be changed using gdk_color_change()). +Writeable colors cannot be shared between applications. + + + + If %TRUE, GDK will attempt to do matching against +existing colors if the colors cannot be allocated as requested. + + + + An array of length @ncolors. On return, this +indicates whether the corresponding color in @colors was +successfully allocated or not. + + + + The number of colors that were not successfully +allocated. + + + + + +Sets the default font options for the screen. These +options will be set on any #PangoContext's newly created +with gdk_pango_context_get_for_screen(). Changing the +default set of font options does not affect contexts that +have already been created. + +Since: 2.10 + + + + + a #GdkScreen + + + + a #cairo_font_options_t, or %NULL to unset any +previously set default font options. + + + + + + + + +Resizes a region by the specified amount. +Positive values shrink the region. Negative values expand it. + + + + + a #GdkRegion + + + + the number of pixels to shrink the region horizontally + + + + the number of pixels to shrink the region vertically + + + + + + + + +Appends a copy of the given event onto the front of the event +queue for event-&gt;any.window's display, or the default event +queue if event-&gt;any.window is %NULL. See gdk_display_put_event(). + + + + + a #GdkEvent. + + + + + + + + +Gets the system's default colormap for the default screen. (See +gdk_colormap_get_system_for_screen ()) + + + + + + the default colormap. + + + + + +Gets the screen to which this visual belongs + + + + + + a #GdkVisual + + + + the screen to which this visual belongs. + +Since: 2.2 + + + + + +Creates a new, empty animation. + + + + + + the width of the animation + + + + the height of the animation + + + + the speed of the animation, in frames per second + + + + a newly allocated #GdkPixbufSimpleAnim + +Since: 2.8 + + + + + +Deprecated equivalent of calling g_object_ref() on @drawable. +(Drawables were not objects in previous versions of GDK.) + + + + + + a #GdkDrawable + + + + the same @drawable passed in + + + + + +Computes the region of a drawable that is potentially visible. +This does not necessarily take into account if the window is +obscured by other windows, but no area outside of this region +is visible. + + + + + + a #GdkDrawable + + + + a #GdkRegion. This must be freed with gdk_region_destroy() +when you are done. + + + + + +Sets the background color for a graphics context. +Note that this function uses @color-&gt;pixel, use +gdk_gc_set_rgb_bg_color() to specify the background +color as red, green, blue components. + + + + + a #GdkGC. + + + + the new background color. + + + + + + + + +Equivalent to calling gdk_window_move() and gdk_window_resize(), +except that both operations are performed at once, avoiding strange +visual effects. (i.e. the user may be able to see the window first +move, then resize, if you don't use gdk_window_move_resize().) + + + + + a #GdkWindow + + + + new X position relative to window's parent + + + + new Y position relative to window's parent + + + + new width + + + + new height + + + + + + + + +Creates a new cursor from the set of builtin cursors. +Some useful ones are: +&lt;itemizedlist&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="right_ptr.png"&gt;&lt;/inlinegraphic&gt; #GDK_RIGHT_PTR (right-facing arrow) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="crosshair.png"&gt;&lt;/inlinegraphic&gt; #GDK_CROSSHAIR (crosshair) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="xterm.png"&gt;&lt;/inlinegraphic&gt; #GDK_XTERM (I-beam) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="watch.png"&gt;&lt;/inlinegraphic&gt; #GDK_WATCH (busy) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="fleur.png"&gt;&lt;/inlinegraphic&gt; #GDK_FLEUR (for moving objects) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="hand1.png"&gt;&lt;/inlinegraphic&gt; #GDK_HAND1 (a right-pointing hand) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="hand2.png"&gt;&lt;/inlinegraphic&gt; #GDK_HAND2 (a left-pointing hand) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="left_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_LEFT_SIDE (resize left side) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="right_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_RIGHT_SIDE (resize right side) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="top_left_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_TOP_LEFT_CORNER (resize northwest corner) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="top_right_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_TOP_RIGHT_CORNER (resize northeast corner) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="bottom_left_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_BOTTOM_LEFT_CORNER (resize southwest corner) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="bottom_right_corner.png"&gt;&lt;/inlinegraphic&gt; #GDK_BOTTOM_RIGHT_CORNER (resize southeast corner) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="top_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_TOP_SIDE (resize top side) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="bottom_side.png"&gt;&lt;/inlinegraphic&gt; #GDK_BOTTOM_SIDE (resize bottom side) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="sb_h_double_arrow.png"&gt;&lt;/inlinegraphic&gt; #GDK_SB_H_DOUBLE_ARROW (move vertical splitter) +&lt;/para&gt;&lt;/listitem&gt; +&lt;listitem&gt;&lt;para&gt; +&lt;inlinegraphic format="PNG" fileref="sb_v_double_arrow.png"&gt;&lt;/inlinegraphic&gt; #GDK_SB_V_DOUBLE_ARROW (move horizontal splitter) +&lt;/para&gt;&lt;/listitem&gt; +&lt;/itemizedlist&gt; + +To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create +a cursor with no pixels in it. + + + + + + the #GdkDisplay for which the cursor will be created + + + + cursor to create + + + + a new #GdkCursor + +Since: 2.2 + + + + + +Loads a fontset for use on @display. + +The fontset may be newly loaded or looked up in a cache. +You should make no assumptions about the initial reference count. + +Since: 2.2 + + + + + a #GdkDisplay + + + + a comma-separated list of XLFDs describing +the component fonts of the fontset to load. + + + + a #GdkFont, or %NULL if the fontset could not be loaded. + + + + + +Ungrabs the pointer on the default display, if it is grabbed by this +application. + + + + + a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no +timestamp is available. + + + + + + + + +Gets the number of milliseconds the current pixbuf should be displayed, +or -1 if the current pixbuf should be displayed forever. g_timeout_add() +conveniently takes a timeout in milliseconds, so you can use a timeout +to schedule the next update. + + + + + + an animation iterator + + + + delay time in milliseconds (thousandths of a second) + + + + + +The application can use this call to provide a hint to the window +manager about the functionality of a window. The window manager +can use this information when determining the decoration and behaviour +of the window. + +The hint must be set before the window is mapped. + + + + + A toplevel #GdkWindow + + + + A hint of the function this window will have + + + + + + + + +Returns: whether cursors can have alpha channels. + + + + + a #GdkDisplay + + + + whether cursors can have alpha channels. + +Since: 2.4 + + + + + +Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + a #GdkColormap. + + + + an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + +Like gdk_draw_rgb_32_image(), but allows you to specify the dither +offsets. See gdk_draw_rgb_image_dithalign() for more details. + + + + + + a #GdkDrawable + + + + a #GdkGC + + + + X coordinate on @drawable where image should go + + + + Y coordinate on @drawable where image should go + + + + width of area of image to draw + + + + height of area of image to draw + + + + dithering mode + + + + RGB image data + + + + rowstride of RGB image data + + + + X dither offset + + + + Y dither offset + + + + + + + + +Returns: number of monitors which @screen consists of. + + + + + a #GdkScreen. + + + + number of monitors which @screen consists of. + +Since: 2.2 + + + + + +The number of bytes between the start of a row and +the start of the next row. This number must (obviously) +be at least as large as the width of the pixbuf. + + + + + + + + + +Disables or enables an image format. If a format is disabled, +gdk-pixbuf won't use the image loader for this format to load +images. Applications can use this to avoid using image loaders +with an inappropriate license, see gdk_pixbuf_format_get_license(). + +Since: 2.6 + + + + + a #GdkPixbufFormat + + + + %TRUE to disable the format @format + + + + + + + + +Saves pixbuf to a callback in format @type, which is currently "jpeg", +"png", "tiff", "ico" or "bmp". If @error is set, %FALSE will be returned. See +gdk_pixbuf_save_to_callback () for more details. + + + + + + a #GdkPixbuf. + + + + a function that is called to save each block of data that +the save routine generates. + + + + user data to pass to the save function. + + + + name of file format. + + + + name of options to set, %NULL-terminated + + + + values for named options + + + + return location for error, or %NULL + + + + whether an error was set + +Since: 2.4 + + + + + +Ungrabs the keyboard on the default display, if it is grabbed by this +application. + + + + + a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no +timestamp is available. + + + + + + + + +Adds @region to the update area for @window. The update area is the +region that needs to be redrawn, or "dirty region." The call +gdk_window_process_updates() sends one or more expose events to the +window, which together cover the entire update area. An +application would normally redraw the contents of @window in +response to those expose events. + +GDK will call gdk_window_process_all_updates() on your behalf +whenever your program returns to the main loop and becomes idle, so +normally there's no need to do that manually, you just need to +invalidate regions that you know should be redrawn. + +The @invalidate_children parameter controls whether the region of +each child window that intersects @region will also be invalidated. +If %FALSE, then the update area for child windows will remain +unaffected. See gdk_window_invalidate_maybe_recurse if you need +fine grained control over which children are invalidated. + + + + + a #GdkWindow + + + + a #GdkRegion + + + + %TRUE to also invalidate child windows + + + + + + + + +Gets the default GTK+ screen number. + + + + + + returns the screen number specified by +the --display command line option or the DISPLAY environment +variable when gdk_init() calls XOpenDisplay(). + + + + + +Indicates that the application will cooperate with the window +system in synchronizing the window repaint with the window +manager during resizing operations. After an application calls +this function, it must call gdk_window_configure_finished() every +time it has finished all processing associated with a set of +Configure events. Toplevel GTK+ windows automatically use this +protocol. + +On X, calling this function makes @window participate in the +_NET_WM_SYNC_REQUEST window manager protocol. + +Since: 2.6 + + + + + a toplevel #GdkWindow + + + + + + + + +Looks up the #GdkPixmap that wraps the given native pixmap handle. + +For example in the X backend, a native pixmap handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + the #GdkDisplay associated with @anid + + + + a native pixmap handle. + + + + the #GdkPixmap wrapper for the native pixmap, +or %NULL if there is none. + +Since: 2.2 + + + + + +Sets the background pixmap of @window. May also be used to set a background of +"None" on @window, by setting a background pixmap of %NULL. +A background pixmap will be tiled, positioning the first tile at the origin of +@window, or if @parent_relative is %TRUE, the tiling will be done based on the +origin of the parent window (useful to align tiles in a parent with tiles +in a child). + +A background pixmap of %NULL means that the window will have no +background. A window with no background will never have its +background filled by the windowing system, instead the window will +contain whatever pixels were already in the corresponding area of +the display. + +The windowing system will normally fill a window with its background +when the window is obscured then exposed, and when you call +gdk_window_clear(). + + + + + + a #GdkWindow + + + + a #GdkPixmap, or %NULL + + + + whether the tiling origin is at the origin of @window's parent + + + + + + + + +This function is specific to the X11 backend of GDK, and indicates +whether the window manager supports a certain hint from the +Extended Window Manager Hints Specification. You can find this +specification on +&lt;ulink url="http://www.freedesktop.org"&gt;http://www.freedesktop.org&lt;/ulink&gt;. + +When using this function, keep in mind that the window manager +can change over time; so you shouldn't use this function in +a way that impacts persistent application state. A common bug +is that your application can start up before the window manager +does when the user logs in, and before the window manager starts +gdk_x11_screen_supports_net_wm_hint() will return %FALSE for every property. +You can monitor the window_manager_changed signal on #GdkScreen to detect +a window manager change. + + + + + + the relevant #GdkScreen. + + + + a property atom. + + + + %TRUE if the window manager supports @property + +Since: 2.2 + + + + + +Gets the default screen for the default display. (See +gdk_display_get_default ()). + + + + + + a #GdkScreen, or %NULL if there is no default display. + +Since: 2.2 + + + + + +Checks to see if a button event starts or ends an implicit grab. + + + + + a #GdkWindow + + + + an XEvent of type ButtonPress or ButtonRelease + + + + + + + + +Takes the opacity values in a rectangular portion of a pixbuf and thresholds +them to produce a bi-level alpha mask that can be used as a clipping mask for +a drawable. + + + + + + A pixbuf. + + + + Bitmap where the bilevel mask will be painted to. + + + + Source X coordinate. + + + + source Y coordinate. + + + + Destination X coordinate. + + + + Destination Y coordinate. + + + + Width of region to threshold, or -1 to use pixbuf width + + + + Height of region to threshold, or -1 to use pixbuf height + + + + Opacity values below this will be painted as zero; all +other values will be painted as one. + + + + + + + + +This function used to set the colormap to be used for drawing with +@context. The colormap is now always derived from the graphics +context used for drawing, so calling this function is no longer +necessary. + + + + + a #PangoContext + + + + a #GdkColormap + + + + + + + + +Deprecated equivalent of calling g_object_unref() on @drawable. + + + + + + a #GdkDrawable + + + + + + + + +Converts from a #GdkAtom to the X atom for a #GdkDisplay +with the same string value. + + + + + + A #GdkDisplay + + + + A #GdkAtom + + + + the X atom corresponding to @atom. + +Since: 2.2 + + + + + +Sets the colormap for the image to the given colormap. Normally +there's no need to use this function, images are created with the +correct colormap if you get the image from a drawable. If you +create the image from scratch, use the colormap of the drawable you +intend to render the image to. + + + + + a #GdkImage + + + + a #GdkColormap + + + + + + + + +A convenience wrapper around gdk_window_begin_paint_region() which +creates a rectangular region for you. See +gdk_window_begin_paint_region() for details. + + + + + + a #GdkWindow + + + + rectangle you intend to draw to + + + + + + + + +Set the attributes of a cairo context to match those of a #GdkGC +as far as possible. Some aspects of a #GdkGC, such as clip masks +and functions other than %GDK_COPY are not currently handled. + + + + + a #GdkGC + + + + a #cairo_t + + + + a foreground color to use to override the +foreground color of the GC + + + + a stipple pattern to use to override the +stipple from the GC. If this is present and the fill mode +of the GC isn't %GDK_STIPPLED or %GDK_OPAQUE_STIPPLED +the fill mode will be forced to %GDK_STIPPLED + + + + pass %FALSE if the @gc has not changed since the +last call to this function + + + + + + + + +Get the best visual with depth @depth for the default GDK screen. +Color visuals and visuals with mutable colormaps are preferred +over grayscale or fixed-colormap visuals. The return value should not +be freed. %NULL may be returned if no visual supports @depth. + + + + + + a bit depth + + + + best visual for the given depth + + + + + +Creates a new attribute flagging a region as embossed or not. + + + + + + if the region should be embossed + + + + new #PangoAttribute + + + + + +Queries the width of the bounding box of a pixbuf animation. + + + + + + An animation. + + + + Width of the bounding box of the animation. + + + + + +Determines the name to pass to gdk_display_open() to get +a #GdkDisplay with this screen as the default screen. + + + + + + a #GdkScreen + + + + a newly allocated string, free with g_free() + +Since: 2.2 + + + + + +Convert from UTF-8 to compound text. + + + + + + a UTF-8 string + + + + location to store resulting encoding + + + + location to store format of the result + + + + location to store the data of the result + + + + location to store the length of the data +stored in @ctext + + + + %TRUE if the conversion succeeded, otherwise +false. + + + + + +Returns: the corresponding #GdkDisplay. + + + + + the #GdkFont. + + + + the corresponding #GdkDisplay. + +Since: 2.2 + + + + + +Determines the width of a given character. + + + + + + a #GdkFont + + + + the character to measure. + + + + the width of the character in pixels. + +Deprecated: Use gdk_text_extents() instead. + + + + + +Frees a #GdkEvent, freeing or decrementing any resources associated with it. +Note that this function should only be called with events returned from +functions such as gdk_event_peek(), gdk_event_get(), +gdk_event_get_graphics_expose() and gdk_event_copy(). + + + + + a #GdkEvent. + + + + + + + + +Return value: whether this image format is disabled. + + + + + a #GdkPixbufFormat + + + + whether this image format is disabled. + +Since: 2.6 + + + + + +Creates a new #GdkPixbuf out of in-memory image data. Currently only RGB +images with 8 bits per sample are supported. + + + + + + Image data in 8-bit/sample packed format + + + + Colorspace for the image data + + + + Whether the data has an opacity channel + + + + Number of bits per sample + + + + Width of the image in pixels, must be &gt; 0 + + + + Height of the image in pixels, must be &gt; 0 + + + + Distance in bytes between row starts + + + + Function used to free the data when the pixbuf's reference count +drops to zero, or %NULL if the data should not be freed + + + + Closure data to pass to the destroy notification function + + + + A newly-created #GdkPixbuf structure with a reference count of 1. + + + + + +Setting @focus_on_map to %FALSE hints the desktop environment that the +window doesn't want to receive input focus when it is mapped. +focus_on_map should be turned off for windows that aren't triggered +interactively (such as popups from network activity). + +On X, it is the responsibility of the window manager to interpret +this hint. Window managers following the freedesktop.org window +manager extension specification should respect it. + +Since: 2.6 + + + + + a toplevel #GdkWindow + + + + %TRUE if the window should receive input focus when mapped + + + + + + + + +Gets the current pixbuf which should be displayed; the pixbuf will +be the same size as the animation itself +(gdk_pixbuf_animation_get_width(), gdk_pixbuf_animation_get_height()). +This pixbuf should be displayed for +gdk_pixbuf_animation_iter_get_delay_time() milliseconds. The caller +of this function does not own a reference to the returned pixbuf; +the returned pixbuf will become invalid when the iterator advances +to the next frame, which may happen anytime you call +gdk_pixbuf_animation_iter_advance(). Copy the pixbuf to keep it +(don't just add a reference), as it may get recycled as you advance +the iterator. + + + + + + an animation iterator + + + + the pixbuf to be displayed + + + + + +Test if the pointer is grabbed. + + + + + + a #GdkDisplay + + + + %TRUE if an active X pointer grab is in effect + +Since: 2.2 + + + + + +Starts a drag and creates a new drag context for it. + +This function is called by the drag source. + + + + + + the source window for this drag. + + + + the list of offered targets. + + + + a newly created #GdkDragContext. + + + + + +Gets the root window of @screen. + + + + + + a #GdkScreen + + + + the root window + +Since: 2.2 + + + + + +Creates a new event of the given type. All fields are set to 0. + + + + + + a #GdkEventType + + + + a newly-allocated #GdkEvent. The returned #GdkEvent +should be freed with gdk_event_free(). + +Since: 2.2 + + + + + +Finds out if the #GdkRegion is empty. + + + + + + a #GdkRegion + + + + %TRUE if @region is empty. + + + + + +Checks if any events are ready to be processed for any display. + + + + + + %TRUE if any events are pending. + + + + + +Queries the height of a pixbuf. + + + + + + A pixbuf. + + + + Height in pixels. + + + + + +Get the best visual of the given @visual_type for the default GDK screen. +Visuals with higher color depths are considered better. The return value +should not be freed. %NULL may be returned if no visual has type +@visual_type. + + + + + + a visual type + + + + best visual of the given type + + + + + +Load a #GdkFont based on a Pango font description. This font will +only be an approximation of the Pango font, and +internationalization will not be handled correctly. This function +should only be used for legacy code that cannot be easily converted +to use Pango. Using Pango directly will produce better results. + + + + + + a #PangoFontDescription. + + + + the newly loaded font, or %NULL if the font +cannot be loaded. + + + + + +Internal function to clear the update area for a window. This +is called when the window is hidden or destroyed. + + + + + a #GdkWindow. + + + + + + + + +Obtains a list of keycode/group/level combinations that will +generate @keyval. Groups and levels are two kinds of keyboard mode; +in general, the level determines whether the top or bottom symbol +on a key is used, and the group determines whether the left or +right symbol is used. On US keyboards, the shift key changes the +keyboard level, and there are no groups. A group switch key might +convert a keyboard between Hebrew to English modes, for example. +#GdkEventKey contains a %group field that indicates the active +keyboard group. The level is computed from the modifier mask. +The returned array should be freed +with g_free(). + + + + + + a #GdkKeymap, or %NULL to use the default keymap + + + + a keyval, such as %GDK_a, %GDK_Up, %GDK_Return, etc. + + + + return location for an array of #GdkKeymapKey + + + + return location for number of elements in returned array + + + + %TRUE if keys were found and returned + + + + + +If xcolormap refers to a colormap previously known to GTK+, +Return value: the #GdkColormap object for @xcolormap. + + + + + a #GdkVisual + + + + The XID of a colormap with visual @visual + + + + the #GdkColormap object for @xcolormap. +Free with g_object_unref(). Note that for colormap created +with gdk_x11_colormap_foreign_new(), unref'ing the last +reference to the object will only free the #GdkColoramp +object and not call XFreeColormap() + +Since: 2.2 + + + + + +Sets the given pixbuf as the source pattern for the Cairo context. +The pattern has an extend mode of %CAIRO_EXTEND_NONE and is aligned +so that the origin of @pixbuf is @pixbuf_x, @pixbuf_y + +Since: 2.8 + + + + + a #Cairo context + + + + a #GdkPixbuf + + + + X coordinate of location to place upper left corner of @pixbuf + + + + Y coordinate of location to place upper left corner of @pixbuf + + + + + + + + +This function is broken and useless and you should ignore it. +If using GTK+, use functions such as gtk_window_resize(), gtk_window_set_size_request(), +gtk_window_move(), gtk_window_parse_geometry(), and gtk_window_set_geometry_hints(), +depending on what you're trying to do. + +If using GDK directly, use gdk_window_set_geometry_hints(). + + + + + + a #GdkWindow + + + + ignored field, does not matter + + + + ignored field, does not matter + + + + minimum width hint + + + + minimum height hint + + + + max width hint + + + + max height hint + + + + logical OR of GDK_HINT_POS, GDK_HINT_MIN_SIZE, and/or GDK_HINT_MAX_SIZE + + + + + + + + +Adds the given rectangle to the current path of @cr. + +Since: 2.8 + + + + + a #cairo_t + + + + a #GdkRectangle + + + + + + + + +Creates a new cursor from the set of builtin cursors for the default display. +See gdk_cursor_new_for_display(). + +To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create +a cursor with no pixels in it. + + + + + + cursor to create + + + + a new #GdkCursor + + + + + +Get an iterator for displaying an animation. The iterator provides +the frames that should be displayed at a given time. +It should be freed after use with g_object_unref(). + +@start_time would normally come from g_get_current_time(), and +marks the beginning of animation playback. After creating an +iterator, you should immediately display the pixbuf returned by +gdk_pixbuf_animation_iter_get_pixbuf(). Then, you should install a +timeout (with g_timeout_add()) or by some other mechanism ensure +that you'll update the image after +gdk_pixbuf_animation_iter_get_delay_time() milliseconds. Each time +the image is updated, you should reinstall the timeout with the new, +possibly-changed delay time. + +As a shortcut, if @start_time is %NULL, the result of +g_get_current_time() will be used automatically. + +To update the image (i.e. possibly change the result of +gdk_pixbuf_animation_iter_get_pixbuf() to a new frame of the animation), +call gdk_pixbuf_animation_iter_advance(). + +If you're using #GdkPixbufLoader, in addition to updating the image +after the delay time, you should also update it whenever you +receive the area_updated signal and +gdk_pixbuf_animation_iter_on_currently_loading_frame() returns +%TRUE. In this case, the frame currently being fed into the loader +has received new data, so needs to be refreshed. The delay time for +a frame may also be modified after an area_updated signal, for +example if the delay time for a frame is encoded in the data after +the frame itself. So your timeout should be reinstalled after any +area_updated signal. + +A delay time of -1 is possible, indicating "infinite." + + + + + + a #GdkPixbufAnimation + + + + time when the animation starts playing + + + + an iterator to move over the animation + + + + + +Gets the bitwise OR of the currently active window state flags, +from the #GdkWindowState enumeration. + + + + + + a #GdkWindow + + + + window state bitfield + + + + + +Removes and returns the first event from the event +queue that is not still being filled in. + + + + + + a #GdkDisplay + + + + the event, or %NULL. Ownership is transferred +to the caller. + + + + + +Registers interest in receiving extension events with type codes +between @event_base and &lt;literal&gt;event_base + n_events - 1&lt;/literal&gt;. +The registered events must have the window field in the same place +as core X events (this is not the case for e.g. XKB extension events). + +If an event type is registered, events of this type will go through +global and window-specific filters (see gdk_window_add_filter()). +Unregistered events will only go through global filters. +GDK may register the events of some X extensions on its own. + +This function should only be needed in unusual circumstances, e.g. +when filtering XInput extension events on the root window. + +Since: 2.4 + + + + + a #GdkDisplay + + + + first event type code to register + + + + number of event type codes to register + + + + + + + + +Send an event, like XSendEvent(), but trap errors and check +the result. + + + + + + #GdkDisplay which @window is on + + + + window ID to which to send the event + + + + %TRUE if the event should be propagated if the target window +doesn't handle it. + + + + event mask to match against, or 0 to send it to @window +without regard to event masks. + + + + #XEvent to send + + + + %TRUE if sending the event succeeded. + + + + + +Sets the specified #GdkColor as the source color of @cr. + +Since: 2.8 + + + + + a #cairo_t + + + + a #GdkColor + + + + + + + + +Sets the area of @source1 to the union of the areas of @source1 and +@source2. The resulting area is the set of pixels contained in +either @source1 or @source2. + + + + + a #GdkRegion + + + + a #GdkRegion + + + + + + + + +Return value: a list of #GdkDevice + + + + + a list of #GdkDevice + + + + + +Draws a number of points, using the foreground color and other +attributes of the #GdkGC. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + an array of #GdkPoint structures. + + + + the number of points to be drawn. + + + + + + + + +Return value: the ID of @drawable's X resource. + + + + + a #GdkDrawable. + + + + the ID of @drawable's X resource. + + + + + +Same as gdk_pixbuf_get_from_drawable() but gets the pixbuf from +an image. + + + + + + Destination pixbuf, or %NULL if a new pixbuf should be created. + + + + Source #GdkImage. + + + + A colormap, or %NULL to use the one for @src + + + + Source X coordinate within drawable. + + + + Source Y coordinate within drawable. + + + + Destination X coordinate in pixbuf, or 0 if @dest is NULL. + + + + Destination Y coordinate in pixbuf, or 0 if @dest is NULL. + + + + Width in pixels of region to get. + + + + Height in pixels of region to get. + + + + @dest, newly-created pixbuf if @dest was %NULL, %NULL on error + + + + + +Creates a new #GdkImage with a depth of 1 from the given data. +&lt;warning&gt;&lt;para&gt;THIS FUNCTION IS INCREDIBLY BROKEN. The passed-in data must +be allocated by malloc() (NOT g_malloc()) and will be freed when the +image is freed.&lt;/para&gt;&lt;/warning&gt; + + + + + + the #GdkVisual to use for the image. + + + + the pixel data. + + + + the width of the image in pixels. + + + + the height of the image in pixels. + + + + a new #GdkImage. + + + + + +Return value: a list of #GdkDevice + + + + + a #GdkDisplay + + + + a list of #GdkDevice + +Since: 2.2 + + + + + +Return the best available visual type for the default GDK screen. + + + + + + best visual type + + + + + +Extract the root window relative x/y coordinates from an event. + + + + + + a #GdkEvent + + + + location to put root window x coordinate + + + + location to put root window y coordinate + + + + %TRUE if the event delivered root window coordinates + + + + + +Obtains the top-left corner of the window manager frame in root +window coordinates. + + + + + + a toplevel #GdkWindow + + + + return location for X position of window frame + + + + return location for Y position of window frame + + + + + + + + +Sends one or more expose events to @window. The areas in each +expose event will cover the entire update area for the window (see +gdk_window_invalidate_region() for details). Normally GDK calls +gdk_window_process_all_updates() on your behalf, so there's no +need to call this function unless you want to force expose events +to be delivered immediately and synchronously (vs. the usual +case, where GDK delivers them in an idle handler). Occasionally +this is useful to produce nicer scrolling behavior, for example. + + + + + + a #GdkWindow + + + + whether to also process updates for child windows + + + + + + + + +Gets the tile pixmap for @gc, if any + + + + + + a #GdkGC + + + + the tile set on the GC, or %NULL. The +value is owned by the GC and must not be freed. + + + + + +Gets the current clip region for @gc, if any. + + + + + + a #GdkGC + + + + the clip region for the GC, or %NULL. +(if a clip mask is set, the return will be %NULL) +This value is owned by the GC and must not be freed. + + + + + +Draws an outlined or filled polygon. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkGC. + + + + %TRUE if the polygon should be filled. The polygon is closed +automatically, connecting the last point to the first point if +necessary. + + + + an array of #GdkPoint structures specifying the points making +up the polygon. + + + + the number of points. + + + + + + + + +Like gdk_window_get_children(), but does not copy the list of +children, so the list does not need to be freed. + + + + + + a #GdkWindow + + + + a reference to the list of child windows in @window + + + + + +Scale source buffer by scale_x / scale_y, then composite a given rectangle +of the result into the destination buffer. + + + + + pointer to location to store result + + + + x0 of region of scaled source to store into @dest_buf + + + + y0 of region of scaled source to store into @dest_buf + + + + x1 of region of scaled source to store into @dest_buf + + + + y1 of region of scaled source to store into @dest_buf + + + + rowstride of @dest_buf + + + + number of channels in @dest_buf + + + + whether @dest_buf has alpha + + + + pointer to source pixels + + + + width of source (used for clipping) + + + + height of source (used for clipping) + + + + rowstride of source + + + + number of channels in @src_buf + + + + whether @src_buf has alpha + + + + amount to scale source by in X direction + + + + amount to scale source by in Y direction + + + + type of enumeration + + + + overall alpha factor to multiply source by + + + + + + + + +Sets the icon of @window as a pixmap or window. If using GTK+, investigate +gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list() +and gtk_window_set_icon(). If those don't meet your needs, look at +gdk_window_set_icon_list(). Only if all those are too high-level do you +want to fall back to gdk_window_set_icon(). + + + + + + a toplevel #GdkWindow + + + + a #GdkWindow to use for the icon, or %NULL to unset + + + + a #GdkPixmap to use as the icon, or %NULL to unset + + + + a 1-bit pixmap (#GdkBitmap) to use as mask for @pixmap, or %NULL to have none + + + + + + + + +Equivalent to g_object_get_data(); the #GObject variant should be +used instead. + + + + + + a #GdkDrawable + + + + name the data was stored under + + + + the data stored at @key + + + + + +Emits a short beep on the default display. + + + + + + + + + +Loads a fontset. + +The fontset may be newly loaded or looked up in a cache. +You should make no assumptions about the initial reference count. + + + + + + a comma-separated list of XLFDs describing +the component fonts of the fontset to load. + + + + a #GdkFont, or %NULL if the fontset could not be loaded. + + + + + +Moves the window out of fullscreen mode. If the window was not +fullscreen, does nothing. + +On X11, asks the window manager to move @window out of the fullscreen +state, if the window manager supports this operation. Not all +window managers support this, and some deliberately ignore it or +don't have a concept of "fullscreen"; so you can't rely on the +unfullscreenification actually happening. But it will happen with +most standard window managers, and GDK makes a best effort to get +it to happen. + +Since: 2.2 + + + + + a toplevel #GdkWindow + + + + + + + + +Creates a new pixbuf by parsing XPM data in memory. This data is commonly +the result of including an XPM file into a program's C source. + + + + + + Pointer to inline XPM data. + + + + A newly-created pixbuf with a reference count of 1. + + + + + +Temporarily freezes a window such that it won't receive expose +events. The window will begin receiving expose events again when +gdk_window_thaw_updates() is called. If gdk_window_freeze_updates() +has been called more than once, gdk_window_thaw_updates() must be called +an equal number of times to begin processing exposes. + + + + + a #GdkWindow + + + + + + + + +Return value: the currently active window, or %NULL. + + + + + a #GdkScreen + + + + the currently active window, or %NULL. + +Since: 2.10 + + + + + +Allocates a single color from a colormap. + + + + + + a #GdkColormap. + + + + The color to allocate. On return, the +&lt;structfield&gt;pixel&lt;/structfield&gt; field will be filled in. + + + + %TRUE if the allocation succeeded. + +Deprecated: Use gdk_colormap_alloc_color() instead. + + + + + +Converts from UTF-8 to compound text. + + + + + + a #GdkDisplay + + + + a UTF-8 string + + + + location to store resulting encoding + + + + location to store format of the result + + + + location to store the data of the result + + + + location to store the length of the data +stored in @ctext + + + + %TRUE if the conversion succeeded, otherwise +%FALSE. + +Since: 2.2 + + + + + +Gets any options previously set with gdk_screen_set_font_options(). + + + + + + a #GdkScreen + + + + the current font options, or %NULL if no default +font options have been set. + +Since: 2.10 + + + + + +Gets the preferred colormap for rendering image data on @screen. +Not a very useful function; historically, GDK could only render RGB +image data to one colormap and visual, but in the current version +it can render to any colormap and visual. So there's no need to +call this function. + + + + + + a #GdkScreen. + + + + the preferred colormap + +Since: 2.2 + + + + + +Opens the default display specified by command line arguments or +environment variables, sets it as the default display, and returns +it. gdk_parse_args must have been called first. If the default +display has previously been set, simply returns that. An internal +function that should not be used by applications. + + + + + + the default display, if it could be opened, +otherwise %NULL. + + + + + +Get the visual with the most available colors for the default +GDK screen. The return value should not be freed. + + + + + + best visual + + + + + +Toggles whether a window should appear in a task list or window +list. If a window's semantic type as specified with +gdk_window_set_type_hint() already fully describes the window, this +function should &lt;emphasis&gt;not&lt;/emphasis&gt; be called in addition, +instead you should allow the window to be treated according to +standard policy for its semantic type. + +Since: 2.2 + + + + + a toplevel #GdkWindow + + + + %TRUE to skip the taskbar + + + + + + + + +Gets the width of @screen in millimeters. +Note that on some X servers this value will not be correct. + + + + + + a #GdkScreen + + + + the width of @screen in millimeters. + +Since: 2.2 + + + + + +Gets the current location of the pointer and the current modifier +mask for a given display. + +Since: 2.2 + + + + + a #GdkDisplay + + + + location to store the screen that the +cursor is on, or %NULL. + + + + location to store root window X coordinate of pointer, or %NULL. + + + + location to store root window Y coordinate of pointer, or %NULL. + + + + location to store current modifier mask, or %NULL + + + + + + + + +Sends an X ClientMessage event to a given window (which must be +on the default #GdkDisplay.) +This could be used for communicating between different applications, +though the amount of data is limited to 20 bytes. + + + + + + the #GdkEvent to send, which should be a #GdkEventClient. + + + + the window to send the X ClientMessage event to. + + + + non-zero on success. + + + + + +Sets the cursor theme from which the images for cursor +should be taken. + +If the windowing system supports it, existing cursors created +with gdk_cursor_new(), gdk_cursor_new_for_display() and +gdk_cursor_new_for_name() are updated to reflect the theme +change. Custom cursors constructed with gdk_cursor_new_from_pixmap() +or gdk_cursor_new_from_pixbuf() will have to be handled +by the application (GTK+ applications can learn about +cursor theme changes by listening for change notification +for the corresponding #GtkSetting). + +Since: 2.8 + + + + + a #GdkDisplay + + + + the name of the cursor theme to use, or %NULL to unset +a previously set value + + + + the cursor size to use, or 0 to keep the previous size + + + + + + + + +For toplevel windows, withdraws them, so they will no longer be +known to the window manager; for all windows, unmaps them, so +they won't be displayed. Normally done automatically as +part of gtk_widget_hide(). + + + + + + a #GdkWindow + + + + + + + + +Creates a new #GdkPixbuf with a copy of the information in the specified +@pixbuf. + + + + + + A pixbuf. + + + + A newly-created pixbuf with a reference count of 1, or %NULL if +not enough memory could be allocated. + + + + + +Updates the drag context when the pointer moves or the +set of actions changes. + +This function is called by the drag source. + + + + + + a #GdkDragContext. + + + + the new destination window, obtained by +gdk_drag_find_window(). + + + + the DND protocol in use, obtained by gdk_drag_find_window(). + + + + the x position of the pointer in root coordinates. + + + + the y position of the pointer in root coordinates. + + + + the suggested action. + + + + the possible actions. + + + + the timestamp for this operation. + + + + FIXME + + + + + +Attempt to deiconify (unminimize) @window. On X11 the window manager may +choose to ignore the request to deiconify. When using GTK+, +use gtk_window_deiconify() instead of the #GdkWindow variant. Or better yet, +you probably want to use gtk_window_present(), which raises the window, focuses it, +unminimizes it, and puts it on the current desktop. + + + + + + a toplevel #GdkWindow + + + + + + + + +Gets the maximal size to use for cursors on @display. + +Since: 2.4 + + + + + a #GdkDisplay + + + + the return location for the maximal cursor width + + + + the return location for the maximal cursor height + + + + + + + + +Adds a filter to be called when X ClientMessage events are received. +See gdk_window_add_filter() if you are interested in filtering other +types of events. + +Since: 2.2 + + + + + a #GdkDisplay for which this message filter applies + + + + the type of ClientMessage events to receive. +This will be checked against the @message_type field +of the XClientMessage event struct. + + + + the function to call to process the event. + + + + user data to pass to @func. + + + + + + + + +Return value: the existing #GdkColormap object if it was + + + + + the XID of a colormap for the default screen. + + + + the existing #GdkColormap object if it was +already known to GTK+, otherwise warns and return +%NULL. + + + + + +Like gdk_window_shape_combine_region(), but the shape applies +only to event handling. Mouse events which happen while +the pointer position corresponds to an unset bit in the +mask will be passed on the window below @window. + +An input shape is typically used with RGBA windows. +The alpha channel of the window defines which pixels are +invisible and allows for nicely antialiased borders, +and the input shape controls where the window is +"clickable". + +On the X11 platform, this requires version 1.1 of the +shape extension. + +On the Win32 platform, this functionality is not present and the +function does nothing. + +Since: 2.10 + + + + + a #GdkWindow + + + + region of window to be non-transparent + + + + X position of @shape_region in @window coordinates + + + + Y position of @shape_region in @window coordinates + + + + + + + + +Sets the title of a toplevel window, to be displayed in the titlebar. +If you haven't explicitly set the icon name for the window +(using gdk_window_set_icon_name()), the icon name will be set to +@title as well. @title must be in UTF-8 encoding (as with all +user-readable strings in GDK/GTK+). @title may not be %NULL. + + + + + a toplevel #GdkWindow + + + + title of @window + + + + + + + + +Saves pixbuf in format @type by feeding the produced data to a +callback. Can be used when you want to store the image to something +other than a file, such as an in-memory buffer or a socket. +If @error is set, %FALSE will be returned. Possible errors +include those in the #GDK_PIXBUF_ERROR domain and whatever the save +function generates. + +See gdk_pixbuf_save() for more details. + + + + + + a #GdkPixbuf. + + + + a function that is called to save each block of data that +the save routine generates. + + + + user data to pass to the save function. + + + + name of file format. + + + + return location for error, or %NULL + + + + list of key-value save options + + + + whether an error was set + +Since: 2.4 + + + + + +Gets the screen for which this colormap was created. + + + + + + a #GdkColormap + + + + the screen for which this colormap was created. + +Since: 2.2 + + + + + +Gets the next #GdkEvent to be processed for @display, fetching events from the +windowing system if necessary. + + + + + + a #GdkDisplay + + + + the next #GdkEvent to be processed, or %NULL if no events +are pending. The returned #GdkEvent should be freed with gdk_event_free(). + +Since: 2.2 + + + + + +Obtains the bounding box of the window, including window manager +titlebar/borders if any. The frame position is given in root window +coordinates. To get the position of the window itself (rather than +the frame) in root window coordinates, use gdk_window_get_origin(). + + + + + + a toplevel #GdkWindow + + + + rectangle to fill with bounding box of the window frame + + + + + + + + +Set the fill mode for a graphics context. + + + + + a #GdkGC. + + + + the new fill mode. + + + + + + + + +Gets the name of the display. + + + + + + a #GdkDisplay + + + + a string representing the display name. This string is owned +by GDK and should not be modified or freed. + +Since: 2.2 + + + + + +Gets a "preferred visual" chosen by GdkRGB for rendering image data +on the default screen. In previous versions of GDK, this was the +only visual GdkRGB could use for rendering. In current versions, +it's simply the visual GdkRGB would have chosen as the optimal one +in those previous versions. GdkRGB can now render to drawables with +any visual. + + + + + + The #GdkVisual chosen by GdkRGB. + + + + + +Creates a pixmap and a mask bitmap which are returned in the @pixmap_return +and @mask_return arguments, respectively, and renders a pixbuf and its +corresponding tresholded alpha mask to them. This is merely a convenience +function; applications that need to render pixbufs with dither offsets or to +given drawables should use gdk_draw_pixbuf(), and gdk_pixbuf_render_threshold_alpha(). + +The pixmap that is created uses the #GdkColormap specified by @colormap. +This colormap must match the colormap of the window where the pixmap +will eventually be used or an error will result. + +If the pixbuf does not have an alpha channel, then *@mask_return will be set +to %NULL. + + + + + A pixbuf. + + + + A #GdkColormap + + + + Location to store a pointer to the created pixmap, +or %NULL if the pixmap is not needed. + + + + Location to store a pointer to the created mask, +or %NULL if the mask is not needed. + + + + Threshold value for opacity values. + + + + + + + + +When using GTK+, typically you should use gtk_window_set_startup_id() +instead of this low-level function. + +Since: 2.12 + + + + + + a toplevel #GdkWindow + + + + a string with startup-notification identifier + + + + + + + + +Releases the reference count for the DC +from _gdk_win32_drawable_acquire_dc() + + + + + a Win32 #GdkDrawable implementation + + + + + + + + +Return value: a X atom for a #GdkDisplay + + + + + a #GdkDisplay + + + + a string + + + + a X atom for a #GdkDisplay + +Since: 2.2 + + + + + +Get the system's default visual for @screen. +This is the visual for the root window of the display. +The return value should not be freed. + + + + + + a #GdkScreen. + + + + the system visual + +Since: 2.2 + + + + + +Wraps a native pixmap in a #GdkPixmap. +This may fail if the pixmap has been destroyed. + +For example in the X backend, a native pixmap handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + The #GdkDisplay where @anid is located. + + + + a native pixmap handle. + + + + the newly-created #GdkPixmap wrapper for the +native pixmap or %NULL if the pixmap has been destroyed. + +Since: 2.2 + + + + + +This function is equivalent to g_object_set_data(), +the #GObject variant should be used instead. + + + + + + a #GdkDrawable + + + + name to store the data under + + + + arbitrary data + + + + function to free @data, or %NULL + + + + + + + + +Return value: an Xlib &lt;type&gt;Colormap&lt;/type&gt;. + + + + + a #GdkColormap. + + + + an Xlib &lt;type&gt;Colormap&lt;/type&gt;. + + + + + +Creates a pixmap and a mask bitmap which are returned in the @pixmap_return +and @mask_return arguments, respectively, and renders a pixbuf and its +corresponding thresholded alpha mask to them. This is merely a convenience +function; applications that need to render pixbufs with dither offsets or to +given drawables should use gdk_draw_pixbuf() and gdk_pixbuf_render_threshold_alpha(). + +The pixmap that is created is created for the colormap returned +by gdk_rgb_get_colormap(). You normally will want to instead use +the actual colormap for a widget, and use +gdk_pixbuf_render_pixmap_and_mask_for_colormap(). + +If the pixbuf does not have an alpha channel, then *@mask_return will be set +to %NULL. + + + + + A pixbuf. + + + + Location to store a pointer to the created pixmap, +or %NULL if the pixmap is not needed. + + + + Location to store a pointer to the created mask, +or %NULL if the mask is not needed. + + + + Threshold value for opacity values. + + + + + + + + +Releases any resources allocated internally for the drawable. +This is called when the drawable becomes unusable +(gdk_window_destroy() for a window, or the refcount going to +zero for a pixmap.) + + + + + a Win32 #GdkDrawable implementation + + + + + + + + +Returns: %TRUE if the display supports clipboard persistance. + + + + + a #GdkDisplay + + + + %TRUE if the display supports clipboard persistance. + +Since: 2.6 + + + + + +Checks whether the window has been mapped (with gdk_window_show() or +gdk_window_show_unraised()). + + + + + + a #GdkWindow + + + + %TRUE if the window is mapped + + + + + +Return value: %TRUE if the allocation succeeded. + + + + + a #GdkColormap. + + + + the location to store the color. + + + + %TRUE if the allocation succeeded. + + + + + +Creates a transformation of the source image @src by scaling by +@scale_x and @scale_y then translating by @offset_x and @offset_y, +then composites the rectangle (@dest_x ,@dest_y, @dest_width, +@dest_height) of the resulting image with a checkboard of the +colors @color1 and @color2 and renders it onto the destination +image. + +See gdk_pixbuf_composite_color_simple() for a simpler variant of this +function suitable for many tasks. + + + + + + a #GdkPixbuf + + + + the #GdkPixbuf into which to render the results + + + + the left coordinate for region to render + + + + the top coordinate for region to render + + + + the width of the region to render + + + + the height of the region to render + + + + the offset in the X direction (currently rounded to an integer) + + + + the offset in the Y direction (currently rounded to an integer) + + + + the scale factor in the X direction + + + + the scale factor in the Y direction + + + + the interpolation type for the transformation. + + + + overall alpha for source image (0..255) + + + + the X offset for the checkboard (origin of checkboard is at -@check_x, -@check_y) + + + + the Y offset for the checkboard + + + + the size of checks in the checkboard (must be a power of two) + + + + the color of check at upper left + + + + the color of the other check + + + + + + + + +Converts a wide character string to a multi-byte string. +(The function name comes from an acronym of 'Wide Character String TO +Multi-Byte String'). + + + + + + a wide character string. + + + + the multi-byte string corresponding to @src, or %NULL if the +conversion failed. The returned string should be freed with g_free() when no +longer needed. + + + + + +Gets the default #GdkDisplay. This is a convenience +function for: +&lt;programlisting&gt; +gdk_display_manager_get_default_display (gdk_display_manager_get ()) +&lt;/programlisting&gt; + + + + + + a #GdkDisplay, or %NULL if there is no default +display. + +Since: 2.2 + + + + + +Determines the total height of a given string. +This value is not generally useful, because you cannot +determine how this total height will be drawn in +relation to the baseline. See gdk_text_extents(). + + + + + + a #GdkFont + + + + the text to measure. + + + + the length of the text in bytes. + + + + the height of the string in pixels. + + + + + +Sets the input shape mask of @window to the union of input shape masks +for all children of @window, ignoring the input shape mask of @window +itself. Contrast with gdk_window_merge_child_input_shapes() which includes +the input shape mask of @window in the masks to be merged. + +Since: 2.10 + + + + + a #GdkWindow + + + + + + + + + + + + + a #GdkKeymap or %NULL to use the default keymap + + + +the direction of effective layout of the keymap. + +@Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL if determines the +direction. %PANGO_DIRECTION_NEUTRAL otherwise. + + + + + +Sets the double click time (two clicks within this time interval +count as a double click and result in a #GDK_2BUTTON_PRESS event). +Applications should &lt;emphasis&gt;not&lt;/emphasis&gt; set this, it is a global +user-configured setting. + +Since: 2.2 + + + + + a #GdkDisplay + + + + double click time in milliseconds (thousandths of a second) + + + + + + + + +Creates a new pixbuf loader object that always attempts to parse +image data as if it were an image of mime type @mime_type, instead of +identifying the type automatically. Useful if you want an error if +the image isn't the expected mime type, for loading image formats +that can't be reliably identified by looking at the data, or if +the user manually forces a specific mime type. + +The list of supported mime types depends on what image loaders +are installed, but typically "image/png", "image/jpeg", "image/gif", +"image/tiff" and "image/x-xpixmap" are among the supported mime types. +To obtain the full list of supported mime types, call +gdk_pixbuf_format_get_mime_types() on each of the #GdkPixbufFormat +structs returned by gdk_pixbuf_get_formats(). + + + + + + the mime type to be loaded + + + + return location for an allocated #GError, or %NULL to ignore errors + + + + A newly-created pixbuf loader. +Since: 2.4 + + + + + +Flips a pixbuf horizontally or vertically and returns the +result in a new pixbuf. + + + + + + a #GdkPixbuf + + + + %TRUE to flip horizontally, %FALSE to flip vertically + + + + the new #GdkPixbuf, or %NULL if not enough memory could be +allocated for it. + +Since: 2.6 + + + + + +Waits for a GraphicsExpose or NoExpose event from the X server. +This is used in the #GtkText and #GtkCList widgets in GTK+ to make sure any +GraphicsExpose events are handled before the widget is scrolled. + + + + + + the #GdkWindow to wait for the events for. + + + + a #GdkEventExpose if a GraphicsExpose was received, or %NULL if a +NoExpose event was received. + + + + + +Queries whether a pixbuf has an alpha channel (opacity information). + + + + + + A pixbuf. + + + + %TRUE if it has an alpha channel, %FALSE otherwise. + + + + + +Merges the input shape masks for any child windows into the +input shape mask for @window. i.e. the union of all input masks +for @window and its children will become the new input mask +for @window. See gdk_window_input_shape_combine_mask(). + +This function is distinct from gdk_window_set_child_input_shapes() +because it includes @window's input shape mask in the set of +shapes to be merged. + +Since: 2.10 + + + + + a #GdkWindow + + + + + + + + +Destroys a #GdkRegion. + + + + + a #GdkRegion + + + + + + + + +Obtains a #cairo_surface_t for the given drawable. If a +#cairo_surface_t for the drawable already exists, it will be +referenced, otherwise a new surface will be created. + + + + + + a #GdkDrawable + + + + a newly referenced #cairo_surface_t that points +to @drawable. Unref with cairo_surface_destroy() + + + + + +Copies a #GdkEvent, copying or incrementing the reference count of the +resources associated with it (e.g. #GdkWindow's and strings). + + + + + + a #GdkEvent + + + + a copy of @event. The returned #GdkEvent should be freed with +gdk_event_free(). + + + + + +Determines the distance from the origin to the rightmost +portion of a string when drawn. This is not the +correct value for determining the origin of the next +portion when drawing text in multiple pieces. +See gdk_text_width(). + + + + + + a #GdkFont + + + + the text to measure. + + + + the length of the text in bytes. + + + + the right bearing of the string in pixels. + + + + + +Modifies saturation and optionally pixelates @src, placing the result in +@dest. @src and @dest may be the same pixbuf with no ill effects. If +@saturation is 1.0 then saturation is not changed. If it's less than 1.0, +saturation is reduced (the image turns toward grayscale); if greater than +1.0, saturation is increased (the image gets more vivid colors). If @pixelate +is %TRUE, then pixels are faded in a checkerboard pattern to create a +pixelated image. @src and @dest must have the same image format, size, and +rowstride. + + + + + + source image + + + + place to write modified version of @src + + + + saturation factor + + + + whether to pixelate + + + + + + + + +Shows a #GdkWindow onscreen, but does not modify its stacking +order. In contrast, gdk_window_show() will raise the window +to the top of the window stack. + +On the X11 platform, in Xlib terms, this function calls +XMapWindow() (it also updates some internal GDK state, which means +that you can't really use XMapWindow() directly on a GDK window). + + + + + + a #GdkWindow + + + + + + + + +Computes the region of a drawable that potentially can be written +to by drawing primitives. This region will not take into account +the clip region for the GC, and may also not take into account +other factors such as if the window is obscured by other windows, +but no area outside of this region will be affected by drawing +primitives. + + + + + + a #GdkDrawable + + + + a #GdkRegion. This must be freed with gdk_region_destroy() +when you are done. + + + + + + + + + + a #GdkScreen. + + + + a #GdkWindow + + + + the monitor number in which most of @window is located, +or if @window does not intersect any monitors, a monitor, +close to @window. +the number of the monitor in which the largest area of the +bounding rectangle of @window resides. + +Since: 2.2 + + + + + +Sets the colormap for the GC to the given colormap. The depth +of the colormap's visual must match the depth of the drawable +for which the GC was created. + + + + + a #GdkGC + + + + a #GdkColormap + + + + + + + + +Creates a new cursor from a given pixmap and mask. Both the pixmap and mask +must have a depth of 1 (i.e. each pixel has only 2 values - on or off). +The standard cursor size is 16 by 16 pixels. You can create a bitmap +from inline data as in the below example. + +&lt;example&gt;&lt;title&gt;Creating a custom cursor&lt;/title&gt; +&lt;programlisting&gt; +/&lt;!-- --&gt;* This data is in X bitmap format, and can be created with the 'bitmap' +utility. *&lt;!-- --&gt;/ +&num;define cursor1_width 16 +&num;define cursor1_height 16 +static unsigned char cursor1_bits[] = { +0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20, +0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10, +0x10, 0x08, 0x20, 0x04, 0x40, 0x02, 0x80, 0x01}; + +static unsigned char cursor1mask_bits[] = { +0x80, 0x01, 0xc0, 0x03, 0x60, 0x06, 0x30, 0x0c, 0x18, 0x18, 0x8c, 0x31, +0xc6, 0x63, 0x63, 0xc6, 0x63, 0xc6, 0xc6, 0x63, 0x8c, 0x31, 0x18, 0x18, +0x30, 0x0c, 0x60, 0x06, 0xc0, 0x03, 0x80, 0x01}; + + +GdkCursor *cursor; +GdkPixmap *source, *mask; +GdkColor fg = { 0, 65535, 0, 0 }; /&lt;!-- --&gt;* Red. *&lt;!-- --&gt;/ +GdkColor bg = { 0, 0, 0, 65535 }; /&lt;!-- --&gt;* Blue. *&lt;!-- --&gt;/ + + +source = gdk_bitmap_create_from_data (NULL, cursor1_bits, +cursor1_width, cursor1_height); +mask = gdk_bitmap_create_from_data (NULL, cursor1mask_bits, +cursor1_width, cursor1_height); +cursor = gdk_cursor_new_from_pixmap (source, mask, &amp;fg, &amp;bg, 8, 8); +gdk_pixmap_unref (source); +gdk_pixmap_unref (mask); + + +gdk_window_set_cursor (widget-&gt;window, cursor); +&lt;/programlisting&gt; +&lt;/example&gt; + + + + + + the pixmap specifying the cursor. + + + + the pixmap specifying the mask, which must be the same size as +@source. + + + + the foreground color, used for the bits in the source which are 1. +The color does not have to be allocated first. + + + + the background color, used for the bits in the source which are 0. +The color does not have to be allocated first. + + + + the horizontal offset of the 'hotspot' of the cursor. + + + + the vertical offset of the 'hotspot' of the cursor. + + + + a new #GdkCursor. + + + + + + + + + + the singleton #GdkDisplayManager object. +the global #GdkDisplayManager singleton; gdk_parse_pargs(), +gdk_init(), or gdk_init_check() must have been called first. + +Since: 2.2 + + + + + +Determines how the current pixel values and the +pixel values being drawn are combined to produce +the final pixel values. + + + + + a #GdkGC. + + + + the #GdkFunction to use + + + + + + + + +This gets the origin of a #GdkWindow relative to +an Enlightenment-window-manager desktop. As long as you don't +assume that the user's desktop/workspace covers the entire +root window (i.e. you don't assume that the desktop begins +at root window coordinate 0,0) this function is not necessary. +It's deprecated for that reason. + + + + + + a toplevel #GdkWindow + + + + return location for X coordinate + + + + return location for Y coordinate + + + + not meaningful + + + + + +Accepts or rejects a drop. + +This function is called by the drag destination in response +to a drop initiated by the drag source. + + + + + a #GdkDragContext. + + + + %TRUE if the drop is accepted. + + + + the timestamp for this operation. + + + + + + + + +Attaches a key/value pair as an option to a #GdkPixbuf. If %key already +exists in the list of options attached to @pixbuf, the new value is +ignored and %FALSE is returned. + + + + + + a #GdkPixbuf + + + + a nul-terminated string. + + + + a nul-terminated string. + + + + %TRUE on success. + +Since: 2.2 + + + + + +Sets the geometry hints for @window. Hints flagged in @geom_mask +are set, hints not flagged in @geom_mask are unset. +To unset all hints, use a @geom_mask of 0 and a @geometry of %NULL. + +This function provides hints to the windowing system about +acceptable sizes for a toplevel window. The purpose of +this is to constrain user resizing, but the windowing system +will typically (but is not required to) also constrain the +current size of the window to the provided values and +constrain programatic resizing via gdk_window_resize() or +gdk_window_move_resize(). + +Note that on X11, this effect has no effect on windows +of type %GDK_WINDOW_TEMP or windows where override redirect +has been turned on via gdk_window_set_override_redirect() +since these windows are not resizable by the user. + +Since you can't count on the windowing system doing the +constraints for programmatic resizes, you should generally +call gdk_window_constrain_size() yourself to determine +appropriate sizes. + + + + + + a toplevel #GdkWindow + + + + geometry hints + + + + bitmask indicating fields of @geometry to pay attention to + + + + + + + + +Since: 2.10 + + + + + a #GdkScreen + + + + the resolution in "dots per inch". (Physical inches aren't actually +involved; the terminology is conventional.) + +Sets the resolution for font handling on the screen. This is a +scale factor between points specified in a #PangoFontDescription +and cairo units. The default value is 96, meaning that a 10 point +font will be 13 units high. (10 * 96. / 72. = 13.3). + + + + + + + + +Sets hints about the window management functions to make available +via buttons on the window frame. + +On the X backend, this function sets the traditional Motif window +manager hint for this purpose. However, few window managers do +anything reliable or interesting with this hint. Many ignore it +entirely. + +The @functions argument is the logical OR of values from the +#GdkWMFunction enumeration. If the bitmask includes #GDK_FUNC_ALL, +then the other bits indicate which functions to disable; if +it doesn't include #GDK_FUNC_ALL, it indicates which functions to +enable. + + + + + + a toplevel #GdkWindow + + + + bitmask of operations to allow on @window + + + + + + + + +The ::display_opened signal is emitted when a display is opened. + +Since: 2.2 + + + + + the object on which the signal is emitted + + + + the opened display + + + + + + + + +Convert from a GDK key symbol to the corresponding ISO10646 (Unicode) +character. + + + + + + a GDK key symbol + + + + the corresponding unicode character, or 0 if there +is no corresponding character. + + + + + +Sets the function to call to handle all events from GDK. + +Note that GTK+ uses this to install its own event handler, so it is +usually not useful for GTK+ applications. (Although an application +can call this function then call gtk_main_do_event() to pass +events to GTK+.) + + + + + the function to call to handle events from GDK. + + + + user data to pass to the function. + + + + the function to call when the handler function is removed, i.e. when +gdk_event_handler_set() is called with another event handler. + + + + + + + + +Makes pixels in @window outside @shape_region be transparent, +so that the window may be nonrectangular. See also +gdk_window_shape_combine_mask() to use a bitmap as the mask. + +If @shape_region is %NULL, the shape will be unset, so the whole +window will be opaque again. @offset_x and @offset_y are ignored +if @shape_region is %NULL. + +On the X11 platform, this uses an X server extension which is +widely available on most common platforms, but not available on +very old X servers, and occasionally the implementation will be +buggy. On servers without the shape extension, this function +will do nothing. + +On the Win32 platform, this functionality is always present. + +This function works on both toplevel and child windows. + + + + + + a #GdkWindow + + + + region of window to be non-transparent + + + + X position of @shape_region in @window coordinates + + + + Y position of @shape_region in @window coordinates + + + + + + + + +Looks up the #GdkWindow that wraps the given native window handle. + +For example in the X backend, a native window handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + the #GdkDisplay corresponding to the window handle + + + + a native window handle. + + + + the #GdkWindow wrapper for the native window, +or %NULL if there is none. + +Since: 2.2 + + + + + +Creates a new #GdkPixbuf structure and allocates a buffer for it. The +buffer has an optimal rowstride. Note that the buffer is not cleared; +you will have to fill it completely yourself. + + + + + + Color space for image + + + + Whether the image should have transparency information + + + + Number of bits per color sample + + + + Width of image in pixels, must be &gt; 0 + + + + Height of image in pixels, must be &gt; 0 + + + + A newly-created #GdkPixbuf with a reference count of 1, or +%NULL if not enough memory could be allocated for the image buffer. + + + + + +Possibly advances an animation to a new frame. Chooses the frame based +on the start time passed to gdk_pixbuf_animation_get_iter(). + +@current_time would normally come from g_get_current_time(), and +must be greater than or equal to the time passed to +gdk_pixbuf_animation_get_iter(), and must increase or remain +unchanged each time gdk_pixbuf_animation_iter_get_pixbuf() is +called. That is, you can't go backward in time; animations only +play forward. + +As a shortcut, pass %NULL for the current time and g_get_current_time() +will be invoked on your behalf. So you only need to explicitly pass +@current_time if you're doing something odd like playing the animation +at double speed. + +If this function returns %FALSE, there's no need to update the animation +display, assuming the display had been rendered prior to advancing; +if %TRUE, you need to call gdk_animation_iter_get_pixbuf() and update the +display with the new pixbuf. + + + + + + a #GdkPixbufAnimationIter + + + + current time + + + + %TRUE if the image may need updating + + + + + + +Creates a new #PangoRenderer for @screen. Normally you can use the +results of gdk_pango_renderer_get_default() rather than creating a new +renderer. + + + + + + a #GdkScreen + + + + a newly created #PangoRenderer. Free with g_object_unref(). + +Since: 2.6 + + + + + +Gets the startup notification ID for a display. + + + + + + a #GdkDisplay + + + + the startup notification ID for @display + +Since: 2.12 + + + + + +Gets a colormap to use for creating windows or pixmaps with an +alpha channel. The windowing system on which GTK+ is running +may not support this capability, in which case %NULL will +be returned. Even if a non-%NULL value is returned, its +possible that the window's alpha channel won't be honored +when displaying the window on the screen: in particular, for +X an appropriate windowing manager and compositing manager +must be running to provide appropriate display. + +This functionality is not implemented in the Windows backend. + +For setting an overall opacity for a top-level window, see +gdk_window_set_opacity(). + + + + + + a #GdkScreen. + + + + a colormap to use for windows with an alpha channel +or %NULL if the capability is not available. + +Since: 2.8 + + + + + +Return value: the core pointer device; this is owned by the + + + + + the core pointer device; this is owned by the +display and should not be freed. + + + + + +Finds or creates an atom corresponding to a given string. + +Note that this function is identical to gdk_atom_intern() except +that if a new #GdkAtom is created the string itself is used rather +than a copy. This saves memory, but can only be used if the string +will &lt;emphasis&gt;always&lt;/emphasis&gt; exist. It can be used with statically +allocated strings in the main program, but not with statically +allocated memory in dynamically loaded modules, if you expect to +ever unload the module again (e.g. do not use this function in +GTK+ theme engines). + + + + + + a static string + + + + the atom corresponding to @atom_name + +Since: 2.10 + + + + + +Determine the owner of the given selection. + +Note that the return value may be owned by a different +process if a foreign window was previously created for that +window, but a new foreign window will never be created by this call. + + + + + + a #GdkDisplay. + + + + an atom indentifying a selection. + + + + if there is a selection owner for this window, and it is a +window known to the current process, the #GdkWindow that owns the +selection, otherwise %NULL. + +Since: 2.2 + + + + + +Queries the number of channels of a pixbuf. + + + + + + A pixbuf. + + + + Number of channels. + + + + + +Obtains the motion history for a device; given a starting and +ending timestamp, return all events in the motion history for +the device in the given range of time. Some windowing systems +do not support motion history, in which case, %FALSE will +be returned. (This is not distinguishable from the case where +motion history is supported and no events were found.) + + + + + + a #GdkDevice + + + + the window with respect to which which the event coordinates will be reported + + + + starting timestamp for range of events to return + + + + ending timestamp for the range of events to return + + + + location to store a newly-allocated array of #GdkTimeCoord, or %NULL + + + + location to store the length of @events, or %NULL + + + + %TRUE if the windowing system supports motion history and +at least one event was found. + + + + + +Set the origin when using tiles or stipples with +the GC. The tile or stipple will be aligned such +that the upper left corner of the tile or stipple +will coincide with this point. + + + + + a #GdkGC. + + + + the x-coordinate of the origin. + + + + the y-coordinate of the origin. + + + + + + + + +Asks to iconify (minimize) @window. The window manager may choose +to ignore the request, but normally will honor it. Using +gtk_window_iconify() is preferred, if you have a #GtkWindow widget. + +This function only makes sense when @window is a toplevel window. + + + + + + a toplevel #GdkWindow + + + + + + + + +"Decorations" are the features the window manager adds to a toplevel #GdkWindow. +This function sets the traditional Motif window manager hints that tell the +window manager which decorations you would like your window to have. +Usually you should use gtk_window_set_decorated() on a #GtkWindow instead of +using the GDK function directly. + +The @decorations argument is the logical OR of the fields in +the #GdkWMDecoration enumeration. If #GDK_DECOR_ALL is included in the +mask, the other bits indicate which decorations should be turned off. +If #GDK_DECOR_ALL is not included, then the other bits indicate +which decorations should be turned on. + +Most window managers honor a decorations hint of 0 to disable all decorations, +but very few honor all possible combinations of bits. + + + + + + a toplevel #GdkWindow + + + + decoration hint mask + + + + + + + + +Draws a string of characters in the given font or fontset. + +Deprecated: Use gdk_draw_layout() instead. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkFont. + + + + a #GdkGC. + + + + the x coordinate of the left edge of the text. + + + + the y coordinate of the baseline of the text. + + + + the string of characters to draw. + + + + + + + + +A wrapper for the common usage of gdk_threads_add_idle_full() +assigning the default priority, #G_PRIORITY_DEFAULT_IDLE. + +See gdk_threads_add_idle_full(). + + + + + + function to call + + + + data to pass to @function + + + + the ID (greater than 0) of the event source. + +Since: 2.12 + + + + + +An override redirect window is not under the control of the window manager. +This means it won't have a titlebar, won't be minimizable, etc. - it will +be entirely under the control of the application. The window manager +can't see the override redirect window at all. + +Override redirect should only be used for short-lived temporary +windows, such as popup menus. #GtkMenu uses an override redirect +window in its implementation, for example. + + + + + + a toplevel #GdkWindow + + + + %TRUE if window should be override redirect + + + + + + + + +Queries the rowstride of a pixbuf, which is the number of bytes between the start of a row +and the start of the next row. + + + + + + A pixbuf. + + + + Distance between row starts. + + + + + +Gets a DC with the given drawable selected into +it. + + + + + + a Win32 #GdkDrawable implementation + + + + The DC, on success. Otherwise +%NULL. If this function succeeded +_gdk_win32_drawable_release_dc() must be called +release the DC when you are done using it. + + + + + +Sets @display as the default display. + +Since: 2.2 + + + + + a #GdkDisplayManager + + + + a #GdkDisplay + + + + + + + + +Appends gdk option entries to the passed in option group. This is +not public API and must not be used by applications. + + + + + An option group. + + + + + + + + +Allocates colors from a colormap. This function +is obsolete. See gdk_colormap_alloc_colors(). +For full documentation of the fields, see +the Xlib documentation for &lt;function&gt;XAllocColorCells()&lt;/function&gt;. + + + + + + a #GdkColormap. + + + + if %TRUE, the colors should be allocated +in contiguous color cells. + + + + an array in which to store the plane masks. + + + + the number of planes to allocate. (Or zero, +to indicate that the color allocation should not be planar.) + + + + an array into which to store allocated pixel values. + + + + the number of pixels in each plane to allocate. + + + + %TRUE if the allocation was successful + + + + + +The ::closed signal is emitted when the connection to the windowing +system for @display is closed. + +Since: 2.2 + + + + + the object on which the signal is emitted + + + + %TRUE if the display was closed due to an error + + + + + + + + +Wraps a native window for the default display in a #GdkWindow. +This may fail if the window has been destroyed. + +For example in the X backend, a native window handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + a native window handle. + + + + the newly-created #GdkWindow wrapper for the +native window or %NULL if the window has been destroyed. + + + + + +Allocates a Windows device context handle (HDC) for drawing into +@drawable, and sets it up appropriately according to @usage. + +Each #GdkGC can at one time have only one HDC associated with it. + +The following flags in @mask are handled: + +If %GDK_GC_FOREGROUND is set in @mask, a solid brush of the +foreground color in @gc is selected into the HDC. The text color of +the HDC is also set. If the @drawable has a palette (256-color +mode), the palette is selected and realized. + +If any of the line attribute flags (%GDK_GC_LINE_WIDTH, +%GDK_GC_LINE_STYLE, %GDK_GC_CAP_STYLE and %GDK_GC_JOIN_STYLE) is +set in @mask, a solid pen of the foreground color and appropriate +width and stule is created and selected into the HDC. Note that the +dash properties are not completely implemented. + +If the %GDK_GC_FONT flag is set, the background mix mode is set to +%TRANSPARENT. and the text alignment is set to +%TA_BASELINE|%TA_LEFT. Note that no font gets selected into the HDC +by this function. + +Some things are done regardless of @mask: If the function in @gc is +any other than %GDK_COPY, the raster operation of the HDC is +set. If @gc has a clip mask, the clip region of the HDC is set. + +Note that the fill style, tile, stipple, and tile and stipple +origins in the @gc are ignored by this function. (In general, tiles +and stipples can't be implemented directly on Win32; you need to do +multiple pass drawing and blitting to implement tiles or +stipples. GDK does just that when you call the GDK drawing +functions with a GC that asks for tiles or stipples.) + +When the HDC is no longer used, it should be released by calling +&lt;function&gt;gdk_win32_hdc_release()&lt;/function&gt; with the same +parameters. + +If you modify the HDC by calling &lt;function&gt;SelectObject&lt;/function&gt; +you should undo those modifications before calling +&lt;function&gt;gdk_win32_hdc_release()&lt;/function&gt;. + + + + + + destination #GdkDrawable + + + + #GdkGC to use for drawing on @drawable + + + + mask indicating what properties needs to be set up + + + + The HDC. + + + + + +Return value: a X atom for GDK's default display. + + + + + a string + + + + a X atom for GDK's default display. + + + + + +Clears an entire @window to the background color or background pixmap. + + + + + a #GdkWindow + + + + + + + + +This will cause a pixbuf loader to parse the next @count bytes of +an image. It will return %TRUE if the data was loaded successfully, +and %FALSE if an error occurred. In the latter case, the loader +will be closed, and will not accept further writes. If %FALSE is +returned, @error will be set to an error from the #GDK_PIXBUF_ERROR +or #G_FILE_ERROR domains. + + + + + + A pixbuf loader. + + + + Pointer to image data. + + + + Length of the @buf buffer in bytes. + + + + return location for errors + + + + %TRUE if the write was successful, or %FALSE if the loader +cannot parse the buffer. + + + + + +Creates a Cairo context for drawing to @drawable. + + + + + + a #GdkDrawable + + + + A newly created Cairo context. Free with +cairo_destroy() when you are done drawing. + +Since: 2.8 + + + + + +Windows may have a name used while minimized, distinct from the +name they display in their titlebar. Most of the time this is a bad +idea from a user interface standpoint. But you can set such a name +with this function, if you like. + + + + + + a toplevel #GdkWindow + + + + name of window while iconified (minimized) + + + + + + + + +If there is an event waiting in the event queue of some open +display, returns a copy of it. See gdk_display_peek_event(). + + + + + + a copy of the first #GdkEvent on some event queue, or %NULL if no +events are in any queues. The returned #GdkEvent should be freed with +gdk_event_free(). + + + + + +Creates a new #GdkPixbuf by scaling @src to @dest_width x +@dest_height and compositing the result with a checkboard of colors +@color1 and @color2. + + + + + + a #GdkPixbuf + + + + the width of destination image + + + + the height of destination image + + + + the interpolation type for the transformation. + + + + overall alpha for source image (0..255) + + + + the size of checks in the checkboard (must be a power of two) + + + + the color of check at upper left + + + + the color of the other check + + + + the new #GdkPixbuf, or %NULL if not enough memory could be +allocated for it. + + + + + +Copy the set of values from one graphics context +onto another graphics context. + + + + + the destination graphics context. + + + + the source graphics context. + + + + + + + + +Get the preferred colormap for rendering image data. Not a +very useful function; historically, GDK could only render RGB image +data to one colormap and visual, but in the current version it can +render to any colormap and visual. So there's no need to call this +function. + + + + + + the preferred colormap + + + + + +Return value: the visual of the colormap. + + + + + a #GdkColormap. + + + + the visual of the colormap. + + + + + +Check if the window and all ancestors of the window are +mapped. (This is not necessarily "viewable" in the X sense, since +we only check as far as we have GDK window parents, not to the root +window.) + + + + + + a #GdkWindow + + + + %TRUE if the window is viewable + + + + + +Returns: the heigth of @screen in millimeters. + + + + + a #GdkScreen + + + + the heigth of @screen in millimeters. + +Since: 2.2 + + + + + +Return value: an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + a #GdkGC. + + + + an Xlib &lt;type&gt;Display*&lt;/type&gt;. + + + + + +Creates a transformation of the source image @src by scaling by +@scale_x and @scale_y then translating by @offset_x and @offset_y. +This gives an image in the coordinates of the destination pixbuf. +The rectangle (@dest_x, @dest_y, @dest_width, @dest_height) +is then composited onto the corresponding rectangle of the +original destination image. + +When the destination rectangle contains parts not in the source +image, the data at the edges of the source image is replicated +to infinity. + +&lt;figure id="pixbuf-composite-diagram"&gt; +&lt;title&gt;Compositing of pixbufs&lt;/title&gt; +&lt;graphic fileref="composite.png" format="PNG"/&gt; +&lt;/figure&gt; + + + + + a #GdkPixbuf + + + + the #GdkPixbuf into which to render the results + + + + the left coordinate for region to render + + + + the top coordinate for region to render + + + + the width of the region to render + + + + the height of the region to render + + + + the offset in the X direction (currently rounded to an integer) + + + + the offset in the Y direction (currently rounded to an integer) + + + + the scale factor in the X direction + + + + the scale factor in the Y direction + + + + the interpolation type for the transformation. + + + + overall alpha for source image (0..255) + + + + + + + + +Create a new graphics context with default values. + + + + + + a #GdkDrawable. The created GC must always be used +with drawables of the same depth as this one. + + + + the new graphics context. + + + + + +Flushes any requests queued for the windowing system; this happens automatically +when the main loop blocks waiting for new events, but if your application +is drawing without returning control to the main loop, you may need +to call this function explicitely. A common case where this function +needs to be called is when an application is executing drawing commands +from a thread other than the thread where the main loop is running. + +This is most useful for X11. On windowing systems where requests are +handled synchronously, this function will do nothing. + +Since: 2.4 + + + + + a #GdkDisplay + + + + + + + + +Return value: whether this image format is scalable. + + + + + a #GdkPixbufFormat + + + + whether this image format is scalable. + +Since: 2.6 + + + + + +Obtains a clip region which contains the areas where the given +ranges of text would be drawn. @x_origin and @y_origin are the same +position you would pass to gdk_draw_layout_line(). @index_ranges +should contain ranges of bytes in the layout's text. The clip +region will include space to the left or right of the line (to the +layout bounding box) if you have indexes above or below the indexes +contained inside the line. This is to draw the selection all the way +to the side of the layout. However, the clip region is in line coordinates, +not layout coordinates. + +Note that the regions returned correspond to logical extents of the text +ranges, not ink extents. So the drawn line may in fact touch areas out of +the clip region. The clip region is mainly useful for highlightling parts +of text, such as when text is selected. + + + + + + a #PangoLayoutLine + + + + X pixel where you intend to draw the layout line with this clip + + + + baseline pixel where you intend to draw the layout line with this clip + + + + array of byte indexes into the layout, where even members of array are start indexes and odd elements are end indexes + + + + number of ranges in @index_ranges, i.e. half the size of @index_ranges + + + + a clip region containing the given ranges + + + + + +Adds @region to the update area for @window. The update area is the +region that needs to be redrawn, or "dirty region." The call +gdk_window_process_updates() sends one or more expose events to the +window, which together cover the entire update area. An +application would normally redraw the contents of @window in +response to those expose events. + +GDK will call gdk_window_process_all_updates() on your behalf +whenever your program returns to the main loop and becomes idle, so +normally there's no need to do that manually, you just need to +invalidate regions that you know should be redrawn. + +The @child_func parameter controls whether the region of +each child window that intersects @region will also be invalidated. +Only children for which @child_func returns TRUE will have the area +invalidated. + + + + + a #GdkWindow + + + + a #GdkRegion + + + + function to use to decide if to recurse to a child, +%NULL means never recurse. + + + + data passed to @child_func + + + + + + + + +Determines the width of a nul-terminated string. +(The distance from the origin of the string to the +point where the next string in a sequence of strings +should be drawn) + + + + + + a #GdkFont + + + + the nul-terminated string to measure + + + + the width of the string in pixels. + + + + + +Sets the area of @region to the union of the areas of @region and +@rect. The resulting area is the set of pixels contained in +either @region or @rect. + + + + + a #GdkRegion. + + + + a #GdkRectangle. + + + + + + + + +Rotates a pixbuf by a multiple of 90 degrees, and returns the +result in a new pixbuf. + + + + + + a #GdkPixbuf + + + + the angle to rotate by + + + + the new #GdkPixbuf, or %NULL if not enough memory could be +allocated for it. + +Since: 2.6 + + + + + +Gets the number of screen managed by the @display. + + + + + + a #GdkDisplay + + + + number of screens. + +Since: 2.2 + + + + + +Translates the contents of a #GdkEventKey into a keyval, effective +group, and level. Modifiers that affected the translation and +are thus unavailable for application use are returned in +@consumed_modifiers. See gdk_keyval_get_keys() for an explanation of +groups and levels. The @effective_group is the group that was +actually used for the translation; some keys such as Enter are not +affected by the active keyboard group. The @level is derived from +@state. For convenience, #GdkEventKey already contains the translated +keyval, so this function isn't as useful as you might think. + +&lt;note&gt;&lt;para&gt; +@consumed_modifiers gives modifiers that should be masked out +from @state when comparing this key press to a hot key. For +instance, on a US keyboard, the &lt;literal&gt;plus&lt;/literal&gt; +symbol is shifted, so when comparing a key press to a +&lt;literal&gt;&lt;Control&gt;plus&lt;/literal&gt; accelerator &lt;Shift&gt; should +be masked out. +&lt;/para&gt; +&lt;informalexample&gt;&lt;programlisting&gt; +&sol;* We want to ignore irrelevant modifiers like ScrollLock *&sol; +&num;define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK) +gdk_keymap_translate_keyboard_state (keymap, event-&gt;hardware_keycode, +event-&gt;state, event-&gt;group, +&amp;keyval, NULL, NULL, &amp;consumed); +if (keyval == GDK_PLUS && +(event-&gt;state &amp; ~consumed &amp; ALL_ACCELS_MASK) == GDK_CONTROL_MASK) +&sol;* Control was pressed *&sol; +&lt;/programlisting&gt;&lt;/informalexample&gt; +&lt;para&gt; +An older interpretation @consumed_modifiers was that it contained +all modifiers that might affect the translation of the key; +this allowed accelerators to be stored with irrelevant consumed +modifiers, by doing:&lt;/para&gt; +&lt;informalexample&gt;&lt;programlisting&gt; +&sol;* XXX Don't do this XXX *&sol; +if (keyval == accel_keyval && +(event-&gt;state &amp; ~consumed &amp; ALL_ACCELS_MASK) == (accel_mods &amp; ~consumed)) +&sol;* Accelerator was pressed *&sol; +&lt;/programlisting&gt;&lt;/informalexample&gt; +&lt;para&gt; +However, this did not work if multi-modifier combinations were +used in the keymap, since, for instance, &lt;literal&gt;&lt;Control&gt;&lt;/literal&gt; +would be masked out even if only &lt;literal&gt;&lt;Control&gt;&lt;Alt&gt;&lt;/literal&gt; +was used in the keymap. To support this usage as well as well as +possible, all &lt;emphasis&gt;single modifier&lt;/emphasis&gt; combinations +that could affect the key for any combination of modifiers will +be returned in @consumed_modifiers; multi-modifier combinations +are returned only when actually found in @state. When you store +accelerators, you should always store them with consumed modifiers +removed. Store &lt;literal&gt;&lt;Control&gt;plus&lt;/literal&gt;, +not &lt;literal&gt;&lt;Control&gt;&lt;Shift&gt;plus&lt;/literal&gt;, +&lt;/para&gt;&lt;/note&gt; + + + + + + a #GdkKeymap, or %NULL to use the default + + + + a keycode + + + + a modifier state + + + + active keyboard group + + + + return location for keyval, or %NULL + + + + return location for effective group, or %NULL + + + + return location for level, or %NULL + + + + return location for modifiers that were used to +determine the group or level, or %NULL + + + + %TRUE if there was a keyval bound to the keycode/state/group + + + + + +Creates a new #GdkDragContext. + + + + + + the newly created #GdkDragContext. + + + + + +Draws a number of wide characters using the given font of fontset. +If the font is a 1-byte font, the string is converted into 1-byte +characters (discarding the high bytes) before output. + +Deprecated: Use gdk_draw_layout() instead. + + + + + a #GdkDrawable (a #GdkWindow or a #GdkPixmap). + + + + a #GdkFont. + + + + a #GdkGC. + + + + the x coordinate of the left edge of the text. + + + + the y coordinate of the baseline of the text. + + + + the wide characters to draw. + + + + the number of characters to draw. + + + + + + + + +Copies the @width x @height region of @src at coordinates (@xsrc, +@ysrc) to coordinates (@xdest, @ydest) in @drawable. +@width and/or @height may be given as -1, in which case the entire +@src drawable will be copied. + +Most fields in @gc are not used for this operation, but notably the +clip mask or clip region will be honored. + +The source and destination drawables must have the same visual and +colormap, or errors will result. (On X11, failure to match +visual/colormap results in a BadMatch error from the X server.) +A common cause of this problem is an attempt to draw a bitmap to +a color drawable. The way to draw a bitmap is to set the bitmap as +the stipple on the #GdkGC, set the fill mode to %GDK_STIPPLED, and +then draw the rectangle. + + + + + a #GdkDrawable + + + + a #GdkGC sharing the drawable's visual and colormap + + + + the source #GdkDrawable, which may be the same as @drawable + + + + X position in @src of rectangle to draw + + + + Y position in @src of rectangle to draw + + + + X position in @drawable where the rectangle should be drawn + + + + Y position in @drawable where the rectangle should be drawn + + + + width of rectangle to draw, or -1 for entire @src width + + + + height of rectangle to draw, or -1 for entire @src height + + + + + + + + +Queries the width of a pixbuf. + + + + + + A pixbuf. + + + + Width in pixels. + + + + + +Indicates that the backing store created by the most recent call to +gdk_window_begin_paint_region() should be copied onscreen and +deleted, leaving the next-most-recent backing store or no backing +store at all as the active paint region. See +gdk_window_begin_paint_region() for full details. It is an error to +call this function without a matching +gdk_window_begin_paint_region() first. + + + + + + a #GdkWindow + + + + + + + + +Find the #GdkDisplay corresponding to @display, if any exists. + + + + + + a pointer to an X Display + + + + the #GdkDisplay, if found, otherwise %NULL. + +Since: 2.2 + + + + + +Return value: an Xlib &lt;type&gt;Visual*&lt;/type&gt;. + + + + + a #GdkVisual. + + + + an Xlib &lt;type&gt;Visual*&lt;/type&gt;. + + + + + +This function allows for hooking into the operation +of getting the current location of the pointer on a particular +display. This is only useful for such low-level tools as an +event recorder. Applications should never have any +reason to use this facility. + + + + + + a #GdkDisplay + + + + a table of pointers to functions for getting +quantities related to the current pointer position, +or %NULL to restore the default table. + + + + the previous pointer hook table + +Since: 2.2 + + + + + +Sets various attributes of how lines are drawn. See +the corresponding members of #GdkGCValues for full +explanations of the arguments. + + + + + a #GdkGC. + + + + the width of lines. + + + + the dash-style for lines. + + + + the manner in which the ends of lines are drawn. + + + + the in which lines are joined together. + + + + + + + + +Sets the origin of the clip mask. The coordinates are +interpreted relative to the upper-left corner of +the destination drawable of the current operation. + + + + + a #GdkGC. + + + + the x-coordinate of the origin. + + + + the y-coordinate of the origin. + + + + + + + + +Changes the value of a color that has already +been allocated. If @colormap is not a private +colormap, then the color must have been allocated +using gdk_colormap_alloc_colors() with the +@writeable set to %TRUE. + + + + + + a #GdkColormap. + + + + a #GdkColor, with the color to change +in the &lt;structfield&gt;pixel&lt;/structfield&gt; field, +and the new value in the remaining fields. + + + + %TRUE if the color was successfully changed. + + + + + +Allocates an image of size width/height, up to a maximum +of GDK_SCRATCH_IMAGE_WIDTHxGDK_SCRATCH_IMAGE_HEIGHT that is +suitable to use on @screen. + + + + + + a #GdkScreen + + + + desired width + + + + desired height + + + + depth of image + + + + X location within returned image of scratch image + + + + Y location within returned image of scratch image + + + + a scratch image. This must be used by a +call to gdk_image_put() before any other calls to +_gdk_image_get_scratch() + + + + + +Finds out the DND protocol supported by a window. + + + + + + the X id of the destination window. + + + + location where the supported DND protocol is returned. + + + + the X id of the window where the drop should happen. This +may be @xid or the X id of a proxy window, or None if @xid doesn't +support Drag and Drop. + + + + + +Saves pixbuf to a file in @type, which is currently "jpeg", "png", "tiff", "ico" or "bmp". +If @error is set, %FALSE will be returned. +See gdk_pixbuf_save () for more details. + + + + + + a #GdkPixbuf. + + + + name of file to save. + + + + name of file format. + + + + name of options to set, %NULL-terminated + + + + values for named options + + + + return location for error, or %NULL + + + + whether an error was set + + + + + +Deprecated function; use g_object_ref() instead. + + + + + + a #GdkImage + + + + the image + + + + + +Sets the #GdkWindow @owner as the current owner of the selection @selection. + + + + + + the #GdkDisplay. + + + + a #GdkWindow or %NULL to indicate that the owner for +the given should be unset. + + + + an atom identifying a selection. + + + + timestamp to use when setting the selection. +If this is older than the timestamp given last time the owner was +set for the given selection, the request will be ignored. + + + + if %TRUE, and the new owner is different from the current +owner, the current owner will be sent a SelectionClear event. + + + + %TRUE if the selection owner was successfully changed to owner, +otherwise %FALSE. + +Since: 2.2 + + + + + +Wraps a native window for the default display in a #GdkPixmap. +This may fail if the pixmap has been destroyed. + +For example in the X backend, a native pixmap handle is an Xlib +&lt;type&gt;XID&lt;/type&gt;. + + + + + + a native pixmap handle. + + + + the newly-created #GdkPixmap wrapper for the +native pixmap or %NULL if the pixmap has been destroyed. + + + + + +Serializes a #GdkPixdata structure into a byte stream. +The byte stream consists of a straightforward writeout of the +#GdkPixdata fields in network byte order, plus the @pixel_data +bytes the structure points to. + + + + + + a valid #GdkPixdata structure to serialize. + + + + location to store the resulting stream length in. + + + + A newly-allocated string containing the serialized +#GdkPixdata structure. + + + + + +Return value: an &lt;type&gt;XImage*&lt;/type&gt;. + + + + + a #GdkImage. + + + + an &lt;type&gt;XImage*&lt;/type&gt;. + + + + + +Gets the height of @screen in pixels + + + + + + a #GdkScreen + + + + the height of @screen in pixels. + +Since: 2.2 + + + + + +Obtains the current pointer position and modifier state. +The position is given in coordinates relative to the upper left +corner of @window. + + + + + + a #GdkWindow + + + + return location for X coordinate of pointer or %NULL to not +return the X coordinate + + + + return location for Y coordinate of pointer or %NULL to not +return the Y coordinate + + + + return location for modifier mask or %NULL to not return the +modifier mask + + + + the window containing the pointer (as with +gdk_window_at_pointer()), or %NULL if the window containing the +pointer isn't known to GDK + + + + + +Renders a rectangular portion of a pixbuf to a drawable. The destination +drawable must have a colormap. All windows have a colormap, however, pixmaps +only have colormap by default if they were created with a non-%NULL window argument. +Otherwise a colormap must be set on them with gdk_drawable_set_colormap. + +On older X servers, rendering pixbufs with an alpha channel involves round trips +to the X server, and may be somewhat slow. + +Deprecated: 2.4: This function is obsolete. Use gdk_draw_pixbuf() instead. + + + + + A pixbuf. + + + + Destination drawable. + + + + Source X coordinate within pixbuf. + + + + Source Y coordinates within pixbuf. + + + + Destination X coordinate within drawable. + + + + Destination Y coordinate within drawable. + + + + Width of region to render, in pixels, or -1 to use pixbuf width. + + + + Height of region to render, in pixels, or -1 to use pixbuf height. + + + + Ignored. Present for backwards compatibility. + + + + Ignored. Present for backwards compatibility + + + + Dithering mode for GdkRGB. + + + + X offset for dither. + + + + Y offset for dither. + + + + + + + + +Renders a rectangular portion of a pixbuf to a drawable while using the +specified GC. This is done using GdkRGB, so the specified drawable must have +the GdkRGB visual and colormap. Note that this function will ignore the +opacity information for images with an alpha channel; the GC must already +have the clipping mask set if you want transparent regions to show through. + +For an explanation of dither offsets, see the GdkRGB documentation. In +brief, the dither offset is important when re-rendering partial regions of an +image to a rendered version of the full image, or for when the offsets to a +base position change, as in scrolling. The dither matrix has to be shifted +for consistent visual results. If you do not have any of these cases, the +dither offsets can be both zero. + +Deprecated: 2.4: This function is obsolete. Use gdk_draw_pixbuf() instead. + + + + + A pixbuf. + + + + Destination drawable. + + + + GC used for rendering. + + + + Source X coordinate within pixbuf. + + + + Source Y coordinate within pixbuf. + + + + Destination X coordinate within drawable. + + + + Destination Y coordinate within drawable. + + + + Width of region to render, in pixels, or -1 to use pixbuf width + + + + Height of region to render, in pixels, or -1 to use pixbuf height + + + + Dithering mode for GdkRGB. + + + + X offset for dither. + + + + Y offset for dither. + + + + + + + + +Changes the value of the first @ncolors in a private colormap +to match the values in the &lt;structfield&gt;colors&lt;/structfield&gt; +array in the colormap. This function is obsolete and +should not be used. See gdk_color_change(). + + + + + a #GdkColormap. + + + + the number of colors to change. + + + + + + + + +Adds the given region to the current path of @cr. + +Since: 2.8 + + + + + a #cairo_t + + + + a #GdkRegion + + + + + + + + +Finds the destination window and DND protocol to use at the +given pointer position. + +This function is called by the drag source to obtain the +@dest_window and @protocol parameters for gdk_drag_motion(). + + + + + a #GdkDragContext. + + + + a window which may be at the pointer position, but +should be ignored, since it is put up by the drag source as an icon. + + + + the x position of the pointer in root coordinates. + + + + the y position of the pointer in root coordinates. + + + + location to store the destination window in. + + + + location to store the DND protocol in. + + + + + + + + +This is a low-level function; 99% of text rendering should be done +using gdk_draw_layout() instead. + +A glyph is a single image in a font. This function draws a sequence of +glyphs. To obtain a sequence of glyphs you have to understand a +lot about internationalized text handling, which you don't want to +understand; thus, use gdk_draw_layout() instead of this function, +gdk_draw_layout() handles the details. + + + + + + a #GdkDrawable + + + + a #GdkGC + + + + font to be used + + + + X coordinate of baseline origin + + + + Y coordinate of baseline origin + + + + the glyph string to draw + + + + + + + + +Determines the width of a given string. + + + + + + a #GdkFont + + + + the text to measure. + + + + the length of the text in bytes. + + + + the width of the string in pixels. + + + + + +Sets the colormap associated with @drawable. Normally this will +happen automatically when the drawable is created; you only need to +use this function if the drawable-creating function did not have a +way to determine the colormap, and you then use drawable operations +that require a colormap. The colormap for all drawables and +graphics contexts you intend to use together should match. i.e. +when using a #GdkGC to draw to a drawable, or copying one drawable +to another, the colormaps should match. + + + + + + a #GdkDrawable + + + + a #GdkColormap + + + + + + + + +Updates the state of the drawable (in particular the drawable's +cairo surface) when its size has changed. + + + + + a #GdkDrawableImplX11. + + + + + + + + +Obtains the window underneath the mouse pointer, returning the location +of that window in @win_x, @win_y for @screen. Returns %NULL if the window +under the mouse pointer is not known to GDK (for example, belongs to +another application). + + + + + + a #GdkDisplay + + + + return location for origin of the window under the pointer + + + + return location for origin of the window under the pointer + + + + the window under the mouse pointer, or %NULL + +Since: 2.2 + + + + + +Returns: a #GdkPixbuf representing @cursor, or %NULL + + + + + a #GdkCursor + + + + a #GdkPixbuf representing @cursor, or %NULL + +Since: 2.8 + + + + + +Reparents @window into the given @new_parent. The window being +reparented will be unmapped as a side effect. + + + + + + a #GdkWindow + + + + new parent to move @window into + + + + X location inside the new parent + + + + Y location inside the new parent + + + + + + + + +Sets how drawing with this GC on a window will affect child +windows of that window. + + + + + a #GdkGC. + + + + the subwindow mode. + + + + + + + + +Tests whether a rectangle is within a region. + + + + + + a #GdkRegion. + + + + a #GdkRectangle. + + + + %GDK_OVERLAP_RECTANGLE_IN, %GDK_OVERLAP_RECTANGLE_OUT, or +%GDK_OVERLAP_RECTANGLE_PART, depending on whether the rectangle is inside, +outside, or partly inside the #GdkRegion, respectively. + + + + + +Gets the metrics of a nul-terminated string. + + + + + a #GdkFont. + + + + the nul-terminated string to measure. + + + + the left bearing of the string. + + + + the right bearing of the string. + + + + the width of the string. + + + + the ascent of the string. + + + + the descent of the string. + + + + + + + + +Creates a new #GdkRegion using the polygon defined by a +number of points. + + + + + + an array of #GdkPoint structs + + + + the number of elements in the @points array + + + + specifies which pixels are included in the region when the +polygon overlaps itself. + + + + a new #GdkRegion based on the given polygon + + + + + +Set the bit gravity of the given window to static, and flag it so +all children get static subwindow gravity. This is used if you are +implementing scary features that involve deep knowledge of the +windowing system. Don't worry about it unless you have to. + + + + + + a #GdkWindow + + + + %TRUE to turn on static gravity + + + + %TRUE if the server supports static gravity + + + + + +Return value: a %NULL-terminated array of mime types which must be freed with + + + + + a #GdkPixbufFormat + + + + a %NULL-terminated array of mime types which must be freed with +g_strfreev() when it is no longer needed. + +Since: 2.2 + + + + + +Allocates a single color from a colormap. + + + + + + a #GdkColormap. + + + + the color to allocate. On return the +&lt;structfield&gt;pixel&lt;/structfield&gt; field will be +filled in if allocation succeeds. + + + + If %TRUE, the color is allocated writeable +(their values can later be changed using gdk_color_change()). +Writeable colors cannot be shared between applications. + + + + If %TRUE, GDK will attempt to do matching against +existing colors if the color cannot be allocated as requested. + + + + %TRUE if the allocation succeeded. + + + + + +Sets the default @colormap for @screen. + +Since: 2.2 + + + + + a #GdkScreen + + + + a #GdkColormap + + + + + + + + +Return value: name of the X atom; this string is owned by GDK, + + + + + the #GdkDisplay where @xatom is defined + + + + an X atom + + + + name of the X atom; this string is owned by GDK, +so it shouldn't be modifed or freed. + +Since: 2.2 + + + + + +Gets the metrics of a string. + + + + + a #GdkFont + + + + the text to measure + + + + the length of the text in bytes. (If the +font is a 16-bit font, this is twice the length +of the text in characters.) + + + + the left bearing of the string. + + + + the right bearing of the string. + + + + the width of the string. + + + + the ascent of the string. + + + + the descent of the string. + + + + + + + + +Causes the image to be scaled while it is loaded. The desired +image size can be determined relative to the original size of +the image by calling gdk_pixbuf_loader_set_size() from a +signal handler for the ::size_prepared signal. + +Attempts to set the desired image size are ignored after the +emission of the ::size_prepared signal. + +Since: 2.2 + + + + + A pixbuf loader. + + + + The desired width of the image being loaded. + + + + The desired height of the image being loaded. + + + + + + + + +Adds an event filter to @window, allowing you to intercept events +before they reach GDK. This is a low-level operation and makes it +easy to break GDK and/or GTK+, so you have to know what you're +doing. Pass %NULL for @window to get all events for all windows, +instead of events for a specific window. + +See gdk_display_add_client_message_filter() if you are interested +in X ClientMessage events. + + + + + a #GdkWindow + + + + filter callback + + + + data to pass to filter callback + + + + + + + + +Finds out if the two regions are the same. + + + + + + a #GdkRegion + + + + a #GdkRegion + + + + %TRUE if @region1 and @region2 are equal. + + + + + +Moves the window into fullscreen mode. This means the +window covers the entire screen and is above any panels +or task bars. + +If the window was already fullscreen, then this function does nothing. + +On X11, asks the window manager to put @window in a fullscreen +state, if the window manager supports this operation. Not all +window managers support this, and some deliberately ignore it or +don't have a concept of "fullscreen"; so you can't rely on the +fullscreenification actually happening. But it will happen with +most standard window managers, and GDK makes a best effort to get +it to happen. + +Since: 2.2 + + + + + a toplevel #GdkWindow + + + + + + + + +Parse command line arguments, and store for future +use by calls to gdk_display_open(). + +Any arguments used by GDK are removed from the array and @argc and @argv are +updated accordingly. + +You shouldn't call this function explicitely if you are using +gtk_init(), gtk_init_check(), gdk_init(), or gdk_init_check(). + +Since: 2.2 + + + + + the number of command line arguments. + + + + the array of command line arguments. + + + + + + + + +Request more motion notifies if @event is a motion notify hint event. +This function should be used instead of gdk_window_get_pointer() to +request further motion notifies, because it also works for extension +events where motion notifies are provided for devices other than the +core pointer. Coordinate extraction, processing and requesting more +motion events from a %GDK_MOTION_NOTIFY event usually works like this: + +&lt;informalexample&gt;&lt;programlisting&gt; +{ // motion_event handler +x = motion_event-&gt;x; +y = motion_event-&gt;y; +; // handle (x,y) motion +gdk_event_request_motions (motion_event); // handles is_hint events +} +&lt;/programlisting&gt;&lt;/informalexample&gt; + +Since: 2.12 + + + + + a valid #GdkEvent + + + + + + + + +Allows the application to replace the standard method that +GDK uses to protect its data structures. Normally, GDK +creates a single #GMutex that is locked by gdk_threads_enter(), +and released by gdk_threads_leave(); using this function an +application provides, instead, a function @enter_fn that is +called by gdk_threads_enter() and a function @leave_fn that is +called by gdk_threads_leave(). + +The functions must provide at least same locking functionality +as the default implementation, but can also do extra application +specific processing. + +As an example, consider an application that has its own recursive +lock that when held, holds the GTK+ lock as well. When GTK+ unlocks +the GTK+ lock when entering a recursive main loop, the application +must temporarily release its lock as well. + +Most threaded GTK+ apps won't need to use this method. + +This method must be called before gdk_threads_init(), and cannot +be called multiple times. + +Since: 2.4 + + + + + function called to guard GDK + + + + function called to release the guard + + + + + + + + +Retrieves the colormap for a given image, if it exists. An image +will have a colormap if the drawable from which it was created has +a colormap, or if a colormap was set explicitely with +gdk_image_set_colormap(). + + + + + + a #GdkImage + + + + colormap for the image + + + + + +Queries the #GdkPixbufAnimation that a pixbuf loader is currently creating. +In general it only makes sense to call this function after the "area_prepared" +signal has been emitted by the loader. If the loader doesn't have enough +bytes yet (hasn't emitted the "area_prepared" signal) this function will +return %NULL. + + + + + + A pixbuf loader + + + + The #GdkPixbufAnimation that the loader is loading, or %NULL if + not enough data has been read to determine the information. + + + + + +Loads a font for use on @display. + +The font may be newly loaded or looked up the font in a cache. +You should make no assumptions about the initial reference count. + +Since: 2.2 + + + + + a #GdkDisplay + + + + a XLFD describing the font to load. + + + + a #GdkFont, or %NULL if the font could not be loaded. + + + + + +Lists the available visuals for the specified @screen. +A visual describes a hardware image data format. +For example, a visual might support 24-bit color, or 8-bit color, +and might expect pixels to be in a certain format. + +Call g_list_free() on the return value when you're finished with it. + + + + + + the relevant #GdkScreen. + + + + a list of visuals; the list must be freed, but not its +contents + +Since: 2.2 + + + + + +Subtracts the area of @source2 from the area @source1. The resulting +area is the set of pixels contained in @source1 but not in @source2. + + + + + a #GdkRegion + + + + another #GdkRegion + + + + + + + + +Return value: the name of the window manager screen @screen, or + + + + + a #GdkScreen + + + + the name of the window manager screen @screen, or +"unknown" if the window manager is unknown. The string is owned by GDK +and should not be freed. + +Since: 2.2 + + + + + +Returns: %TRUE if windows may be composited. + + + + + a #GdkDisplay + + + + %TRUE if windows may be composited. + +Since: 2.12 + + + + + +Return value: the selection atom. + + + + + a #GdkDragContext. + + + + the selection atom. + + + + + +Looks up the keyval mapped to a keycode/group/level triplet. +If no keyval is bound to @key, returns 0. For normal user input, +you want to use gdk_keymap_translate_keyboard_state() instead of +this function, since the effective group/level may not be +the same as the current keyboard state. + + + + + + a #GdkKeymap or %NULL to use the default keymap + + + + a #GdkKeymapKey with keycode, group, and level initialized + + + + a keyval, or 0 if none was mapped to the given @key + + + + + +Gets the #GdkVisual describing the pixel format of @drawable. + + + + + + a #GdkDrawable + + + + a #GdkVisual + + + + + +Queries the number of bits per color sample in a pixbuf. + + + + + + A pixbuf. + + + + Number of bits per color sample. + + + + + +Obtains a desktop-wide setting, such as the double-click time, +for the default screen. See gdk_screen_get_setting(). + + + + + + the name of the setting. + + + + location to store the value of the setting. + + + +: %TRUE if the setting existed and a value was stored +in @value, %FALSE otherwise. + + + + + +Creates a new cursor by looking up @name in the current cursor +theme. + + + + + + the #GdkDisplay for which the cursor will be created + + + + the name of the cursor + + + + a new #GdkCursor, or %NULL if there is no cursor with +the given name + +Since: 2.8 + + + + + +Compares two colors. + + + + + + a #GdkColor. + + + + another #GdkColor. + + + + %TRUE if the two colors compare equal + + + + + +Creates a new pixbuf which represents a sub-region of +@src_pixbuf. The new pixbuf shares its pixels with the +original pixbuf, so writing to one affects both. +The new pixbuf holds a reference to @src_pixbuf, so +@src_pixbuf will not be finalized until the new pixbuf +is finalized. + + + + + + a #GdkPixbuf + + + + X coord in @src_pixbuf + + + + Y coord in @src_pixbuf + + + + width of region in @src_pixbuf + + + + height of region in @src_pixbuf + + + + a new pixbuf + + + + + +Scroll the contents of @window, both pixels and children, by the given +amount. @window itself does not move. Portions of the window that the scroll +operation brings in from offscreen areas are invalidated. The invalidated +region may be bigger than what would strictly be necessary. (For X11, a +minimum area will be invalidated if the window has no subwindows, or if the +edges of the window's parent do not extend beyond the edges of the window. In +other cases, a multi-step process is used to scroll the window which may +produce temporary visual artifacts and unnecessary invalidations.) + + + + + a #GdkWindow + + + + Amount to scroll in the X direction + + + + Amount to scroll in the Y direction + + + + + + + + +Return value: the #GdkVisual. + + + + + a X visual id. + + + + the #GdkVisual. + + + + + +Release any pointer grab. + +Since: 2.2 + + + + + a #GdkDisplay. + + + + a timestap (e.g. %GDK_CURRENT_TIME). + + + + + + + + +Return value: a list of #GdkWindow&lt;!-- --&gt;s for the current window stack, + + + + + a #GdkScreen + + + + a list of #GdkWindow&lt;!-- --&gt;s for the current window stack, +or %NULL. + +Since: 2.10 + + + + + +Gets a visual to use for creating windows or pixmaps with an +alpha channel. See the docs for gdk_screen_get_rgba_colormap() +for caveats. + + + + + + a #GdkScreen + + + + a visual to use for windows with an alpha channel +or %NULL if the capability is not available. + +Since: 2.8 + + + + + +Gets the metrics of a string of wide characters. + + + + + a #GdkFont + + + + the text to measure. + + + + the length of the text in character. + + + + the left bearing of the string. + + + + the right bearing of the string. + + + + the width of the string. + + + + the ascent of the string. + + + + the descent of the string. + + + + + + + + +Sets the drawable the renderer draws to. + +Since: 2.6 + + + + + a #GdkPangoRenderer + + + + the new target drawable, or %NULL + + + + + + + + +When using GTK+, typically you should use gtk_window_set_role() instead +of this low-level function. + +The window manager and session manager use a window's role to +distinguish it from other kinds of window in the same application. +When an application is restarted after being saved in a previous +session, all windows with the same title and role are treated as +interchangeable. So if you have two windows with the same title +that should be distinguished for session management purposes, you +should set the role on those windows. It doesn't matter what string +you use for the role, as long as you have a different role for each +non-interchangeable kind of window. + + + + + + a toplevel #GdkWindow + + + + a string indicating its role + + + + + + + + +Generates C source code suitable for compiling images directly +into programs. + +GTK+ ships with a program called &lt;command&gt;gdk-pixbuf-csource&lt;/command&gt; +which offers a command line interface to this function. + + + + + + a #GdkPixdata to convert to C source. + + + + used for naming generated data structures or macros. + + + + a #GdkPixdataDumpType determining the kind of C +source to be generated. + + + + a newly-allocated string containing the C source form +of @pixdata. + + + + + +The ::keys_changed signal is emitted when the mapping represented by +@keymap changes. + +Since: 2.2 + + + + + the object on which the signal is emitted + + + + + + + + +Gets whether event debugging output is enabled. + + + + + + %TRUE if event debugging output is enabled. + + + + + +Merges the shape masks for any child windows into the +shape mask for @window. i.e. the union of all masks +for @window and its children will become the new mask +for @window. See gdk_window_shape_combine_mask(). + +This function is distinct from gdk_window_set_child_shapes() +because it includes @window's shape mask in the set of shapes to +be merged. + + + + + a #GdkWindow + + + + + + + + +Creates a new pixbuf by loading an image from a file. The file format is +detected automatically. If %NULL is returned, then @error will be set. +Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains. +The image will be scaled to fit in the requested size, optionally preserving +the image's aspect ratio. + +When preserving the aspect ratio, a @width of -1 will cause the image +to be scaled to the exact given height, and a @height of -1 will cause +the image to be scaled to the exact given width. When not preserving +aspect ratio, a @width or @height of -1 means to not scale the image +at all in that dimension. Negative values for @width and @height are +allowed since 2.8. + + + + + + Name of file to load, in the GLib file name encoding + + + + The width the image should have or -1 to not constrain the width + + + + The height the image should have or -1 to not constrain the height + + + + %TRUE to preserve the image's aspect ratio + + + + Return location for an error + + + + A newly-created pixbuf with a reference count of 1, or %NULL +if any of several error conditions occurred: the file could not be opened, +there was no loader for the file's format, there was not enough memory to +allocate the image buffer, or the image file contained invalid data. + +Since: 2.6 + + + + + +Obtains the window underneath the mouse pointer, returning the +location of that window in @win_x, @win_y. Returns %NULL if the +window under the mouse pointer is not known to GDK (if the window +belongs to another application and a #GdkWindow hasn't been created +for it with gdk_window_foreign_new()) + +NOTE: For multihead-aware widgets or applications use +gdk_display_get_window_at_pointer() instead. + + + + + + return location for origin of the window under the pointer + + + + return location for origin of the window under the pointer + + + + window under the mouse pointer + + + + + +This function returns the type hint set for a window. + + + + + + A toplevel #GdkWindow + + + + The type hint set for @window + +Since: 2.10 + + + + + +Creates a new colormap for the given visual. + + + + + + a #GdkVisual. + + + + if %TRUE, the newly created colormap will be +a private colormap, and all colors in it will be +allocated for the applications use. + + + + the new #GdkColormap. + + + + + +Gets the resolution for font handling on the screen; see +gdk_screen_set_resolution() for full details. + + + + + + a #GdkScreen + + + + the current resolution, or -1 if no resolution +has been set. + +Since: 2.10 + + + + + +Render a #PangoLayoutLine onto an GDK drawable + +If the layout's #PangoContext has a transformation matrix set, then +@x and @y specify the position of the left edge of the baseline +(left is in before-tranform user coordinates) in after-transform +device coordinates. + + + + + the drawable on which to draw the line + + + + base graphics to use + + + + the x position of start of string (in pixels) + + + + the y position of baseline (in pixels) + + + + a #PangoLayoutLine + + + + + + + + +Modifies a @display_name to make @screen_number the default +screen when the display is opened. + + + + + + The name of a display, in the form used by +gdk_display_open (). If %NULL a default value +will be used. On X11, this is derived from the DISPLAY +environment variable. + + + + The number of a screen within the display +referred to by @display_name. + + + + a newly allocated string holding the resulting +display name. Free with g_free(). + + + + + + + + + + a #GdkDisplay + + + + an X display. +the X display of a #GdkDisplay. + +Since: 2.2 + + + + + +Frees a color structure created with +gdk_color_copy(). + + + + + a #GdkColor. + + + + + + + + +Copies a portion of @drawable into the client side image structure +@image. If @image is %NULL, creates a new image of size @width x @height +and copies into that. See gdk_drawable_get_image() for further details. + + + + + + a #GdkDrawable + + + + a #GdkDrawable, or %NULL if a new @image should be created. + + + + x coordinate on @drawable + + + + y coordinate on @drawable + + + + x coordinate within @image. Must be 0 if @image is %NULL + + + + y coordinate within @image. Must be 0 if @image is %NULL + + + + width of region to get + + + + height or region to get + + + + @image, or a new a #GdkImage containing the contents +of @drawable + +Since: 2.4 + + + + + +Sets the way dashed-lines are drawn. Lines will be +drawn with alternating on and off segments of the +lengths specified in @dash_list. The manner in +which the on and off segments are drawn is determined +by the @line_style value of the GC. (This can +be changed with gdk_gc_set_line_attributes().) + +The @dash_offset defines the phase of the pattern, +specifying how many pixels into the dash-list the pattern +should actually begin. + + + + + a #GdkGC. + + + + the phase of the dash pattern. + + + + an array of dash lengths. + + + + the number of elements in @dash_list. + + + + + + + + +Creates a new pixbuf loader object. + + + + + + A newly-created pixbuf loader. + + + + + +If you load a file with gdk_pixbuf_animation_new_from_file() and it turns +out to be a plain, unanimated image, then this function will return +%TRUE. Use gdk_pixbuf_animation_get_static_image() to retrieve +the image. + + + + + + a #GdkPixbufAnimation + + + + %TRUE if the "animation" was really just an image + + + + + +Thaws a window frozen with gdk_window_freeze_updates(). + + + + + a #GdkWindow + + + + + + + + +Creates a new empty #GdkRegion. + + + + + + a new empty #GdkRegion + + + + + +Obtains a list of all toplevel windows known to GDK on the default +screen (see gdk_screen_get_toplevel_windows()). +A toplevel window is a child of the root window (see +gdk_get_default_root_window()). + +The returned list should be freed with g_list_free(), but +its elements need not be freed. + + + + + + list of toplevel windows, free with g_list_free() + + + + + +Determines the width of a given wide character. (Encoded +in the wide-character encoding of the current locale). + + + + + + a #GdkFont + + + + the character to measure. + + + + the width of the character in pixels. + + + + + +Finds the destination window and DND protocol to use at the +given pointer position. + +This function is called by the drag source to obtain the +@dest_window and @protocol parameters for gdk_drag_motion(). + +Since: 2.2 + + + + + a #GdkDragContext + + + + a window which may be at the pointer position, but +should be ignored, since it is put up by the drag source as an icon. + + + + the screen where the destination window is sought. + + + + the x position of the pointer in root coordinates. + + + + the y position of the pointer in root coordinates. + + + + location to store the destination window in. + + + + location to store the DND protocol in. + + + + + + + + +Parses a textual specification of a color and fill in +the &lt;structfield&gt;red&lt;/structfield&gt;, +&lt;structfield&gt;green&lt;/structfield&gt;, and +&lt;structfield&gt;blue&lt;/structfield&gt; fields of a +#GdkColor structure. The color is &lt;emphasis&gt;not&lt;/emphasis&gt; +allocated, you must call gdk_colormap_alloc_color() yourself. +The text string can be in any of the forms accepted +by &lt;function&gt;XParseColor&lt;/function&gt;; these include +name for a color from &lt;filename&gt;rgb.txt&lt;/filename&gt;, such as +&lt;literal&gt;DarkSlateGray&lt;/literal&gt;, or a hex specification +such as &lt;literal&gt;&num;3050b2&lt;/literal&gt; or &lt;literal&gt;&num;35b&lt;/literal&gt;. + + + + + + the string specifying the color. + + + + the #GdkColor to fill in + + + + %TRUE if the parsing succeeded. + + + + + +Combines gdk_visual_get_best_with_depth() and gdk_visual_get_best_with_type(). + + + + + + a bit depth + + + + a visual type + + + + best visual with both @depth and @visual_type, or %NULL if none + + + + + +Gets the default GTK+ display. + + + + + + the Xlib &lt;type&gt;Display*&lt;/type&gt; for the display +specified in the &lt;option&gt;--display&lt;/option&gt; command line option +or the &lt;envar&gt;DISPLAY&lt;/envar&gt; environment variable. + + + + + +Does initialization of the generic portions of a #GdkGC +created with the specified values and values_mask. This +should be called out of the implementation of +GdkDrawable.create_gc() immediately after creating the +#GdkGC object. + + + + + a #GdkGC + + + + a #GdkDrawable. + + + + a structure containing initial values for the GC. + + + + a bit mask indicating which fields in @values +are set. + + + + + + + + +Gets the width of @screen in pixels + + + + + + a #GdkScreen + + + + the width of @screen in pixels. + +Since: 2.2 + + + + + +A #GdkImage stores client-side image data (pixels). In contrast, +#GdkPixmap and #GdkWindow are server-side +objects. gdk_drawable_get_image() obtains the pixels from a +server-side drawable as a client-side #GdkImage. The format of a +#GdkImage depends on the #GdkVisual of the current display, which +makes manipulating #GdkImage extremely difficult; therefore, in +most cases you should use gdk_pixbuf_get_from_drawable() instead of +this lower-level function. A #GdkPixbuf contains image data in a +canonicalized RGB format, rather than a display-dependent format. +Of course, there's a convenience vs. speed tradeoff here, so you'll +want to think about what makes sense for your application. + +@x, @y, @width, and @height define the region of @drawable to +obtain as an image. + +You would usually copy image data to the client side if you intend +to examine the values of individual pixels, for example to darken +an image or add a red tint. It would be prohibitively slow to +make a round-trip request to the windowing system for each pixel, +so instead you get all of them at once, modify them, then copy +them all back at once. + +If the X server or other windowing system backend is on the local +machine, this function may use shared memory to avoid copying +the image data. + +If the source drawable is a #GdkWindow and partially offscreen +or obscured, then the obscured portions of the returned image +will contain undefined data. + + + + + + a #GdkDrawable + + + + x coordinate on @drawable + + + + y coordinate on @drawable + + + + width of region to get + + + + height or region to get + + + + a #GdkImage containing the contents of @drawable + + + + + +Sets attributes of a graphics context in bulk. For each flag set in +@values_mask, the corresponding field will be read from @values and +set as the new value for @gc. If you're only setting a few values +on @gc, calling individual "setter" functions is likely more +convenient. + + + + + + a #GdkGC + + + + struct containing the new values + + + + mask indicating which struct fields are to be used + + + + + + + + +Sets the shape mask of @window to the union of shape masks +for all children of @window, ignoring the shape mask of @window +itself. Contrast with gdk_window_merge_child_shapes() which includes +the shape mask of @window in the masks to be merged. + + + + + a #GdkWindow + + + + + + + + +Saves pixbuf to a new buffer in format @type, which is currently "jpeg", +"tiff", "png", "ico" or "bmp". See gdk_pixbuf_save_to_buffer() for more details. + + + + + + a #GdkPixbuf. + + + + location to receive a pointer to the new buffer. + + + + location to receive the size of the new buffer. + + + + name of file format. + + + + name of options to set, %NULL-terminated + + + + values for named options + + + + return location for error, or %NULL + + + + whether an error was set + +Since: 2.4 + + + + + +Obtains the smallest rectangle which includes the entire #GdkRegion. + + + + + + a #GdkRegion + + + + return location for the clipbox + + + + + + + + +Return value: the group leader window for @window + + + + + a toplevel #GdkWindow + + + + the group leader window for @window + +Since: 2.4 + + + + + +Gets the default #PangoRenderer for a screen. This default renderer +is shared by all users of the display, so properties such as the color +or transformation matrix set for the renderer may be overwritten +by functions such as gdk_draw_layout(). + +Before using the renderer, you need to call gdk_pango_renderer_set_drawable() +and gdk_pango_renderer_set_gc() to set the drawable and graphics context +to use for drawing. + + + + + + a #GdkScreen + + + + the default #PangoRenderer for @screen. The +renderer is owned by GTK+ and will be kept around until the +screen is closed. + +Since: 2.6 + + + + + +Copies @region, creating an identical new region. + + + + + + a #GdkRegion + + + + a new region identical to @region + + + + + +Like gdk_window_show_unraised(), but also raises the window to the +top of the window stack (moves the window to the front of the +Z-order). + +This function maps a window so it's visible onscreen. Its opposite +is gdk_window_hide(). + +When implementing a #GtkWidget, you should call this function on the widget's +#GdkWindow as part of the "map" method. + + + + + + a #GdkWindow + + + + + + + + +Internal function to destroy a window. Like gdk_window_destroy(), +but does not drop the reference count created by gdk_window_new(). + + + + + a #GdkWindow + + + + If TRUE, the window or a parent was destroyed by some +external agency. The window has already been destroyed and no +windowing system calls should be made. (This may never happen +for some windowing systems.) + + + + + + + + +Constrains a desired width and height according to a +set of geometry hints (such as minimum and maximum size). + + + + + a #GdkGeometry structure + + + + a mask indicating what portions of @geometry are set + + + + desired width of window + + + + desired height of the window + + + + location to store resulting width + + + + location to store resulting height + + + + + + + + +A wrapper for the common usage of gdk_threads_add_timeout_full() +assigning the default priority, #G_PRIORITY_DEFAULT. + +See gdk_threads_add_timeout_full(). + + + + + + the time between calls to the function, in milliseconds +(1/1000ths of a second) + + + + function to call + + + + data to pass to @function + + + + the ID (greater than 0) of the event source. + +Since: 2.12 + + + + + +Find the first event on the queue that is not still +being filled in. + + + + + + a #GdkDisplay + + + + Pointer to the list node for that event, or NULL. + + + + + +Deserializes (reconstruct) a #GdkPixdata structure from a byte stream. +The byte stream consists of a straightforward writeout of the +#GdkPixdata fields in network byte order, plus the @pixel_data +bytes the structure points to. +The @pixdata contents are reconstructed byte by byte and are checked +for validity. This function may fail with %GDK_PIXBUF_CORRUPT_IMAGE +or %GDK_PIXBUF_ERROR_UNKNOWN_TYPE. + + + + + + a #GdkPixdata structure to be filled in. + + + + length of the stream used for deserialization. + + + + stream of bytes containing a serialized #GdkPixdata structure. + + + + #GError location to indicate failures (maybe %NULL to ignore errors). + + + + Upon successful deserialization %TRUE is returned, +%FALSE otherwise. + + + + + +Gets the root window of the default screen +(see gdk_x11_get_default_screen()). + + + + + + an Xlib &lt;type&gt;Window&lt;/type&gt;. + + + + + +Determines the width of a given wide-character string. + + + + + + a #GdkFont + + + + the text to measure. + + + + the length of the text in characters. + + + + the width of the string in pixels. + + + + + +Sends a startup notification message of type @message_type to +@display. + +This is a convenience function for use by code that implements the +freedesktop startup notification specification. Applications should +not normally need to call it directly. See the &lt;ulink +url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt"&gt;Startup +Notification Protocol specification&lt;/ulink&gt; for +definitions of the message types and keys that can be used. + +Since: 2.12 + + + + + a #GdkDisplay + + + + startup notification message type ("new", "change", +or "remove") + + + + a list of key/value pairs (as strings), terminated by a +%NULL key. (A %NULL value for a key will cause that key to be +skipped in the output.) + + + + + + + + +Parses an image file far enough to determine its format and size. + + + + + + The name of the file to identify. + + + + Return location for the width of the image, or %NULL + + + + Return location for the height of the image, or %NULL + + + + A #GdkPixbufFormat describing the image format of the file +or %NULL if the image format wasn't recognized. The return value +is owned by GdkPixbuf and should not be freed. + +Since: 2.4 + + + + + +Set if @window must be kept below other windows. If the +window was already below, then this function does nothing. + +On X11, asks the window manager to keep @window below, if the window +manager supports this operation. Not all window managers support +this, and some deliberately ignore it or don't have a concept of +"keep below"; so you can't rely on the window being kept below. +But it will happen with most standard window managers, +and GDK makes a best effort to get it to happen. + +Since: 2.4 + + + + + a toplevel #GdkWindow + + + + whether to keep @window below other windows + + + + + + + diff --git a/libs/gtkmm2/gdk/src/gdk_docs_override.xml b/libs/gtkmm2/gdk/src/gdk_docs_override.xml new file mode 100644 index 0000000000..2282fd4b45 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_docs_override.xml @@ -0,0 +1,605 @@ + + + + +Asks the &lt;link linkend="gtk-X11-arch"&gt;window manager&lt;/link&gt; to move +@window to the given position. Window managers are free to ignore +this; most window managers ignore requests for initial window +positions (instead using a user-defined placement algorithm) and +honor requests after the window has already been shown. + +Note: the position is the position of the gravity-determined +reference point for the window. The gravity determines two things: +first, the location of the reference point in root window +coordinates; and second, which point on the window is positioned at +the reference point. + +By default the gravity is #GDK_GRAVITY_NORTH_WEST, so the reference +point is simply the @x, @y supplied to Gtk::Window::move(). The +top-left corner of the window decorations (aka window frame or +border) will be placed at @x, @y. Therefore, to position a window +at the top left of the screen, you want to use the default gravity +(which is #GDK_GRAVITY_NORTH_WEST) and move the window to 0,0. + +To position a window at the bottom right corner of the screen, you +would set #GDK_GRAVITY_SOUTH_EAST, which means that the reference +point is at @x + the window width and @y + the window height, and +the bottom-right corner of the window border will be placed at that +reference point. So, to place a window in the bottom right corner +you would first set gravity to south east, then write: +&lt;literal&gt;Gtk::Window::move (window, Gdk::screen_width () - window_width, +Gdk::screen_height () - window_height)&lt;/literal&gt;. + +The extended window manager hints specification at +&lt;ulink url="http://www.freedesktop.org/standards/wm-spec.html"&gt; +http://www.freedesktop.org/standards/wm-spec.html&lt;/ulink&gt; has a +nice table of gravities in the "implementation notes" section. + +The Gtk::Window::get_position() documentation may also be relevant. + + + + + + a #GtkWindow + + + + X coordinate to move window to + + + + Y coordinate to move window to + + + + + + + + + + +List all currently open displays. + +@newin2p2 + + + + a #GdkDisplayManager + + + + a list of #GdkDisplay objects. + + + + + + + +Obtains a list of all toplevel windows known to GDK on the screen @screen. +A toplevel window is a child of the root window (see +gdk_get_default_root_window()). +@newin2p2 + + + + The #GdkScreen where the toplevels are located. + + + + list of toplevel windows. + + + + + + + +Lists the available visuals for the specified @screen. +A visual describes a hardware image data format. +For example, a visual might support 24-bit color, or 8-bit color, +and might expect pixels to be in a certain format. +@newin2p2 + + + + the relevant #GdkScreen. + + + + a list of visuals. + + + + + + +Obtains a list of all toplevel windows known to GDK on the default +screen (see gdk_window_get_toplevels_for_screen()). +A toplevel window is a child of the root window (see +gdk_get_default_root_window()). + + + + + + list of toplevel windows. + + + + + +Thaws a window frozen with Gdk::Window::freeze_updates(). + + + + + a #GdkWindow + + + + + + + + + +Temporarily freezes a window such that it won't receive expose +events. The window will begin receiving expose events again when +Gdk::Window::thaw_updates() is called. If Gdk::Window::freeze_updates() +has been called more than once, Gdk::Window::thaw_updates() must be called +an equal number of times to begin processing exposes. + + + + + a #GdkWindow + + + + + + + + +Gets the current location of the pointer and the current modifier +mask for a given display. + +@newin2p2 + + + + a #GdkDisplay + + + + location to store the screen that the +cursor is on. + + + + location to store root window X coordinate of pointer. + + + + location to store root window Y coordinate of pointer. + + + + location to store current modifier mask. + + + + + + + + +This function allows for hooking into the operation +of getting the current location of the pointer. This +is only useful for such low-level tools as an +event recorder. Applications should never have any +reason to use this facility. + +This function is not multihead safe. For multihead operation, +see gdk_display_set_pointer_hooks(). + + + + + + a table of pointers to functions for getting +quantities related to the current pointer position. + + + + the previous pointer hook table + + + + + +Sets the icon of @window as a pixmap or window. If using GTK+, investigate +gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list() +and gtk_window_set_icon(). If those don't meet your needs, look at +gdk_window_set_icon_list(). Only if all those are too high-level do you +want to fall back to gdk_window_set_icon(). + + + + + + a toplevel #GdkWindow + + + + a #GdkWindow to use for the icon. + + + + a #GdkPixmap to use as the icon, + + + + a 1-bit pixmap (#GdkBitmap) to use as mask for @pixmap. + + + + + + + + +Sets the &lt;literal&gt;SM_CLIENT_ID&lt;/literal&gt; property on the application's leader window so that +the window manager can save the application's state using the X11R6 ICCCM +session management protocol. + +See the X Session Management Library documentation for more information on +session management and the Inter-Client Communication Conventions Manual +(ICCCM) for information on the &lt;literal&gt;WM_CLIENT_LEADER&lt;/literal&gt; property. +(Both documents are part of the X Window System distribution.) + + + + + the client id assigned by the session manager when the +connection was opened. + + + + + + + + +This function allows for hooking into the operation +of getting the current location of the pointer on a particular +display. This is only useful for such low-level tools as an +event recorder. Applications should never have any +reason to use this facility. + +@newin2p2 + + + + a #GdkDisplay + + + + a table of pointers to functions for getting +quantities related to the current pointer position. + + + + the previous pointer hook table + + + + + +Determines the name to pass to gdk_display_open() to get +a #GdkDisplay with this screen as the default screen. + +@newin2p2 + + + + a #GdkScreen + + + + The name. + + + + + +Selects one of the actions offered by the drag source. + +This function is called by the drag destination in response to +gdk_drag_motion() called by the drag source. + + + + + a #GdkDragContext. + + + + the selected action which will be taken when a drop happens, +or 0 to indicate that a drop will not be accepted. + + + + the timestamp for this operation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a #GdkDisplay. + + + + a timestap (e.g. GDK_CURRENT_TIME). + + + + + + + + + a #GdkDisplay. + + + + a timestap (e.g #GDK_CURRENT_TIME). + + + + + + + + + a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no +timestamp is available. + + + + + + + + + a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no +timestamp is available. + + + + + + + + + + + + + + + + + + + + + + + + + dummy parameter, this is a static function but the name +idicates a class, so this one will be stripped not the actual first parameter + + + + a #GdkPixbuf + + + + X coord in @src_pixbuf + + + + Y coord in @src_pixbuf + + + + width of region in @src_pixbuf + + + + height of region in @src_pixbuf + + + + + + + +Sets the mouse pointer for a #GdkWindow. +To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create +a cursor with no pixels in it. + + + + + + +Creates a Cairo context for drawing to @drawable. + + + + A newly created Cairo context. + +Since: 2.10 + + + + + +A #GdkImage stores client-side image data (pixels). In contrast, +#GdkPixmap and #GdkWindow are server-side +objects. gdk_drawable_get_image() obtains the pixels from a +server-side drawable as a client-side #GdkImage. The format of a +#GdkImage depends on the #GdkVisual of the current display, which +makes manipulating #GdkImage extremely difficult; therefore, in +most cases you should use the Gdk::Pixbuf::create() method that takes a Gdk::Drawable, +instead of this lower-level function. A #GdkPixbuf contains image data in a +canonicalized RGB format, rather than a display-dependent format. +Of course, there's a convenience vs. speed tradeoff here, so you'll +want to think about what makes sense for your application. + +@x, @y, @width, and @height define the region of @drawable to +obtain as an image. + +You would usually copy image data to the client side if you intend +to examine the values of individual pixels, for example to darken +an image or add a red tint. It would be prohibitively slow to +make a round-trip request to the windowing system for each pixel, +so instead you get all of them at once, modify them, then copy +them all back at once. + +If the X server or other windowing system backend is on the local +machine, this function may use shared memory to avoid copying +the image data. + +If the source drawable is a #GdkWindow and partially offscreen +or obscured, then the obscured portions of the returned image +will contain undefined data. + + + + + + a #GdkDrawable + + + + x coordinate on @drawable + + + + y coordinate on @drawable + + + + width of region to get + + + + height or region to get + + + + a #GdkImage containing the contents of @drawable + + + + + +Transfers ownership of the update area from @window to the caller +of the function. That is, after calling this function, @window will +no longer have an invalid/dirty region; the update area is removed +from @window and handed to you. If a window has no update area, +get_update_area() returns an invalid Region. + + + + + + a #GdkWindow + + + + the update area for @window + + + + diff --git a/libs/gtkmm2/gdk/src/gdk_enums.defs b/libs/gtkmm2/gdk/src/gdk_enums.defs new file mode 100644 index 0000000000..6ed84bdc78 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_enums.defs @@ -0,0 +1,777 @@ +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkcursor.h + +(define-enum-extended CursorType + (in-module "Gdk") + (c-name "GdkCursorType") + (values + '("x-cursor" "GDK_X_CURSOR" "0") + '("arrow" "GDK_ARROW" "2") + '("based-arrow-down" "GDK_BASED_ARROW_DOWN" "4") + '("based-arrow-up" "GDK_BASED_ARROW_UP" "6") + '("boat" "GDK_BOAT" "8") + '("bogosity" "GDK_BOGOSITY" "10") + '("bottom-left-corner" "GDK_BOTTOM_LEFT_CORNER" "12") + '("bottom-right-corner" "GDK_BOTTOM_RIGHT_CORNER" "14") + '("bottom-side" "GDK_BOTTOM_SIDE" "16") + '("bottom-tee" "GDK_BOTTOM_TEE" "18") + '("box-spiral" "GDK_BOX_SPIRAL" "20") + '("center-ptr" "GDK_CENTER_PTR" "22") + '("circle" "GDK_CIRCLE" "24") + '("clock" "GDK_CLOCK" "26") + '("coffee-mug" "GDK_COFFEE_MUG" "28") + '("cross" "GDK_CROSS" "30") + '("cross-reverse" "GDK_CROSS_REVERSE" "32") + '("crosshair" "GDK_CROSSHAIR" "34") + '("diamond-cross" "GDK_DIAMOND_CROSS" "36") + '("dot" "GDK_DOT" "38") + '("dotbox" "GDK_DOTBOX" "40") + '("double-arrow" "GDK_DOUBLE_ARROW" "42") + '("draft-large" "GDK_DRAFT_LARGE" "44") + '("draft-small" "GDK_DRAFT_SMALL" "46") + '("draped-box" "GDK_DRAPED_BOX" "48") + '("exchange" "GDK_EXCHANGE" "50") + '("fleur" "GDK_FLEUR" "52") + '("gobbler" "GDK_GOBBLER" "54") + '("gumby" "GDK_GUMBY" "56") + '("hand1" "GDK_HAND1" "58") + '("hand2" "GDK_HAND2" "60") + '("heart" "GDK_HEART" "62") + '("icon" "GDK_ICON" "64") + '("iron-cross" "GDK_IRON_CROSS" "66") + '("left-ptr" "GDK_LEFT_PTR" "68") + '("left-side" "GDK_LEFT_SIDE" "70") + '("left-tee" "GDK_LEFT_TEE" "72") + '("leftbutton" "GDK_LEFTBUTTON" "74") + '("ll-angle" "GDK_LL_ANGLE" "76") + '("lr-angle" "GDK_LR_ANGLE" "78") + '("man" "GDK_MAN" "80") + '("middlebutton" "GDK_MIDDLEBUTTON" "82") + '("mouse" "GDK_MOUSE" "84") + '("pencil" "GDK_PENCIL" "86") + '("pirate" "GDK_PIRATE" "88") + '("plus" "GDK_PLUS" "90") + '("question-arrow" "GDK_QUESTION_ARROW" "92") + '("right-ptr" "GDK_RIGHT_PTR" "94") + '("right-side" "GDK_RIGHT_SIDE" "96") + '("right-tee" "GDK_RIGHT_TEE" "98") + '("rightbutton" "GDK_RIGHTBUTTON" "100") + '("rtl-logo" "GDK_RTL_LOGO" "102") + '("sailboat" "GDK_SAILBOAT" "104") + '("sb-down-arrow" "GDK_SB_DOWN_ARROW" "106") + '("sb-h-double-arrow" "GDK_SB_H_DOUBLE_ARROW" "108") + '("sb-left-arrow" "GDK_SB_LEFT_ARROW" "110") + '("sb-right-arrow" "GDK_SB_RIGHT_ARROW" "112") + '("sb-up-arrow" "GDK_SB_UP_ARROW" "114") + '("sb-v-double-arrow" "GDK_SB_V_DOUBLE_ARROW" "116") + '("shuttle" "GDK_SHUTTLE" "118") + '("sizing" "GDK_SIZING" "120") + '("spider" "GDK_SPIDER" "122") + '("spraycan" "GDK_SPRAYCAN" "124") + '("star" "GDK_STAR" "126") + '("target" "GDK_TARGET" "128") + '("tcross" "GDK_TCROSS" "130") + '("top-left-arrow" "GDK_TOP_LEFT_ARROW" "132") + '("top-left-corner" "GDK_TOP_LEFT_CORNER" "134") + '("top-right-corner" "GDK_TOP_RIGHT_CORNER" "136") + '("top-side" "GDK_TOP_SIDE" "138") + '("top-tee" "GDK_TOP_TEE" "140") + '("trek" "GDK_TREK" "142") + '("ul-angle" "GDK_UL_ANGLE" "144") + '("umbrella" "GDK_UMBRELLA" "146") + '("ur-angle" "GDK_UR_ANGLE" "148") + '("watch" "GDK_WATCH" "150") + '("xterm" "GDK_XTERM" "152") + '("last-cursor" "GDK_LAST_CURSOR" "153") + '("cursor-is-pixmap" "GDK_CURSOR_IS_PIXMAP" "-1") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkdnd.h + +(define-flags-extended DragAction + (in-module "Gdk") + (c-name "GdkDragAction") + (values + '("default" "GDK_ACTION_DEFAULT" "1 << 0") + '("copy" "GDK_ACTION_COPY" "1 << 1") + '("move" "GDK_ACTION_MOVE" "1 << 2") + '("link" "GDK_ACTION_LINK" "1 << 3") + '("private" "GDK_ACTION_PRIVATE" "1 << 4") + '("ask" "GDK_ACTION_ASK" "1 << 5") + ) +) + +(define-enum-extended DragProtocol + (in-module "Gdk") + (c-name "GdkDragProtocol") + (values + '("motif" "GDK_DRAG_PROTO_MOTIF" "0") + '("xdnd" "GDK_DRAG_PROTO_XDND" "1") + '("none" "GDK_DRAG_PROTO_NONE" "2") + '("win32-dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES" "3") + '("ole2" "GDK_DRAG_PROTO_OLE2" "4") + '("local" "GDK_DRAG_PROTO_LOCAL" "5") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkevents.h + +(define-enum-extended FilterReturn + (in-module "Gdk") + (c-name "GdkFilterReturn") + (values + '("continue" "GDK_FILTER_CONTINUE" "0") + '("remove" "GDK_FILTER_REMOVE" "1") + ) +) + +(define-enum-extended EventType + (in-module "Gdk") + (c-name "GdkEventType") + (values + '("nothing" "GDK_NOTHING" "-1") + '("delete" "GDK_DELETE" "0") + '("destroy" "GDK_DESTROY" "1") + '("expose" "GDK_EXPOSE" "2") + '("motion-notify" "GDK_MOTION_NOTIFY" "3") + '("button-press" "GDK_BUTTON_PRESS" "4") + '("2button-press" "GDK_2BUTTON_PRESS" "5") + '("3button-press" "GDK_3BUTTON_PRESS" "6") + '("button-release" "GDK_BUTTON_RELEASE" "7") + '("key-press" "GDK_KEY_PRESS" "8") + '("key-release" "GDK_KEY_RELEASE" "9") + '("enter-notify" "GDK_ENTER_NOTIFY" "10") + '("leave-notify" "GDK_LEAVE_NOTIFY" "11") + '("focus-change" "GDK_FOCUS_CHANGE" "12") + '("configure" "GDK_CONFIGURE" "13") + '("map" "GDK_MAP" "14") + '("unmap" "GDK_UNMAP" "15") + '("property-notify" "GDK_PROPERTY_NOTIFY" "16") + '("selection-clear" "GDK_SELECTION_CLEAR" "17") + '("selection-request" "GDK_SELECTION_REQUEST" "18") + '("selection-notify" "GDK_SELECTION_NOTIFY" "19") + '("proximity-in" "GDK_PROXIMITY_IN" "20") + '("proximity-out" "GDK_PROXIMITY_OUT" "21") + '("drag-enter" "GDK_DRAG_ENTER" "22") + '("drag-leave" "GDK_DRAG_LEAVE" "23") + '("drag-motion" "GDK_DRAG_MOTION" "24") + '("drag-status" "GDK_DRAG_STATUS" "25") + '("drop-start" "GDK_DROP_START" "26") + '("drop-finished" "GDK_DROP_FINISHED" "27") + '("client-event" "GDK_CLIENT_EVENT" "28") + '("visibility-notify" "GDK_VISIBILITY_NOTIFY" "29") + '("no-expose" "GDK_NO_EXPOSE" "30") + '("scroll" "GDK_SCROLL" "31") + '("window-state" "GDK_WINDOW_STATE" "32") + '("setting" "GDK_SETTING" "33") + '("owner-change" "GDK_OWNER_CHANGE" "34") + '("grab-broken" "GDK_GRAB_BROKEN" "35") + ) +) + +(define-flags-extended EventMask + (in-module "Gdk") + (c-name "GdkEventMask") + (values + '("exposure-mask" "GDK_EXPOSURE_MASK" "1 << 1") + '("pointer-motion-mask" "GDK_POINTER_MOTION_MASK" "1 << 2") + '("pointer-motion-hint-mask" "GDK_POINTER_MOTION_HINT_MASK" "1 << 3") + '("button-motion-mask" "GDK_BUTTON_MOTION_MASK" "1 << 4") + '("button1-motion-mask" "GDK_BUTTON1_MOTION_MASK" "1 << 5") + '("button2-motion-mask" "GDK_BUTTON2_MOTION_MASK" "1 << 6") + '("button3-motion-mask" "GDK_BUTTON3_MOTION_MASK" "1 << 7") + '("button-press-mask" "GDK_BUTTON_PRESS_MASK" "1 << 8") + '("button-release-mask" "GDK_BUTTON_RELEASE_MASK" "1 << 9") + '("key-press-mask" "GDK_KEY_PRESS_MASK" "1 << 10") + '("key-release-mask" "GDK_KEY_RELEASE_MASK" "1 << 11") + '("enter-notify-mask" "GDK_ENTER_NOTIFY_MASK" "1 << 12") + '("leave-notify-mask" "GDK_LEAVE_NOTIFY_MASK" "1 << 13") + '("focus-change-mask" "GDK_FOCUS_CHANGE_MASK" "1 << 14") + '("structure-mask" "GDK_STRUCTURE_MASK" "1 << 15") + '("property-change-mask" "GDK_PROPERTY_CHANGE_MASK" "1 << 16") + '("visibility-notify-mask" "GDK_VISIBILITY_NOTIFY_MASK" "1 << 17") + '("proximity-in-mask" "GDK_PROXIMITY_IN_MASK" "1 << 18") + '("proximity-out-mask" "GDK_PROXIMITY_OUT_MASK" "1 << 19") + '("substructure-mask" "GDK_SUBSTRUCTURE_MASK" "1 << 20") + '("scroll-mask" "GDK_SCROLL_MASK" "1 << 21") + '("all-events-mask" "GDK_ALL_EVENTS_MASK" "0x3FFFFE") + ) +) + +(define-enum-extended VisibilityState + (in-module "Gdk") + (c-name "GdkVisibilityState") + (values + '("unobscured" "GDK_VISIBILITY_UNOBSCURED" "0") + '("partial" "GDK_VISIBILITY_PARTIAL" "1") + '("fully-obscured" "GDK_VISIBILITY_FULLY_OBSCURED" "2") + ) +) + +(define-enum-extended ScrollDirection + (in-module "Gdk") + (c-name "GdkScrollDirection") + (values + '("up" "GDK_SCROLL_UP" "0") + '("down" "GDK_SCROLL_DOWN" "1") + '("left" "GDK_SCROLL_LEFT" "2") + '("right" "GDK_SCROLL_RIGHT" "3") + ) +) + +(define-enum-extended NotifyType + (in-module "Gdk") + (c-name "GdkNotifyType") + (values + '("ancestor" "GDK_NOTIFY_ANCESTOR" "0") + '("virtual" "GDK_NOTIFY_VIRTUAL" "1") + '("inferior" "GDK_NOTIFY_INFERIOR" "2") + '("nonlinear" "GDK_NOTIFY_NONLINEAR" "3") + '("nonlinear-virtual" "GDK_NOTIFY_NONLINEAR_VIRTUAL" "4") + '("unknown" "GDK_NOTIFY_UNKNOWN" "5") + ) +) + +(define-enum-extended CrossingMode + (in-module "Gdk") + (c-name "GdkCrossingMode") + (values + '("normal" "GDK_CROSSING_NORMAL" "0") + '("grab" "GDK_CROSSING_GRAB" "1") + '("ungrab" "GDK_CROSSING_UNGRAB" "2") + ) +) + +(define-enum-extended PropertyState + (in-module "Gdk") + (c-name "GdkPropertyState") + (values + '("new-value" "GDK_PROPERTY_NEW_VALUE" "0") + '("delete" "GDK_PROPERTY_DELETE" "1") + ) +) + +(define-flags-extended WindowState + (in-module "Gdk") + (c-name "GdkWindowState") + (values + '("withdrawn" "GDK_WINDOW_STATE_WITHDRAWN" "1 << 0") + '("iconified" "GDK_WINDOW_STATE_ICONIFIED" "1 << 1") + '("maximized" "GDK_WINDOW_STATE_MAXIMIZED" "1 << 2") + '("sticky" "GDK_WINDOW_STATE_STICKY" "1 << 3") + '("fullscreen" "GDK_WINDOW_STATE_FULLSCREEN" "1 << 4") + '("above" "GDK_WINDOW_STATE_ABOVE" "1 << 5") + '("below" "GDK_WINDOW_STATE_BELOW" "1 << 6") + ) +) + +(define-enum-extended SettingAction + (in-module "Gdk") + (c-name "GdkSettingAction") + (values + '("new" "GDK_SETTING_ACTION_NEW" "0") + '("changed" "GDK_SETTING_ACTION_CHANGED" "1") + '("deleted" "GDK_SETTING_ACTION_DELETED" "2") + ) +) + +(define-enum-extended OwnerChange + (in-module "Gdk") + (c-name "GdkOwnerChange") + (values + '("new-owner" "GDK_OWNER_CHANGE_NEW_OWNER" "0") + '("destroy" "GDK_OWNER_CHANGE_DESTROY" "1") + '("close" "GDK_OWNER_CHANGE_CLOSE" "2") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkfont.h + +(define-enum-extended FontType + (in-module "Gdk") + (c-name "GdkFontType") + (values + '("font" "GDK_FONT_FONT" "0") + '("fontset" "GDK_FONT_FONTSET" "1") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkgc.h + +(define-enum-extended CapStyle + (in-module "Gdk") + (c-name "GdkCapStyle") + (values + '("not-last" "GDK_CAP_NOT_LAST" "0") + '("butt" "GDK_CAP_BUTT" "1") + '("round" "GDK_CAP_ROUND" "2") + '("projecting" "GDK_CAP_PROJECTING" "3") + ) +) + +(define-enum-extended Fill + (in-module "Gdk") + (c-name "GdkFill") + (values + '("solid" "GDK_SOLID" "0") + '("tiled" "GDK_TILED" "1") + '("stippled" "GDK_STIPPLED" "2") + '("opaque-stippled" "GDK_OPAQUE_STIPPLED" "3") + ) +) + +(define-enum-extended Function + (in-module "Gdk") + (c-name "GdkFunction") + (values + '("copy" "GDK_COPY" "0") + '("invert" "GDK_INVERT" "1") + '("xor" "GDK_XOR" "2") + '("clear" "GDK_CLEAR" "3") + '("and" "GDK_AND" "4") + '("and-reverse" "GDK_AND_REVERSE" "5") + '("and-invert" "GDK_AND_INVERT" "6") + '("noop" "GDK_NOOP" "7") + '("or" "GDK_OR" "8") + '("equiv" "GDK_EQUIV" "9") + '("or-reverse" "GDK_OR_REVERSE" "10") + '("copy-invert" "GDK_COPY_INVERT" "11") + '("or-invert" "GDK_OR_INVERT" "12") + '("nand" "GDK_NAND" "13") + '("nor" "GDK_NOR" "14") + '("set" "GDK_SET" "15") + ) +) + +(define-enum-extended JoinStyle + (in-module "Gdk") + (c-name "GdkJoinStyle") + (values + '("miter" "GDK_JOIN_MITER" "0") + '("round" "GDK_JOIN_ROUND" "1") + '("bevel" "GDK_JOIN_BEVEL" "2") + ) +) + +(define-enum-extended LineStyle + (in-module "Gdk") + (c-name "GdkLineStyle") + (values + '("solid" "GDK_LINE_SOLID" "0") + '("on-off-dash" "GDK_LINE_ON_OFF_DASH" "1") + '("double-dash" "GDK_LINE_DOUBLE_DASH" "2") + ) +) + +(define-enum-extended SubwindowMode + (in-module "Gdk") + (c-name "GdkSubwindowMode") + (values + '("clip-by-children" "GDK_CLIP_BY_CHILDREN" "0") + '("include-inferiors" "GDK_INCLUDE_INFERIORS" "1") + ) +) + +(define-flags-extended GCValuesMask + (in-module "Gdk") + (c-name "GdkGCValuesMask") + (values + '("foreground" "GDK_GC_FOREGROUND" "1 << 0") + '("background" "GDK_GC_BACKGROUND" "1 << 1") + '("font" "GDK_GC_FONT" "1 << 2") + '("function" "GDK_GC_FUNCTION" "1 << 3") + '("fill" "GDK_GC_FILL" "1 << 4") + '("tile" "GDK_GC_TILE" "1 << 5") + '("stipple" "GDK_GC_STIPPLE" "1 << 6") + '("clip-mask" "GDK_GC_CLIP_MASK" "1 << 7") + '("subwindow" "GDK_GC_SUBWINDOW" "1 << 8") + '("ts-x-origin" "GDK_GC_TS_X_ORIGIN" "1 << 9") + '("ts-y-origin" "GDK_GC_TS_Y_ORIGIN" "1 << 10") + '("clip-x-origin" "GDK_GC_CLIP_X_ORIGIN" "1 << 11") + '("clip-y-origin" "GDK_GC_CLIP_Y_ORIGIN" "1 << 12") + '("exposures" "GDK_GC_EXPOSURES" "1 << 13") + '("line-width" "GDK_GC_LINE_WIDTH" "1 << 14") + '("line-style" "GDK_GC_LINE_STYLE" "1 << 15") + '("cap-style" "GDK_GC_CAP_STYLE" "1 << 16") + '("join-style" "GDK_GC_JOIN_STYLE" "1 << 17") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkimage.h + +(define-enum-extended ImageType + (in-module "Gdk") + (c-name "GdkImageType") + (values + '("normal" "GDK_IMAGE_NORMAL" "0") + '("shared" "GDK_IMAGE_SHARED" "1") + '("fastest" "GDK_IMAGE_FASTEST" "2") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkinput.h + +(define-enum-extended ExtensionMode + (in-module "Gdk") + (c-name "GdkExtensionMode") + (values + '("none" "GDK_EXTENSION_EVENTS_NONE" "0") + '("all" "GDK_EXTENSION_EVENTS_ALL" "1") + '("cursor" "GDK_EXTENSION_EVENTS_CURSOR" "2") + ) +) + +(define-enum-extended InputSource + (in-module "Gdk") + (c-name "GdkInputSource") + (values + '("mouse" "GDK_SOURCE_MOUSE" "0") + '("pen" "GDK_SOURCE_PEN" "1") + '("eraser" "GDK_SOURCE_ERASER" "2") + '("cursor" "GDK_SOURCE_CURSOR" "3") + ) +) + +(define-enum-extended InputMode + (in-module "Gdk") + (c-name "GdkInputMode") + (values + '("disabled" "GDK_MODE_DISABLED" "0") + '("screen" "GDK_MODE_SCREEN" "1") + '("window" "GDK_MODE_WINDOW" "2") + ) +) + +(define-enum-extended AxisUse + (in-module "Gdk") + (c-name "GdkAxisUse") + (values + '("ignore" "GDK_AXIS_IGNORE" "0") + '("x" "GDK_AXIS_X" "1") + '("y" "GDK_AXIS_Y" "2") + '("pressure" "GDK_AXIS_PRESSURE" "3") + '("xtilt" "GDK_AXIS_XTILT" "4") + '("ytilt" "GDK_AXIS_YTILT" "5") + '("wheel" "GDK_AXIS_WHEEL" "6") + '("last" "GDK_AXIS_LAST" "7") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkinternals.h + +(define-flags-extended ColorInfoFlags + (in-module "Gdk") + (c-name "GdkColorInfoFlags") + (values + '("e" "GDK_COLOR_WRITEABLE" "1 << 0") + ) +) + +(define-flags-extended DebugFlag + (in-module "Gdk") + (c-name "GdkDebugFlag") + (values + '("misc" "GDK_DEBUG_MISC" "1 << 0") + '("events" "GDK_DEBUG_EVENTS" "1 << 1") + '("dnd" "GDK_DEBUG_DND" "1 << 2") + '("xim" "GDK_DEBUG_XIM" "1 << 3") + '("nograbs" "GDK_DEBUG_NOGRABS" "1 << 4") + '("colormap" "GDK_DEBUG_COLORMAP" "1 << 5") + '("gdkrgb" "GDK_DEBUG_GDKRGB" "1 << 6") + '("gc" "GDK_DEBUG_GC" "1 << 7") + '("pixmap" "GDK_DEBUG_PIXMAP" "1 << 8") + '("image" "GDK_DEBUG_IMAGE" "1 << 9") + '("input" "GDK_DEBUG_INPUT" "1 <<10") + '("cursor" "GDK_DEBUG_CURSOR" "1 <<11") + '("multihead" "GDK_DEBUG_MULTIHEAD" "1 <<12") + '("xinerama" "GDK_DEBUG_XINERAMA" "1 <<13") + '("draw" "GDK_DEBUG_DRAW" "1 <<14") + ) +) + +(define-enum-extended ArgType + (in-module "Gdk") + (c-name "GdkArgType") + (values + '("string" "GDK_ARG_STRING" "0") + '("int" "GDK_ARG_INT" "1") + '("bool" "GDK_ARG_BOOL" "2") + '("nobool" "GDK_ARG_NOBOOL" "3") + '("callback" "GDK_ARG_CALLBACK" "4") + ) +) + +(define-flags-extended EventFlags + (in-module "Gdk") + (c-name "GdkEventFlags") + (values + '("g" "GDK_EVENT_PENDING" "1 << 0") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkproperty.h + +(define-enum-extended PropMode + (in-module "Gdk") + (c-name "GdkPropMode") + (values + '("replace" "GDK_PROP_MODE_REPLACE" "0") + '("prepend" "GDK_PROP_MODE_PREPEND" "1") + '("append" "GDK_PROP_MODE_APPEND" "2") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkregion.h + +(define-enum-extended FillRule + (in-module "Gdk") + (c-name "GdkFillRule") + (values + '("even-odd-rule" "GDK_EVEN_ODD_RULE" "0") + '("winding-rule" "GDK_WINDING_RULE" "1") + ) +) + +(define-enum-extended OverlapType + (in-module "Gdk") + (c-name "GdkOverlapType") + (values + '("in" "GDK_OVERLAP_RECTANGLE_IN" "0") + '("out" "GDK_OVERLAP_RECTANGLE_OUT" "1") + '("part" "GDK_OVERLAP_RECTANGLE_PART" "2") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkrgb.h + +(define-enum-extended RgbDither + (in-module "Gdk") + (c-name "GdkRgbDither") + (values + '("none" "GDK_RGB_DITHER_NONE" "0") + '("normal" "GDK_RGB_DITHER_NORMAL" "1") + '("max" "GDK_RGB_DITHER_MAX" "2") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdktypes.h + +(define-enum-extended ByteOrder + (in-module "Gdk") + (c-name "GdkByteOrder") + (values + '("lsb-first" "GDK_LSB_FIRST" "0") + '("msb-first" "GDK_MSB_FIRST" "1") + ) +) + +(define-flags-extended ModifierType + (in-module "Gdk") + (c-name "GdkModifierType") + (values + '("shift-mask" "GDK_SHIFT_MASK" "1 << 0") + '("lock-mask" "GDK_LOCK_MASK" "1 << 1") + '("control-mask" "GDK_CONTROL_MASK" "1 << 2") + '("mod1-mask" "GDK_MOD1_MASK" "1 << 3") + '("mod2-mask" "GDK_MOD2_MASK" "1 << 4") + '("mod3-mask" "GDK_MOD3_MASK" "1 << 5") + '("mod4-mask" "GDK_MOD4_MASK" "1 << 6") + '("mod5-mask" "GDK_MOD5_MASK" "1 << 7") + '("button1-mask" "GDK_BUTTON1_MASK" "1 << 8") + '("button2-mask" "GDK_BUTTON2_MASK" "1 << 9") + '("button3-mask" "GDK_BUTTON3_MASK" "1 << 10") + '("button4-mask" "GDK_BUTTON4_MASK" "1 << 11") + '("button5-mask" "GDK_BUTTON5_MASK" "1 << 12") + '("super-mask" "GDK_SUPER_MASK" "1 << 26") + '("hyper-mask" "GDK_HYPER_MASK" "1 << 27") + '("meta-mask" "GDK_META_MASK" "1 << 28") + '("release-mask" "GDK_RELEASE_MASK" "1 << 30") + '("modifier-mask" "GDK_MODIFIER_MASK" "0x5c001fff") + ) +) + +(define-flags-extended InputCondition + (in-module "Gdk") + (c-name "GdkInputCondition") + (values + '("read" "GDK_INPUT_READ" "1 << 0") + '("write" "GDK_INPUT_WRITE" "1 << 1") + '("exception" "GDK_INPUT_EXCEPTION" "1 << 2") + ) +) + +(define-enum-extended Status + (in-module "Gdk") + (c-name "GdkStatus") + (values + '("ok" "GDK_OK" "0") + '("error" "GDK_ERROR" "-1") + '("error-param" "GDK_ERROR_PARAM" "-2") + '("error-file" "GDK_ERROR_FILE" "-3") + '("error-mem" "GDK_ERROR_MEM" "-4") + ) +) + +(define-enum-extended GrabStatus + (in-module "Gdk") + (c-name "GdkGrabStatus") + (values + '("success" "GDK_GRAB_SUCCESS" "0") + '("already-grabbed" "GDK_GRAB_ALREADY_GRABBED" "1") + '("invalid-time" "GDK_GRAB_INVALID_TIME" "2") + '("not-viewable" "GDK_GRAB_NOT_VIEWABLE" "3") + '("frozen" "GDK_GRAB_FROZEN" "4") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkvisual.h + +(define-enum-extended VisualType + (in-module "Gdk") + (c-name "GdkVisualType") + (values + '("static-gray" "GDK_VISUAL_STATIC_GRAY" "0") + '("grayscale" "GDK_VISUAL_GRAYSCALE" "1") + '("static-color" "GDK_VISUAL_STATIC_COLOR" "2") + '("pseudo-color" "GDK_VISUAL_PSEUDO_COLOR" "3") + '("true-color" "GDK_VISUAL_TRUE_COLOR" "4") + '("direct-color" "GDK_VISUAL_DIRECT_COLOR" "5") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk/gdkwindow.h + +(define-enum-extended WindowClass + (in-module "Gdk") + (c-name "GdkWindowClass") + (values + '("output" "GDK_INPUT_OUTPUT" "0") + '("only" "GDK_INPUT_ONLY" "1") + ) +) + +(define-enum-extended WindowType + (in-module "Gdk") + (c-name "GdkWindowType") + (values + '("root" "GDK_WINDOW_ROOT" "0") + '("toplevel" "GDK_WINDOW_TOPLEVEL" "1") + '("child" "GDK_WINDOW_CHILD" "2") + '("dialog" "GDK_WINDOW_DIALOG" "3") + '("temp" "GDK_WINDOW_TEMP" "4") + '("foreign" "GDK_WINDOW_FOREIGN" "5") + ) +) + +(define-flags-extended WindowAttributesType + (in-module "Gdk") + (c-name "GdkWindowAttributesType") + (values + '("title" "GDK_WA_TITLE" "1 << 1") + '("x" "GDK_WA_X" "1 << 2") + '("y" "GDK_WA_Y" "1 << 3") + '("cursor" "GDK_WA_CURSOR" "1 << 4") + '("colormap" "GDK_WA_COLORMAP" "1 << 5") + '("visual" "GDK_WA_VISUAL" "1 << 6") + '("wmclass" "GDK_WA_WMCLASS" "1 << 7") + '("noredir" "GDK_WA_NOREDIR" "1 << 8") + '("type-hint" "GDK_WA_TYPE_HINT" "1 << 9") + ) +) + +(define-flags-extended WindowHints + (in-module "Gdk") + (c-name "GdkWindowHints") + (values + '("pos" "GDK_HINT_POS" "1 << 0") + '("min-size" "GDK_HINT_MIN_SIZE" "1 << 1") + '("max-size" "GDK_HINT_MAX_SIZE" "1 << 2") + '("base-size" "GDK_HINT_BASE_SIZE" "1 << 3") + '("aspect" "GDK_HINT_ASPECT" "1 << 4") + '("resize-inc" "GDK_HINT_RESIZE_INC" "1 << 5") + '("win-gravity" "GDK_HINT_WIN_GRAVITY" "1 << 6") + '("user-pos" "GDK_HINT_USER_POS" "1 << 7") + '("user-size" "GDK_HINT_USER_SIZE" "1 << 8") + ) +) + +(define-enum-extended WindowTypeHint + (in-module "Gdk") + (c-name "GdkWindowTypeHint") + (values + '("normal" "GDK_WINDOW_TYPE_HINT_NORMAL" "0") + '("dialog" "GDK_WINDOW_TYPE_HINT_DIALOG" "1") + '("menu" "GDK_WINDOW_TYPE_HINT_MENU" "2") + '("toolbar" "GDK_WINDOW_TYPE_HINT_TOOLBAR" "3") + '("splashscreen" "GDK_WINDOW_TYPE_HINT_SPLASHSCREEN" "4") + '("utility" "GDK_WINDOW_TYPE_HINT_UTILITY" "5") + '("dock" "GDK_WINDOW_TYPE_HINT_DOCK" "6") + '("desktop" "GDK_WINDOW_TYPE_HINT_DESKTOP" "7") + '("dropdown-menu" "GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU" "8") + '("popup-menu" "GDK_WINDOW_TYPE_HINT_POPUP_MENU" "9") + '("tooltip" "GDK_WINDOW_TYPE_HINT_TOOLTIP" "10") + '("notification" "GDK_WINDOW_TYPE_HINT_NOTIFICATION" "11") + '("combo" "GDK_WINDOW_TYPE_HINT_COMBO" "12") + '("dnd" "GDK_WINDOW_TYPE_HINT_DND" "13") + ) +) + +(define-flags-extended WMDecoration + (in-module "Gdk") + (c-name "GdkWMDecoration") + (values + '("all" "GDK_DECOR_ALL" "1 << 0") + '("border" "GDK_DECOR_BORDER" "1 << 1") + '("resizeh" "GDK_DECOR_RESIZEH" "1 << 2") + '("title" "GDK_DECOR_TITLE" "1 << 3") + '("menu" "GDK_DECOR_MENU" "1 << 4") + '("minimize" "GDK_DECOR_MINIMIZE" "1 << 5") + '("maximize" "GDK_DECOR_MAXIMIZE" "1 << 6") + ) +) + +(define-flags-extended WMFunction + (in-module "Gdk") + (c-name "GdkWMFunction") + (values + '("all" "GDK_FUNC_ALL" "1 << 0") + '("resize" "GDK_FUNC_RESIZE" "1 << 1") + '("move" "GDK_FUNC_MOVE" "1 << 2") + '("minimize" "GDK_FUNC_MINIMIZE" "1 << 3") + '("maximize" "GDK_FUNC_MAXIMIZE" "1 << 4") + '("close" "GDK_FUNC_CLOSE" "1 << 5") + ) +) + +(define-enum-extended Gravity + (in-module "Gdk") + (c-name "GdkGravity") + (values + '("north-west" "GDK_GRAVITY_NORTH_WEST" "1") + '("north" "GDK_GRAVITY_NORTH" "2") + '("north-east" "GDK_GRAVITY_NORTH_EAST" "3") + '("west" "GDK_GRAVITY_WEST" "4") + '("center" "GDK_GRAVITY_CENTER" "5") + '("east" "GDK_GRAVITY_EAST" "6") + '("south-west" "GDK_GRAVITY_SOUTH_WEST" "7") + '("south" "GDK_GRAVITY_SOUTH" "8") + '("south-east" "GDK_GRAVITY_SOUTH_EAST" "9") + '("static" "GDK_GRAVITY_STATIC" "10") + ) +) + +(define-enum-extended WindowEdge + (in-module "Gdk") + (c-name "GdkWindowEdge") + (values + '("north-west" "GDK_WINDOW_EDGE_NORTH_WEST" "0") + '("north" "GDK_WINDOW_EDGE_NORTH" "1") + '("north-east" "GDK_WINDOW_EDGE_NORTH_EAST" "2") + '("west" "GDK_WINDOW_EDGE_WEST" "3") + '("east" "GDK_WINDOW_EDGE_EAST" "4") + '("south-west" "GDK_WINDOW_EDGE_SOUTH_WEST" "5") + '("south" "GDK_WINDOW_EDGE_SOUTH" "6") + '("south-east" "GDK_WINDOW_EDGE_SOUTH_EAST" "7") + ) +) + diff --git a/libs/gtkmm2/gdk/src/gdk_extra.defs b/libs/gtkmm2/gdk/src/gdk_extra.defs new file mode 100644 index 0000000000..d6655a983a --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_extra.defs @@ -0,0 +1,103 @@ +;; h2defs.py doesn't seem to list this method. Don't know why. murrayc. + +(define-method render_threshold_alpha + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_render_threshold_alpha") + (return-type "none") + (parameters + '("GdkBitmap*" "bitmap") + '("int" "src_x") + '("int" "src_y") + '("int" "dest_x") + '("int" "dest_y") + '("int" "width") + '("int" "height") + '("int" "alpha_threshold") + ) +) + +;; Stuff from gtk headers that really belongs in Gdk: + +(define-function gtk_drag_finish + (c-name "gtk_drag_finish") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("gboolean" "success") + '("gboolean" "del") + '("guint32" "time") + ) +) + +(define-function gtk_drag_get_source_widget + (c-name "gtk_drag_get_source_widget") + (return-type "GtkWidget*") + (parameters + '("GdkDragContext*" "context") + ) +) + +(define-function gtk_drag_set_icon_widget + (c-name "gtk_drag_set_icon_widget") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("GtkWidget*" "widget") + '("gint" "hot_x") + '("gint" "hot_y") + ) +) + +(define-function gtk_drag_set_icon_pixmap + (c-name "gtk_drag_set_icon_pixmap") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("GdkColormap*" "colormap") + '("GdkPixmap*" "pixmap") + '("GdkBitmap*" "mask") + '("gint" "hot_x") + '("gint" "hot_y") + ) +) + +(define-function gtk_drag_set_icon_pixbuf + (c-name "gtk_drag_set_icon_pixbuf") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("GdkPixbuf*" "pixbuf") + '("gint" "hot_x") + '("gint" "hot_y") + ) +) + +(define-function gtk_drag_set_icon_stock + (c-name "gtk_drag_set_icon_stock") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("const-gchar*" "stock_id") + '("gint" "hot_x") + '("gint" "hot_y") + ) +) + +(define-function gtk_drag_set_icon_name + (c-name "gtk_drag_set_icon_name") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("const-gchar*" "icon_name") + '("gint" "hot_x") + '("gint" "hot_y") + ) +) + +(define-function gtk_drag_set_icon_default + (c-name "gtk_drag_set_icon_default") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + ) +) diff --git a/libs/gtkmm2/gdk/src/gdk_methods.defs b/libs/gtkmm2/gdk/src/gdk_methods.defs new file mode 100644 index 0000000000..f2c41eb4bf --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_methods.defs @@ -0,0 +1,6167 @@ +;; -*- scheme -*- +; object definitions ... +(define-object Colormap + (in-module "Gdk") + (parent "GObject") + (c-name "GdkColormap") + (gtype-id "GDK_TYPE_COLORMAP") +) + +(define-object Display + (in-module "Gdk") + (parent "GObject") + (c-name "GdkDisplay") + (gtype-id "GDK_TYPE_DISPLAY") +) + +(define-object DragContext + (in-module "Gdk") + (parent "GObject") + (c-name "GdkDragContext") + (gtype-id "GDK_TYPE_DRAG_CONTEXT") +) + +(define-object Drawable + (in-module "Gdk") + (parent "GObject") + (c-name "GdkDrawable") + (gtype-id "GDK_TYPE_DRAWABLE") +) + +(define-object GC + (in-module "Gdk") + (parent "GObject") + (c-name "GdkGC") + (gtype-id "GDK_TYPE_GC") +) + +(define-object Image + (in-module "Gdk") + (parent "GObject") + (c-name "GdkImage") + (gtype-id "GDK_TYPE_IMAGE") +) + +(define-object Keymap + (in-module "Gdk") + (parent "GObject") + (c-name "GdkKeymap") + (gtype-id "GDK_TYPE_KEYMAP") +) + +(define-object Paintable + (in-module "Gdk") + (c-name "GdkPaintable") + (gtype-id "GDK_TYPE_PAINTABLE") +) + +(define-object PangoRenderer + (in-module "Gdk") + (parent "PangoRenderer") + (c-name "GdkPangoRenderer") + (gtype-id "GDK_TYPE_PANGO_RENDERER") +) + +(define-object PixmapObject + (in-module "Gdk") + (parent "GdkDrawable") + (c-name "GdkPixmapObject") + (gtype-id "GDK_TYPE_PIXMAP_OBJECT") +) + +(define-object Screen + (in-module "Gdk") + (parent "GObject") + (c-name "GdkScreen") + (gtype-id "GDK_TYPE_SCREEN") +) + +(define-object WindowObject + (in-module "Gdk") + (parent "GdkDrawable") + (c-name "GdkWindowObject") + (gtype-id "GDK_TYPE_WINDOW_OBJECT") +) + +;; Enumerations and flags ... + +(define-flags DragAction + (in-module "Gdk") + (c-name "GdkDragAction") + (gtype-id "GDK_TYPE_DRAG_ACTION") + (values + '("default" "GDK_ACTION_DEFAULT") + '("copy" "GDK_ACTION_COPY") + '("move" "GDK_ACTION_MOVE") + '("link" "GDK_ACTION_LINK") + '("private" "GDK_ACTION_PRIVATE") + '("ask" "GDK_ACTION_ASK") + ) +) + +(define-enum DragProtocol + (in-module "Gdk") + (c-name "GdkDragProtocol") + (gtype-id "GDK_TYPE_DRAG_PROTOCOL") + (values + '("motif" "GDK_DRAG_PROTO_MOTIF") + '("xdnd" "GDK_DRAG_PROTO_XDND") + '("rootwin" "GDK_DRAG_PROTO_ROOTWIN") + '("none" "GDK_DRAG_PROTO_NONE") + '("win32-dropfiles" "GDK_DRAG_PROTO_WIN32_DROPFILES") + '("ole2" "GDK_DRAG_PROTO_OLE2") + '("local" "GDK_DRAG_PROTO_LOCAL") + ) +) + +(define-enum FilterReturn + (in-module "Gdk") + (c-name "GdkFilterReturn") + (gtype-id "GDK_TYPE_FILTER_RETURN") + (values + '("continue" "GDK_FILTER_CONTINUE") + '("translate" "GDK_FILTER_TRANSLATE") + '("remove" "GDK_FILTER_REMOVE") + ) +) + +(define-enum EventType + (in-module "Gdk") + (c-name "GdkEventType") + (gtype-id "GDK_TYPE_EVENT_TYPE") + (values + '("nothing" "GDK_NOTHING") + '("delete" "GDK_DELETE") + '("destroy" "GDK_DESTROY") + '("expose" "GDK_EXPOSE") + '("motion-notify" "GDK_MOTION_NOTIFY") + '("button-press" "GDK_BUTTON_PRESS") + '("2button-press" "GDK_2BUTTON_PRESS") + '("3button-press" "GDK_3BUTTON_PRESS") + '("button-release" "GDK_BUTTON_RELEASE") + '("key-press" "GDK_KEY_PRESS") + '("key-release" "GDK_KEY_RELEASE") + '("enter-notify" "GDK_ENTER_NOTIFY") + '("leave-notify" "GDK_LEAVE_NOTIFY") + '("focus-change" "GDK_FOCUS_CHANGE") + '("configure" "GDK_CONFIGURE") + '("map" "GDK_MAP") + '("unmap" "GDK_UNMAP") + '("property-notify" "GDK_PROPERTY_NOTIFY") + '("selection-clear" "GDK_SELECTION_CLEAR") + '("selection-request" "GDK_SELECTION_REQUEST") + '("selection-notify" "GDK_SELECTION_NOTIFY") + '("proximity-in" "GDK_PROXIMITY_IN") + '("proximity-out" "GDK_PROXIMITY_OUT") + '("drag-enter" "GDK_DRAG_ENTER") + '("drag-leave" "GDK_DRAG_LEAVE") + '("drag-motion" "GDK_DRAG_MOTION") + '("drag-status" "GDK_DRAG_STATUS") + '("drop-start" "GDK_DROP_START") + '("drop-finished" "GDK_DROP_FINISHED") + '("client-event" "GDK_CLIENT_EVENT") + '("visibility-notify" "GDK_VISIBILITY_NOTIFY") + '("no-expose" "GDK_NO_EXPOSE") + '("scroll" "GDK_SCROLL") + '("window-state" "GDK_WINDOW_STATE") + '("setting" "GDK_SETTING") + '("owner-change" "GDK_OWNER_CHANGE") + '("grab-broken" "GDK_GRAB_BROKEN") + ) +) + +(define-flags EventMask + (in-module "Gdk") + (c-name "GdkEventMask") + (gtype-id "GDK_TYPE_EVENT_MASK") + (values + '("exposure-mask" "GDK_EXPOSURE_MASK") + '("pointer-motion-mask" "GDK_POINTER_MOTION_MASK") + '("pointer-motion-hint-mask" "GDK_POINTER_MOTION_HINT_MASK") + '("button-motion-mask" "GDK_BUTTON_MOTION_MASK") + '("button1-motion-mask" "GDK_BUTTON1_MOTION_MASK") + '("button2-motion-mask" "GDK_BUTTON2_MOTION_MASK") + '("button3-motion-mask" "GDK_BUTTON3_MOTION_MASK") + '("button-press-mask" "GDK_BUTTON_PRESS_MASK") + '("button-release-mask" "GDK_BUTTON_RELEASE_MASK") + '("key-press-mask" "GDK_KEY_PRESS_MASK") + '("key-release-mask" "GDK_KEY_RELEASE_MASK") + '("enter-notify-mask" "GDK_ENTER_NOTIFY_MASK") + '("leave-notify-mask" "GDK_LEAVE_NOTIFY_MASK") + '("focus-change-mask" "GDK_FOCUS_CHANGE_MASK") + '("structure-mask" "GDK_STRUCTURE_MASK") + '("property-change-mask" "GDK_PROPERTY_CHANGE_MASK") + '("visibility-notify-mask" "GDK_VISIBILITY_NOTIFY_MASK") + '("proximity-in-mask" "GDK_PROXIMITY_IN_MASK") + '("proximity-out-mask" "GDK_PROXIMITY_OUT_MASK") + '("substructure-mask" "GDK_SUBSTRUCTURE_MASK") + '("scroll-mask" "GDK_SCROLL_MASK") + '("all-events-mask" "GDK_ALL_EVENTS_MASK") + ) +) + +(define-enum VisibilityState + (in-module "Gdk") + (c-name "GdkVisibilityState") + (gtype-id "GDK_TYPE_VISIBILITY_STATE") + (values + '("unobscured" "GDK_VISIBILITY_UNOBSCURED") + '("partial" "GDK_VISIBILITY_PARTIAL") + '("fully-obscured" "GDK_VISIBILITY_FULLY_OBSCURED") + ) +) + +(define-enum ScrollDirection + (in-module "Gdk") + (c-name "GdkScrollDirection") + (gtype-id "GDK_TYPE_SCROLL_DIRECTION") + (values + '("up" "GDK_SCROLL_UP") + '("down" "GDK_SCROLL_DOWN") + '("left" "GDK_SCROLL_LEFT") + '("right" "GDK_SCROLL_RIGHT") + ) +) + +(define-enum NotifyType + (in-module "Gdk") + (c-name "GdkNotifyType") + (gtype-id "GDK_TYPE_NOTIFY_TYPE") + (values + '("ancestor" "GDK_NOTIFY_ANCESTOR") + '("virtual" "GDK_NOTIFY_VIRTUAL") + '("inferior" "GDK_NOTIFY_INFERIOR") + '("nonlinear" "GDK_NOTIFY_NONLINEAR") + '("nonlinear-virtual" "GDK_NOTIFY_NONLINEAR_VIRTUAL") + '("unknown" "GDK_NOTIFY_UNKNOWN") + ) +) + +(define-enum CrossingMode + (in-module "Gdk") + (c-name "GdkCrossingMode") + (gtype-id "GDK_TYPE_CROSSING_MODE") + (values + '("normal" "GDK_CROSSING_NORMAL") + '("grab" "GDK_CROSSING_GRAB") + '("ungrab" "GDK_CROSSING_UNGRAB") + ) +) + +(define-enum PropertyState + (in-module "Gdk") + (c-name "GdkPropertyState") + (gtype-id "GDK_TYPE_PROPERTY_STATE") + (values + '("new-value" "GDK_PROPERTY_NEW_VALUE") + '("delete" "GDK_PROPERTY_DELETE") + ) +) + +(define-flags WindowState + (in-module "Gdk") + (c-name "GdkWindowState") + (gtype-id "GDK_TYPE_WINDOW_STATE") + (values + '("withdrawn" "GDK_WINDOW_STATE_WITHDRAWN") + '("iconified" "GDK_WINDOW_STATE_ICONIFIED") + '("maximized" "GDK_WINDOW_STATE_MAXIMIZED") + '("sticky" "GDK_WINDOW_STATE_STICKY") + '("fullscreen" "GDK_WINDOW_STATE_FULLSCREEN") + '("above" "GDK_WINDOW_STATE_ABOVE") + '("below" "GDK_WINDOW_STATE_BELOW") + ) +) + +(define-enum SettingAction + (in-module "Gdk") + (c-name "GdkSettingAction") + (gtype-id "GDK_TYPE_SETTING_ACTION") + (values + '("new" "GDK_SETTING_ACTION_NEW") + '("changed" "GDK_SETTING_ACTION_CHANGED") + '("deleted" "GDK_SETTING_ACTION_DELETED") + ) +) + +(define-enum OwnerChange + (in-module "Gdk") + (c-name "GdkOwnerChange") + (gtype-id "GDK_TYPE_OWNER_CHANGE") + (values + '("new-owner" "GDK_OWNER_CHANGE_NEW_OWNER") + '("destroy" "GDK_OWNER_CHANGE_DESTROY") + '("close" "GDK_OWNER_CHANGE_CLOSE") + ) +) + +(define-enum FontType + (in-module "Gdk") + (c-name "GdkFontType") + (gtype-id "GDK_TYPE_FONT_TYPE") + (values + '("t" "GDK_FONT_FONT") + '("tset" "GDK_FONT_FONTSET") + ) +) + +(define-enum CapStyle + (in-module "Gdk") + (c-name "GdkCapStyle") + (gtype-id "GDK_TYPE_CAP_STYLE") + (values + '("not-last" "GDK_CAP_NOT_LAST") + '("butt" "GDK_CAP_BUTT") + '("round" "GDK_CAP_ROUND") + '("projecting" "GDK_CAP_PROJECTING") + ) +) + +(define-enum Fill + (in-module "Gdk") + (c-name "GdkFill") + (gtype-id "GDK_TYPE_FILL") + (values + '("solid" "GDK_SOLID") + '("tiled" "GDK_TILED") + '("stippled" "GDK_STIPPLED") + '("opaque-stippled" "GDK_OPAQUE_STIPPLED") + ) +) + +(define-enum Function + (in-module "Gdk") + (c-name "GdkFunction") + (gtype-id "GDK_TYPE_FUNCTION") + (values + '("copy" "GDK_COPY") + '("invert" "GDK_INVERT") + '("xor" "GDK_XOR") + '("clear" "GDK_CLEAR") + '("and" "GDK_AND") + '("and-reverse" "GDK_AND_REVERSE") + '("and-invert" "GDK_AND_INVERT") + '("noop" "GDK_NOOP") + '("or" "GDK_OR") + '("equiv" "GDK_EQUIV") + '("or-reverse" "GDK_OR_REVERSE") + '("copy-invert" "GDK_COPY_INVERT") + '("or-invert" "GDK_OR_INVERT") + '("nand" "GDK_NAND") + '("nor" "GDK_NOR") + '("set" "GDK_SET") + ) +) + +(define-enum JoinStyle + (in-module "Gdk") + (c-name "GdkJoinStyle") + (gtype-id "GDK_TYPE_JOIN_STYLE") + (values + '("miter" "GDK_JOIN_MITER") + '("round" "GDK_JOIN_ROUND") + '("bevel" "GDK_JOIN_BEVEL") + ) +) + +(define-enum LineStyle + (in-module "Gdk") + (c-name "GdkLineStyle") + (gtype-id "GDK_TYPE_LINE_STYLE") + (values + '("solid" "GDK_LINE_SOLID") + '("on-off-dash" "GDK_LINE_ON_OFF_DASH") + '("double-dash" "GDK_LINE_DOUBLE_DASH") + ) +) + +(define-enum SubwindowMode + (in-module "Gdk") + (c-name "GdkSubwindowMode") + (gtype-id "GDK_TYPE_SUBWINDOW_MODE") + (values + '("clip-by-children" "GDK_CLIP_BY_CHILDREN") + '("include-inferiors" "GDK_INCLUDE_INFERIORS") + ) +) + +(define-flags GCValuesMask + (in-module "Gdk") + (c-name "GdkGCValuesMask") + (gtype-id "GDK_TYPE_GC_VALUES_MASK") + (values + '("foreground" "GDK_GC_FOREGROUND") + '("background" "GDK_GC_BACKGROUND") + '("font" "GDK_GC_FONT") + '("function" "GDK_GC_FUNCTION") + '("fill" "GDK_GC_FILL") + '("tile" "GDK_GC_TILE") + '("stipple" "GDK_GC_STIPPLE") + '("clip-mask" "GDK_GC_CLIP_MASK") + '("subwindow" "GDK_GC_SUBWINDOW") + '("ts-x-origin" "GDK_GC_TS_X_ORIGIN") + '("ts-y-origin" "GDK_GC_TS_Y_ORIGIN") + '("clip-x-origin" "GDK_GC_CLIP_X_ORIGIN") + '("clip-y-origin" "GDK_GC_CLIP_Y_ORIGIN") + '("exposures" "GDK_GC_EXPOSURES") + '("line-width" "GDK_GC_LINE_WIDTH") + '("line-style" "GDK_GC_LINE_STYLE") + '("cap-style" "GDK_GC_CAP_STYLE") + '("join-style" "GDK_GC_JOIN_STYLE") + ) +) + +(define-enum ImageType + (in-module "Gdk") + (c-name "GdkImageType") + (gtype-id "GDK_TYPE_IMAGE_TYPE") + (values + '("normal" "GDK_IMAGE_NORMAL") + '("shared" "GDK_IMAGE_SHARED") + '("fastest" "GDK_IMAGE_FASTEST") + ) +) + +(define-enum ExtensionMode + (in-module "Gdk") + (c-name "GdkExtensionMode") + (gtype-id "GDK_TYPE_EXTENSION_MODE") + (values + '("none" "GDK_EXTENSION_EVENTS_NONE") + '("all" "GDK_EXTENSION_EVENTS_ALL") + '("cursor" "GDK_EXTENSION_EVENTS_CURSOR") + ) +) + +(define-enum InputSource + (in-module "Gdk") + (c-name "GdkInputSource") + (gtype-id "GDK_TYPE_INPUT_SOURCE") + (values + '("mouse" "GDK_SOURCE_MOUSE") + '("pen" "GDK_SOURCE_PEN") + '("eraser" "GDK_SOURCE_ERASER") + '("cursor" "GDK_SOURCE_CURSOR") + ) +) + +(define-enum InputMode + (in-module "Gdk") + (c-name "GdkInputMode") + (gtype-id "GDK_TYPE_INPUT_MODE") + (values + '("disabled" "GDK_MODE_DISABLED") + '("screen" "GDK_MODE_SCREEN") + '("window" "GDK_MODE_WINDOW") + ) +) + +(define-enum AxisUse + (in-module "Gdk") + (c-name "GdkAxisUse") + (gtype-id "GDK_TYPE_AXIS_USE") + (values + '("ignore" "GDK_AXIS_IGNORE") + '("x" "GDK_AXIS_X") + '("y" "GDK_AXIS_Y") + '("pressure" "GDK_AXIS_PRESSURE") + '("xtilt" "GDK_AXIS_XTILT") + '("ytilt" "GDK_AXIS_YTILT") + '("wheel" "GDK_AXIS_WHEEL") + '("last" "GDK_AXIS_LAST") + ) +) + +(define-flags ColorInfoFlags + (in-module "Gdk") + (c-name "GdkColorInfoFlags") + (gtype-id "GDK_TYPE_COLOR_INFO_FLAGS") + (values + '("e" "GDK_COLOR_WRITEABLE") + ) +) + +(define-flags DebugFlag + (in-module "Gdk") + (c-name "GdkDebugFlag") + (gtype-id "GDK_TYPE_DEBUG_FLAG") + (values + '("misc" "GDK_DEBUG_MISC") + '("events" "GDK_DEBUG_EVENTS") + '("dnd" "GDK_DEBUG_DND") + '("xim" "GDK_DEBUG_XIM") + '("nograbs" "GDK_DEBUG_NOGRABS") + '("colormap" "GDK_DEBUG_COLORMAP") + '("gdkrgb" "GDK_DEBUG_GDKRGB") + '("gc" "GDK_DEBUG_GC") + '("pixmap" "GDK_DEBUG_PIXMAP") + '("image" "GDK_DEBUG_IMAGE") + '("input" "GDK_DEBUG_INPUT") + '("cursor" "GDK_DEBUG_CURSOR") + '("multihead" "GDK_DEBUG_MULTIHEAD") + '("xinerama" "GDK_DEBUG_XINERAMA") + '("draw" "GDK_DEBUG_DRAW") + ) +) + +(define-enum ArgType + (in-module "Gdk") + (c-name "GdkArgType") + (gtype-id "GDK_TYPE_ARG_TYPE") + (values + '("string" "GDK_ARG_STRING") + '("int" "GDK_ARG_INT") + '("bool" "GDK_ARG_BOOL") + '("nobool" "GDK_ARG_NOBOOL") + '("callback" "GDK_ARG_CALLBACK") + ) +) + +(define-flags EventFlags + (in-module "Gdk") + (c-name "GdkEventFlags") + (gtype-id "GDK_TYPE_EVENT_FLAGS") + (values + '("g" "GDK_EVENT_PENDING") + ) +) + +(define-enum PropMode + (in-module "Gdk") + (c-name "GdkPropMode") + (gtype-id "GDK_TYPE_PROP_MODE") + (values + '("replace" "GDK_PROP_MODE_REPLACE") + '("prepend" "GDK_PROP_MODE_PREPEND") + '("append" "GDK_PROP_MODE_APPEND") + ) +) + +(define-enum FillRule + (in-module "Gdk") + (c-name "GdkFillRule") + (gtype-id "GDK_TYPE_FILL_RULE") + (values + '("even-odd-rule" "GDK_EVEN_ODD_RULE") + '("winding-rule" "GDK_WINDING_RULE") + ) +) + +(define-enum OverlapType + (in-module "Gdk") + (c-name "GdkOverlapType") + (gtype-id "GDK_TYPE_OVERLAP_TYPE") + (values + '("in" "GDK_OVERLAP_RECTANGLE_IN") + '("out" "GDK_OVERLAP_RECTANGLE_OUT") + '("part" "GDK_OVERLAP_RECTANGLE_PART") + ) +) + +(define-enum RgbDither + (in-module "Gdk") + (c-name "GdkRgbDither") + (gtype-id "GDK_TYPE_RGB_DITHER") + (values + '("none" "GDK_RGB_DITHER_NONE") + '("normal" "GDK_RGB_DITHER_NORMAL") + '("max" "GDK_RGB_DITHER_MAX") + ) +) + +(define-enum ByteOrder + (in-module "Gdk") + (c-name "GdkByteOrder") + (gtype-id "GDK_TYPE_BYTE_ORDER") + (values + '("lsb-first" "GDK_LSB_FIRST") + '("msb-first" "GDK_MSB_FIRST") + ) +) + +(define-flags ModifierType + (in-module "Gdk") + (c-name "GdkModifierType") + (gtype-id "GDK_TYPE_MODIFIER_TYPE") + (values + '("shift-mask" "GDK_SHIFT_MASK") + '("lock-mask" "GDK_LOCK_MASK") + '("control-mask" "GDK_CONTROL_MASK") + '("mod1-mask" "GDK_MOD1_MASK") + '("mod2-mask" "GDK_MOD2_MASK") + '("mod3-mask" "GDK_MOD3_MASK") + '("mod4-mask" "GDK_MOD4_MASK") + '("mod5-mask" "GDK_MOD5_MASK") + '("button1-mask" "GDK_BUTTON1_MASK") + '("button2-mask" "GDK_BUTTON2_MASK") + '("button3-mask" "GDK_BUTTON3_MASK") + '("button4-mask" "GDK_BUTTON4_MASK") + '("button5-mask" "GDK_BUTTON5_MASK") + '("super-mask" "GDK_SUPER_MASK") + '("hyper-mask" "GDK_HYPER_MASK") + '("meta-mask" "GDK_META_MASK") + '("release-mask" "GDK_RELEASE_MASK") + '("modifier-mask" "GDK_MODIFIER_MASK") + ) +) + +(define-flags InputCondition + (in-module "Gdk") + (c-name "GdkInputCondition") + (gtype-id "GDK_TYPE_INPUT_CONDITION") + (values + '("read" "GDK_INPUT_READ") + '("write" "GDK_INPUT_WRITE") + '("exception" "GDK_INPUT_EXCEPTION") + ) +) + +(define-enum Status + (in-module "Gdk") + (c-name "GdkStatus") + (gtype-id "GDK_TYPE_STATUS") + (values + '("ok" "GDK_OK") + '("error" "GDK_ERROR") + '("error-param" "GDK_ERROR_PARAM") + '("error-file" "GDK_ERROR_FILE") + '("error-mem" "GDK_ERROR_MEM") + ) +) + +(define-enum GrabStatus + (in-module "Gdk") + (c-name "GdkGrabStatus") + (gtype-id "GDK_TYPE_GRAB_STATUS") + (values + '("success" "GDK_GRAB_SUCCESS") + '("already-grabbed" "GDK_GRAB_ALREADY_GRABBED") + '("invalid-time" "GDK_GRAB_INVALID_TIME") + '("not-viewable" "GDK_GRAB_NOT_VIEWABLE") + '("frozen" "GDK_GRAB_FROZEN") + ) +) + +(define-enum VisualType + (in-module "Gdk") + (c-name "GdkVisualType") + (gtype-id "GDK_TYPE_VISUAL_TYPE") + (values + '("static-gray" "GDK_VISUAL_STATIC_GRAY") + '("grayscale" "GDK_VISUAL_GRAYSCALE") + '("static-color" "GDK_VISUAL_STATIC_COLOR") + '("pseudo-color" "GDK_VISUAL_PSEUDO_COLOR") + '("true-color" "GDK_VISUAL_TRUE_COLOR") + '("direct-color" "GDK_VISUAL_DIRECT_COLOR") + ) +) + +(define-enum WindowClass + (in-module "Gdk") + (c-name "GdkWindowClass") + (gtype-id "GDK_TYPE_WINDOW_CLASS") + (values + '("utput" "GDK_INPUT_OUTPUT") + '("nly" "GDK_INPUT_ONLY") + ) +) + +(define-enum WindowType + (in-module "Gdk") + (c-name "GdkWindowType") + (gtype-id "GDK_TYPE_WINDOW_TYPE") + (values + '("root" "GDK_WINDOW_ROOT") + '("toplevel" "GDK_WINDOW_TOPLEVEL") + '("child" "GDK_WINDOW_CHILD") + '("dialog" "GDK_WINDOW_DIALOG") + '("temp" "GDK_WINDOW_TEMP") + '("foreign" "GDK_WINDOW_FOREIGN") + ) +) + +(define-flags WindowAttributesType + (in-module "Gdk") + (c-name "GdkWindowAttributesType") + (gtype-id "GDK_TYPE_WINDOW_ATTRIBUTES_TYPE") + (values + '("title" "GDK_WA_TITLE") + '("x" "GDK_WA_X") + '("y" "GDK_WA_Y") + '("cursor" "GDK_WA_CURSOR") + '("colormap" "GDK_WA_COLORMAP") + '("visual" "GDK_WA_VISUAL") + '("wmclass" "GDK_WA_WMCLASS") + '("noredir" "GDK_WA_NOREDIR") + '("type-hint" "GDK_WA_TYPE_HINT") + ) +) + +(define-flags WindowHints + (in-module "Gdk") + (c-name "GdkWindowHints") + (gtype-id "GDK_TYPE_WINDOW_HINTS") + (values + '("pos" "GDK_HINT_POS") + '("min-size" "GDK_HINT_MIN_SIZE") + '("max-size" "GDK_HINT_MAX_SIZE") + '("base-size" "GDK_HINT_BASE_SIZE") + '("aspect" "GDK_HINT_ASPECT") + '("resize-inc" "GDK_HINT_RESIZE_INC") + '("win-gravity" "GDK_HINT_WIN_GRAVITY") + '("user-pos" "GDK_HINT_USER_POS") + '("user-size" "GDK_HINT_USER_SIZE") + ) +) + +(define-enum WindowTypeHint + (in-module "Gdk") + (c-name "GdkWindowTypeHint") + (gtype-id "GDK_TYPE_WINDOW_TYPE_HINT") + (values + '("normal" "GDK_WINDOW_TYPE_HINT_NORMAL") + '("dialog" "GDK_WINDOW_TYPE_HINT_DIALOG") + '("menu" "GDK_WINDOW_TYPE_HINT_MENU") + '("toolbar" "GDK_WINDOW_TYPE_HINT_TOOLBAR") + '("splashscreen" "GDK_WINDOW_TYPE_HINT_SPLASHSCREEN") + '("utility" "GDK_WINDOW_TYPE_HINT_UTILITY") + '("dock" "GDK_WINDOW_TYPE_HINT_DOCK") + '("desktop" "GDK_WINDOW_TYPE_HINT_DESKTOP") + '("dropdown-menu" "GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU") + '("popup-menu" "GDK_WINDOW_TYPE_HINT_POPUP_MENU") + '("tooltip" "GDK_WINDOW_TYPE_HINT_TOOLTIP") + '("notification" "GDK_WINDOW_TYPE_HINT_NOTIFICATION") + '("combo" "GDK_WINDOW_TYPE_HINT_COMBO") + '("dnd" "GDK_WINDOW_TYPE_HINT_DND") + ) +) + +(define-flags WMDecoration + (in-module "Gdk") + (c-name "GdkWMDecoration") + (gtype-id "GDK_TYPE_WM_DECORATION") + (values + '("all" "GDK_DECOR_ALL") + '("border" "GDK_DECOR_BORDER") + '("resizeh" "GDK_DECOR_RESIZEH") + '("title" "GDK_DECOR_TITLE") + '("menu" "GDK_DECOR_MENU") + '("minimize" "GDK_DECOR_MINIMIZE") + '("maximize" "GDK_DECOR_MAXIMIZE") + ) +) + +(define-flags WMFunction + (in-module "Gdk") + (c-name "GdkWMFunction") + (gtype-id "GDK_TYPE_WM_FUNCTION") + (values + '("all" "GDK_FUNC_ALL") + '("resize" "GDK_FUNC_RESIZE") + '("move" "GDK_FUNC_MOVE") + '("minimize" "GDK_FUNC_MINIMIZE") + '("maximize" "GDK_FUNC_MAXIMIZE") + '("close" "GDK_FUNC_CLOSE") + ) +) + +(define-enum Gravity + (in-module "Gdk") + (c-name "GdkGravity") + (gtype-id "GDK_TYPE_GRAVITY") + (values + '("north-west" "GDK_GRAVITY_NORTH_WEST") + '("north" "GDK_GRAVITY_NORTH") + '("north-east" "GDK_GRAVITY_NORTH_EAST") + '("west" "GDK_GRAVITY_WEST") + '("center" "GDK_GRAVITY_CENTER") + '("east" "GDK_GRAVITY_EAST") + '("south-west" "GDK_GRAVITY_SOUTH_WEST") + '("south" "GDK_GRAVITY_SOUTH") + '("south-east" "GDK_GRAVITY_SOUTH_EAST") + '("static" "GDK_GRAVITY_STATIC") + ) +) + +(define-enum WindowEdge + (in-module "Gdk") + (c-name "GdkWindowEdge") + (gtype-id "GDK_TYPE_WINDOW_EDGE") + (values + '("north-west" "GDK_WINDOW_EDGE_NORTH_WEST") + '("north" "GDK_WINDOW_EDGE_NORTH") + '("north-east" "GDK_WINDOW_EDGE_NORTH_EAST") + '("west" "GDK_WINDOW_EDGE_WEST") + '("east" "GDK_WINDOW_EDGE_EAST") + '("south-west" "GDK_WINDOW_EDGE_SOUTH_WEST") + '("south" "GDK_WINDOW_EDGE_SOUTH") + '("south-east" "GDK_WINDOW_EDGE_SOUTH_EAST") + ) +) + + +;; From gdkalias.h + + + +;; From gdkcairo.h + +(define-function gdk_cairo_create + (c-name "gdk_cairo_create") + (return-type "cairo_t*") + (parameters + '("GdkDrawable*" "drawable") + ) +) + +(define-function gdk_cairo_set_source_color + (c-name "gdk_cairo_set_source_color") + (return-type "none") + (parameters + '("cairo_t*" "cr") + '("GdkColor*" "color") + ) +) + +(define-function gdk_cairo_set_source_pixbuf + (c-name "gdk_cairo_set_source_pixbuf") + (return-type "none") + (parameters + '("cairo_t*" "cr") + '("GdkPixbuf*" "pixbuf") + '("double" "pixbuf_x") + '("double" "pixbuf_y") + ) +) + +(define-function gdk_cairo_set_source_pixmap + (c-name "gdk_cairo_set_source_pixmap") + (return-type "none") + (parameters + '("cairo_t*" "cr") + '("GdkPixmap*" "pixmap") + '("double" "pixmap_x") + '("double" "pixmap_y") + ) +) + +(define-function gdk_cairo_rectangle + (c-name "gdk_cairo_rectangle") + (return-type "none") + (parameters + '("cairo_t*" "cr") + '("GdkRectangle*" "rectangle") + ) +) + +(define-function gdk_cairo_region + (c-name "gdk_cairo_region") + (return-type "none") + (parameters + '("cairo_t*" "cr") + '("GdkRegion*" "region") + ) +) + + + +;; From gdkcolor.h + +(define-function gdk_colormap_get_type + (c-name "gdk_colormap_get_type") + (return-type "GType") +) + +(define-function gdk_colormap_new + (c-name "gdk_colormap_new") + (is-constructor-of "GdkColormap") + (return-type "GdkColormap*") + (parameters + '("GdkVisual*" "visual") + '("gboolean" "allocate") + ) +) + +(define-method ref + (of-object "GdkColormap") + (c-name "gdk_colormap_ref") + (return-type "GdkColormap*") +) + +(define-method unref + (of-object "GdkColormap") + (c-name "gdk_colormap_unref") + (return-type "none") +) + +(define-function gdk_colormap_get_system + (c-name "gdk_colormap_get_system") + (return-type "GdkColormap*") +) + +(define-method get_screen + (of-object "GdkColormap") + (c-name "gdk_colormap_get_screen") + (return-type "GdkScreen*") +) + +(define-function gdk_colormap_get_system_size + (c-name "gdk_colormap_get_system_size") + (return-type "gint") +) + +(define-method change + (of-object "GdkColormap") + (c-name "gdk_colormap_change") + (return-type "none") + (parameters + '("gint" "ncolors") + ) +) + +(define-method alloc_colors + (of-object "GdkColormap") + (c-name "gdk_colormap_alloc_colors") + (return-type "gint") + (parameters + '("GdkColor*" "colors") + '("gint" "ncolors") + '("gboolean" "writeable") + '("gboolean" "best_match") + '("gboolean*" "success") + ) +) + +(define-method alloc_color + (of-object "GdkColormap") + (c-name "gdk_colormap_alloc_color") + (return-type "gboolean") + (parameters + '("GdkColor*" "color") + '("gboolean" "writeable") + '("gboolean" "best_match") + ) +) + +(define-method free_colors + (of-object "GdkColormap") + (c-name "gdk_colormap_free_colors") + (return-type "none") + (parameters + '("GdkColor*" "colors") + '("gint" "ncolors") + ) +) + +(define-method query_color + (of-object "GdkColormap") + (c-name "gdk_colormap_query_color") + (return-type "none") + (parameters + '("gulong" "pixel") + '("GdkColor*" "result") + ) +) + +(define-method get_visual + (of-object "GdkColormap") + (c-name "gdk_colormap_get_visual") + (return-type "GdkVisual*") +) + +(define-method copy + (of-object "GdkColor") + (c-name "gdk_color_copy") + (return-type "GdkColor*") +) + +(define-method free + (of-object "GdkColor") + (c-name "gdk_color_free") + (return-type "none") +) + +(define-function gdk_color_parse + (c-name "gdk_color_parse") + (return-type "gboolean") + (parameters + '("const-gchar*" "spec") + '("GdkColor*" "color") + ) +) + +(define-method hash + (of-object "GdkColor") + (c-name "gdk_color_hash") + (return-type "guint") +) + +(define-method equal + (of-object "GdkColor") + (c-name "gdk_color_equal") + (return-type "gboolean") + (parameters + '("const-GdkColor*" "colorb") + ) +) + +(define-method to_string + (of-object "GdkColor") + (c-name "gdk_color_to_string") + (return-type "gchar*") +) + +(define-function gdk_color_get_type + (c-name "gdk_color_get_type") + (return-type "GType") +) + +(define-function gdk_colors_store + (c-name "gdk_colors_store") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + '("GdkColor*" "colors") + '("gint" "ncolors") + ) +) + +(define-function gdk_color_white + (c-name "gdk_color_white") + (return-type "gint") + (parameters + '("GdkColormap*" "colormap") + '("GdkColor*" "color") + ) +) + +(define-function gdk_color_black + (c-name "gdk_color_black") + (return-type "gint") + (parameters + '("GdkColormap*" "colormap") + '("GdkColor*" "color") + ) +) + +(define-function gdk_color_alloc + (c-name "gdk_color_alloc") + (return-type "gint") + (parameters + '("GdkColormap*" "colormap") + '("GdkColor*" "color") + ) +) + +(define-function gdk_color_change + (c-name "gdk_color_change") + (return-type "gint") + (parameters + '("GdkColormap*" "colormap") + '("GdkColor*" "color") + ) +) + +(define-function gdk_colors_alloc + (c-name "gdk_colors_alloc") + (return-type "gint") + (parameters + '("GdkColormap*" "colormap") + '("gboolean" "contiguous") + '("gulong*" "planes") + '("gint" "nplanes") + '("gulong*" "pixels") + '("gint" "npixels") + ) +) + +(define-function gdk_colors_free + (c-name "gdk_colors_free") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + '("gulong*" "pixels") + '("gint" "npixels") + '("gulong" "planes") + ) +) + + + +;; From gdkconfig.h + + + +;; From gdkcursor.h + +(define-function gdk_cursor_get_type + (c-name "gdk_cursor_get_type") + (return-type "GType") +) + +(define-function gdk_cursor_new_for_display + (c-name "gdk_cursor_new_for_display") + (return-type "GdkCursor*") + (parameters + '("GdkDisplay*" "display") + '("GdkCursorType" "cursor_type") + ) +) + +(define-function gdk_cursor_new + (c-name "gdk_cursor_new") + (is-constructor-of "GdkCursor") + (return-type "GdkCursor*") + (parameters + '("GdkCursorType" "cursor_type") + ) +) + +(define-function gdk_cursor_new_from_pixmap + (c-name "gdk_cursor_new_from_pixmap") + (return-type "GdkCursor*") + (parameters + '("GdkPixmap*" "source") + '("GdkPixmap*" "mask") + '("const-GdkColor*" "fg") + '("const-GdkColor*" "bg") + '("gint" "x") + '("gint" "y") + ) +) + +(define-function gdk_cursor_new_from_pixbuf + (c-name "gdk_cursor_new_from_pixbuf") + (return-type "GdkCursor*") + (parameters + '("GdkDisplay*" "display") + '("GdkPixbuf*" "pixbuf") + '("gint" "x") + '("gint" "y") + ) +) + +(define-method get_display + (of-object "GdkCursor") + (c-name "gdk_cursor_get_display") + (return-type "GdkDisplay*") +) + +(define-method ref + (of-object "GdkCursor") + (c-name "gdk_cursor_ref") + (return-type "GdkCursor*") +) + +(define-method unref + (of-object "GdkCursor") + (c-name "gdk_cursor_unref") + (return-type "none") +) + +(define-function gdk_cursor_new_from_name + (c-name "gdk_cursor_new_from_name") + (return-type "GdkCursor*") + (parameters + '("GdkDisplay*" "display") + '("const-gchar*" "name") + ) +) + +(define-method get_image + (of-object "GdkCursor") + (c-name "gdk_cursor_get_image") + (return-type "GdkPixbuf*") +) + + + +;; From gdkdisplay.h + +(define-function gdk_display_get_type + (c-name "gdk_display_get_type") + (return-type "GType") +) + +(define-function gdk_display_open + (c-name "gdk_display_open") + (return-type "GdkDisplay*") + (parameters + '("const-gchar*" "display_name") + ) +) + +(define-method get_name + (of-object "GdkDisplay") + (c-name "gdk_display_get_name") + (return-type "const-gchar*") +) + +(define-method get_n_screens + (of-object "GdkDisplay") + (c-name "gdk_display_get_n_screens") + (return-type "gint") +) + +(define-method get_screen + (of-object "GdkDisplay") + (c-name "gdk_display_get_screen") + (return-type "GdkScreen*") + (parameters + '("gint" "screen_num") + ) +) + +(define-method get_default_screen + (of-object "GdkDisplay") + (c-name "gdk_display_get_default_screen") + (return-type "GdkScreen*") +) + +(define-method pointer_ungrab + (of-object "GdkDisplay") + (c-name "gdk_display_pointer_ungrab") + (return-type "none") + (parameters + '("guint32" "time_") + ) +) + +(define-method keyboard_ungrab + (of-object "GdkDisplay") + (c-name "gdk_display_keyboard_ungrab") + (return-type "none") + (parameters + '("guint32" "time_") + ) +) + +(define-method pointer_is_grabbed + (of-object "GdkDisplay") + (c-name "gdk_display_pointer_is_grabbed") + (return-type "gboolean") +) + +(define-method beep + (of-object "GdkDisplay") + (c-name "gdk_display_beep") + (return-type "none") +) + +(define-method sync + (of-object "GdkDisplay") + (c-name "gdk_display_sync") + (return-type "none") +) + +(define-method flush + (of-object "GdkDisplay") + (c-name "gdk_display_flush") + (return-type "none") +) + +(define-method close + (of-object "GdkDisplay") + (c-name "gdk_display_close") + (return-type "none") +) + +(define-method list_devices + (of-object "GdkDisplay") + (c-name "gdk_display_list_devices") + (return-type "GList*") +) + +(define-method get_event + (of-object "GdkDisplay") + (c-name "gdk_display_get_event") + (return-type "GdkEvent*") +) + +(define-method peek_event + (of-object "GdkDisplay") + (c-name "gdk_display_peek_event") + (return-type "GdkEvent*") +) + +(define-method put_event + (of-object "GdkDisplay") + (c-name "gdk_display_put_event") + (return-type "none") + (parameters + '("GdkEvent*" "event") + ) +) + +(define-method add_client_message_filter + (of-object "GdkDisplay") + (c-name "gdk_display_add_client_message_filter") + (return-type "none") + (parameters + '("GdkAtom" "message_type") + '("GdkFilterFunc" "func") + '("gpointer" "data") + ) +) + +(define-method set_double_click_time + (of-object "GdkDisplay") + (c-name "gdk_display_set_double_click_time") + (return-type "none") + (parameters + '("guint" "msec") + ) +) + +(define-method set_double_click_distance + (of-object "GdkDisplay") + (c-name "gdk_display_set_double_click_distance") + (return-type "none") + (parameters + '("guint" "distance") + ) +) + +(define-function gdk_display_get_default + (c-name "gdk_display_get_default") + (return-type "GdkDisplay*") +) + +(define-method get_core_pointer + (of-object "GdkDisplay") + (c-name "gdk_display_get_core_pointer") + (return-type "GdkDevice*") +) + +(define-method get_pointer + (of-object "GdkDisplay") + (c-name "gdk_display_get_pointer") + (return-type "none") + (parameters + '("GdkScreen**" "screen") + '("gint*" "x") + '("gint*" "y") + '("GdkModifierType*" "mask") + ) +) + +(define-method get_window_at_pointer + (of-object "GdkDisplay") + (c-name "gdk_display_get_window_at_pointer") + (return-type "GdkWindow*") + (parameters + '("gint*" "win_x") + '("gint*" "win_y") + ) +) + +(define-method warp_pointer + (of-object "GdkDisplay") + (c-name "gdk_display_warp_pointer") + (return-type "none") + (parameters + '("GdkScreen*" "screen") + '("gint" "x") + '("gint" "y") + ) +) + +(define-method set_pointer_hooks + (of-object "GdkDisplay") + (c-name "gdk_display_set_pointer_hooks") + (return-type "GdkDisplayPointerHooks*") + (parameters + '("const-GdkDisplayPointerHooks*" "new_hooks") + ) +) + +(define-function gdk_display_open_default_libgtk_only + (c-name "gdk_display_open_default_libgtk_only") + (return-type "GdkDisplay*") +) + +(define-method supports_cursor_alpha + (of-object "GdkDisplay") + (c-name "gdk_display_supports_cursor_alpha") + (return-type "gboolean") +) + +(define-method supports_cursor_color + (of-object "GdkDisplay") + (c-name "gdk_display_supports_cursor_color") + (return-type "gboolean") +) + +(define-method get_default_cursor_size + (of-object "GdkDisplay") + (c-name "gdk_display_get_default_cursor_size") + (return-type "guint") +) + +(define-method get_maximal_cursor_size + (of-object "GdkDisplay") + (c-name "gdk_display_get_maximal_cursor_size") + (return-type "none") + (parameters + '("guint*" "width") + '("guint*" "height") + ) +) + +(define-method get_default_group + (of-object "GdkDisplay") + (c-name "gdk_display_get_default_group") + (return-type "GdkWindow*") +) + +(define-method supports_selection_notification + (of-object "GdkDisplay") + (c-name "gdk_display_supports_selection_notification") + (return-type "gboolean") +) + +(define-method request_selection_notification + (of-object "GdkDisplay") + (c-name "gdk_display_request_selection_notification") + (return-type "gboolean") + (parameters + '("GdkAtom" "selection") + ) +) + +(define-method supports_clipboard_persistence + (of-object "GdkDisplay") + (c-name "gdk_display_supports_clipboard_persistence") + (return-type "gboolean") +) + +(define-method store_clipboard + (of-object "GdkDisplay") + (c-name "gdk_display_store_clipboard") + (return-type "none") + (parameters + '("GdkWindow*" "clipboard_window") + '("guint32" "time_") + '("GdkAtom*" "targets") + '("gint" "n_targets") + ) +) + +(define-method supports_shapes + (of-object "GdkDisplay") + (c-name "gdk_display_supports_shapes") + (return-type "gboolean") +) + +(define-method supports_input_shapes + (of-object "GdkDisplay") + (c-name "gdk_display_supports_input_shapes") + (return-type "gboolean") +) + +(define-method supports_composite + (of-object "GdkDisplay") + (c-name "gdk_display_supports_composite") + (return-type "gboolean") +) + + + +;; From gdkdisplaymanager.h + +(define-function gdk_display_manager_get_type + (c-name "gdk_display_manager_get_type") + (return-type "GType") +) + +(define-function gdk_display_manager_get + (c-name "gdk_display_manager_get") + (return-type "GdkDisplayManager*") +) + +(define-method get_default_display + (of-object "GdkDisplayManager") + (c-name "gdk_display_manager_get_default_display") + (return-type "GdkDisplay*") +) + +(define-method set_default_display + (of-object "GdkDisplayManager") + (c-name "gdk_display_manager_set_default_display") + (return-type "none") + (parameters + '("GdkDisplay*" "display") + ) +) + +(define-method list_displays + (of-object "GdkDisplayManager") + (c-name "gdk_display_manager_list_displays") + (return-type "GSList*") +) + + + +;; From gdkdnd.h + +(define-function gdk_drag_context_get_type + (c-name "gdk_drag_context_get_type") + (return-type "GType") +) + +(define-function gdk_drag_context_new + (c-name "gdk_drag_context_new") + (is-constructor-of "GdkDragContext") + (return-type "GdkDragContext*") +) + +(define-method ref + (of-object "GdkDragContext") + (c-name "gdk_drag_context_ref") + (return-type "none") +) + +(define-method unref + (of-object "GdkDragContext") + (c-name "gdk_drag_context_unref") + (return-type "none") +) + +(define-function gdk_drag_status + (c-name "gdk_drag_status") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("GdkDragAction" "action") + '("guint32" "time_") + ) +) + +(define-function gdk_drop_reply + (c-name "gdk_drop_reply") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("gboolean" "ok") + '("guint32" "time_") + ) +) + +(define-function gdk_drop_finish + (c-name "gdk_drop_finish") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("gboolean" "success") + '("guint32" "time_") + ) +) + +(define-function gdk_drag_get_selection + (c-name "gdk_drag_get_selection") + (return-type "GdkAtom") + (parameters + '("GdkDragContext*" "context") + ) +) + +(define-function gdk_drag_begin + (c-name "gdk_drag_begin") + (return-type "GdkDragContext*") + (parameters + '("GdkWindow*" "window") + '("GList*" "targets") + ) +) + +(define-function gdk_drag_get_protocol_for_display + (c-name "gdk_drag_get_protocol_for_display") + (return-type "guint32") + (parameters + '("GdkDisplay*" "display") + '("guint32" "xid") + '("GdkDragProtocol*" "protocol") + ) +) + +(define-function gdk_drag_find_window_for_screen + (c-name "gdk_drag_find_window_for_screen") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("GdkWindow*" "drag_window") + '("GdkScreen*" "screen") + '("gint" "x_root") + '("gint" "y_root") + '("GdkWindow**" "dest_window") + '("GdkDragProtocol*" "protocol") + ) +) + +(define-function gdk_drag_get_protocol + (c-name "gdk_drag_get_protocol") + (return-type "guint32") + (parameters + '("guint32" "xid") + '("GdkDragProtocol*" "protocol") + ) +) + +(define-function gdk_drag_find_window + (c-name "gdk_drag_find_window") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("GdkWindow*" "drag_window") + '("gint" "x_root") + '("gint" "y_root") + '("GdkWindow**" "dest_window") + '("GdkDragProtocol*" "protocol") + ) +) + +(define-function gdk_drag_motion + (c-name "gdk_drag_motion") + (return-type "gboolean") + (parameters + '("GdkDragContext*" "context") + '("GdkWindow*" "dest_window") + '("GdkDragProtocol" "protocol") + '("gint" "x_root") + '("gint" "y_root") + '("GdkDragAction" "suggested_action") + '("GdkDragAction" "possible_actions") + '("guint32" "time_") + ) +) + +(define-function gdk_drag_drop + (c-name "gdk_drag_drop") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("guint32" "time_") + ) +) + +(define-function gdk_drag_abort + (c-name "gdk_drag_abort") + (return-type "none") + (parameters + '("GdkDragContext*" "context") + '("guint32" "time_") + ) +) + +(define-function gdk_drag_drop_succeeded + (c-name "gdk_drag_drop_succeeded") + (return-type "gboolean") + (parameters + '("GdkDragContext*" "context") + ) +) + + + +;; From gdkdrawable.h + +(define-function gdk_drawable_get_type + (c-name "gdk_drawable_get_type") + (return-type "GType") +) + +(define-method set_data + (of-object "GdkDrawable") + (c-name "gdk_drawable_set_data") + (return-type "none") + (parameters + '("const-gchar*" "key") + '("gpointer" "data") + '("GDestroyNotify" "destroy_func") + ) +) + +(define-method get_data + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_data") + (return-type "gpointer") + (parameters + '("const-gchar*" "key") + ) +) + +(define-method get_size + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_size") + (return-type "none") + (parameters + '("gint*" "width") + '("gint*" "height") + ) +) + +(define-method set_colormap + (of-object "GdkDrawable") + (c-name "gdk_drawable_set_colormap") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + ) +) + +(define-method get_colormap + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_colormap") + (return-type "GdkColormap*") +) + +(define-method get_visual + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_visual") + (return-type "GdkVisual*") +) + +(define-method get_depth + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_depth") + (return-type "gint") +) + +(define-method get_screen + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_screen") + (return-type "GdkScreen*") +) + +(define-method get_display + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_display") + (return-type "GdkDisplay*") +) + +(define-method ref + (of-object "GdkDrawable") + (c-name "gdk_drawable_ref") + (return-type "GdkDrawable*") +) + +(define-method unref + (of-object "GdkDrawable") + (c-name "gdk_drawable_unref") + (return-type "none") +) + +(define-function gdk_draw_point + (c-name "gdk_draw_point") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + ) +) + +(define-function gdk_draw_line + (c-name "gdk_draw_line") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x1_") + '("gint" "y1_") + '("gint" "x2_") + '("gint" "y2_") + ) +) + +(define-function gdk_draw_rectangle + (c-name "gdk_draw_rectangle") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gboolean" "filled") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-function gdk_draw_arc + (c-name "gdk_draw_arc") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gboolean" "filled") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("gint" "angle1") + '("gint" "angle2") + ) +) + +(define-function gdk_draw_polygon + (c-name "gdk_draw_polygon") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gboolean" "filled") + '("GdkPoint*" "points") + '("gint" "npoints") + ) +) + +(define-function gdk_draw_string + (c-name "gdk_draw_string") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkFont*" "font") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("const-gchar*" "string") + ) +) + +(define-function gdk_draw_text + (c-name "gdk_draw_text") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkFont*" "font") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("const-gchar*" "text") + '("gint" "text_length") + ) +) + +(define-function gdk_draw_text_wc + (c-name "gdk_draw_text_wc") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkFont*" "font") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("const-GdkWChar*" "text") + '("gint" "text_length") + ) +) + +(define-function gdk_draw_drawable + (c-name "gdk_draw_drawable") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkDrawable*" "src") + '("gint" "xsrc") + '("gint" "ysrc") + '("gint" "xdest") + '("gint" "ydest") + '("gint" "width") + '("gint" "height") + ) +) + +(define-function gdk_draw_image + (c-name "gdk_draw_image") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkImage*" "image") + '("gint" "xsrc") + '("gint" "ysrc") + '("gint" "xdest") + '("gint" "ydest") + '("gint" "width") + '("gint" "height") + ) +) + +(define-function gdk_draw_points + (c-name "gdk_draw_points") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkPoint*" "points") + '("gint" "npoints") + ) +) + +(define-function gdk_draw_segments + (c-name "gdk_draw_segments") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkSegment*" "segs") + '("gint" "nsegs") + ) +) + +(define-function gdk_draw_lines + (c-name "gdk_draw_lines") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkPoint*" "points") + '("gint" "npoints") + ) +) + +(define-function gdk_draw_pixbuf + (c-name "gdk_draw_pixbuf") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkPixbuf*" "pixbuf") + '("gint" "src_x") + '("gint" "src_y") + '("gint" "dest_x") + '("gint" "dest_y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dither") + '("gint" "x_dither") + '("gint" "y_dither") + ) +) + +(define-function gdk_draw_glyphs + (c-name "gdk_draw_glyphs") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("PangoFont*" "font") + '("gint" "x") + '("gint" "y") + '("PangoGlyphString*" "glyphs") + ) +) + +(define-function gdk_draw_layout_line + (c-name "gdk_draw_layout_line") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("PangoLayoutLine*" "line") + ) +) + +(define-function gdk_draw_layout + (c-name "gdk_draw_layout") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("PangoLayout*" "layout") + ) +) + +(define-function gdk_draw_layout_line_with_colors + (c-name "gdk_draw_layout_line_with_colors") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("PangoLayoutLine*" "line") + '("const-GdkColor*" "foreground") + '("const-GdkColor*" "background") + ) +) + +(define-function gdk_draw_layout_with_colors + (c-name "gdk_draw_layout_with_colors") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("PangoLayout*" "layout") + '("const-GdkColor*" "foreground") + '("const-GdkColor*" "background") + ) +) + +(define-function gdk_draw_glyphs_transformed + (c-name "gdk_draw_glyphs_transformed") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("PangoMatrix*" "matrix") + '("PangoFont*" "font") + '("gint" "x") + '("gint" "y") + '("PangoGlyphString*" "glyphs") + ) +) + +(define-function gdk_draw_trapezoids + (c-name "gdk_draw_trapezoids") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("GdkTrapezoid*" "trapezoids") + '("gint" "n_trapezoids") + ) +) + +(define-method get_image + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_image") + (return-type "GdkImage*") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-method copy_to_image + (of-object "GdkDrawable") + (c-name "gdk_drawable_copy_to_image") + (return-type "GdkImage*") + (parameters + '("GdkImage*" "image") + '("gint" "src_x") + '("gint" "src_y") + '("gint" "dest_x") + '("gint" "dest_y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-method get_clip_region + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_clip_region") + (return-type "GdkRegion*") +) + +(define-method get_visible_region + (of-object "GdkDrawable") + (c-name "gdk_drawable_get_visible_region") + (return-type "GdkRegion*") +) + + + +;; From gdkenumtypes.h + +(define-function gdk_cursor_type_get_type + (c-name "gdk_cursor_type_get_type") + (return-type "GType") +) + +(define-function gdk_drag_action_get_type + (c-name "gdk_drag_action_get_type") + (return-type "GType") +) + +(define-function gdk_drag_protocol_get_type + (c-name "gdk_drag_protocol_get_type") + (return-type "GType") +) + +(define-function gdk_filter_return_get_type + (c-name "gdk_filter_return_get_type") + (return-type "GType") +) + +(define-function gdk_event_type_get_type + (c-name "gdk_event_type_get_type") + (return-type "GType") +) + +(define-function gdk_event_mask_get_type + (c-name "gdk_event_mask_get_type") + (return-type "GType") +) + +(define-function gdk_visibility_state_get_type + (c-name "gdk_visibility_state_get_type") + (return-type "GType") +) + +(define-function gdk_scroll_direction_get_type + (c-name "gdk_scroll_direction_get_type") + (return-type "GType") +) + +(define-function gdk_notify_type_get_type + (c-name "gdk_notify_type_get_type") + (return-type "GType") +) + +(define-function gdk_crossing_mode_get_type + (c-name "gdk_crossing_mode_get_type") + (return-type "GType") +) + +(define-function gdk_property_state_get_type + (c-name "gdk_property_state_get_type") + (return-type "GType") +) + +(define-function gdk_window_state_get_type + (c-name "gdk_window_state_get_type") + (return-type "GType") +) + +(define-function gdk_setting_action_get_type + (c-name "gdk_setting_action_get_type") + (return-type "GType") +) + +(define-function gdk_owner_change_get_type + (c-name "gdk_owner_change_get_type") + (return-type "GType") +) + +(define-function gdk_font_type_get_type + (c-name "gdk_font_type_get_type") + (return-type "GType") +) + +(define-function gdk_cap_style_get_type + (c-name "gdk_cap_style_get_type") + (return-type "GType") +) + +(define-function gdk_fill_get_type + (c-name "gdk_fill_get_type") + (return-type "GType") +) + +(define-function gdk_function_get_type + (c-name "gdk_function_get_type") + (return-type "GType") +) + +(define-function gdk_join_style_get_type + (c-name "gdk_join_style_get_type") + (return-type "GType") +) + +(define-function gdk_line_style_get_type + (c-name "gdk_line_style_get_type") + (return-type "GType") +) + +(define-function gdk_subwindow_mode_get_type + (c-name "gdk_subwindow_mode_get_type") + (return-type "GType") +) + +(define-function gdk_gc_values_mask_get_type + (c-name "gdk_gc_values_mask_get_type") + (return-type "GType") +) + +(define-function gdk_image_type_get_type + (c-name "gdk_image_type_get_type") + (return-type "GType") +) + +(define-function gdk_extension_mode_get_type + (c-name "gdk_extension_mode_get_type") + (return-type "GType") +) + +(define-function gdk_input_source_get_type + (c-name "gdk_input_source_get_type") + (return-type "GType") +) + +(define-function gdk_input_mode_get_type + (c-name "gdk_input_mode_get_type") + (return-type "GType") +) + +(define-function gdk_axis_use_get_type + (c-name "gdk_axis_use_get_type") + (return-type "GType") +) + +(define-function gdk_prop_mode_get_type + (c-name "gdk_prop_mode_get_type") + (return-type "GType") +) + +(define-function gdk_fill_rule_get_type + (c-name "gdk_fill_rule_get_type") + (return-type "GType") +) + +(define-function gdk_overlap_type_get_type + (c-name "gdk_overlap_type_get_type") + (return-type "GType") +) + +(define-function gdk_rgb_dither_get_type + (c-name "gdk_rgb_dither_get_type") + (return-type "GType") +) + +(define-function gdk_byte_order_get_type + (c-name "gdk_byte_order_get_type") + (return-type "GType") +) + +(define-function gdk_modifier_type_get_type + (c-name "gdk_modifier_type_get_type") + (return-type "GType") +) + +(define-function gdk_input_condition_get_type + (c-name "gdk_input_condition_get_type") + (return-type "GType") +) + +(define-function gdk_status_get_type + (c-name "gdk_status_get_type") + (return-type "GType") +) + +(define-function gdk_grab_status_get_type + (c-name "gdk_grab_status_get_type") + (return-type "GType") +) + +(define-function gdk_visual_type_get_type + (c-name "gdk_visual_type_get_type") + (return-type "GType") +) + +(define-function gdk_window_class_get_type + (c-name "gdk_window_class_get_type") + (return-type "GType") +) + +(define-function gdk_window_type_get_type + (c-name "gdk_window_type_get_type") + (return-type "GType") +) + +(define-function gdk_window_attributes_type_get_type + (c-name "gdk_window_attributes_type_get_type") + (return-type "GType") +) + +(define-function gdk_window_hints_get_type + (c-name "gdk_window_hints_get_type") + (return-type "GType") +) + +(define-function gdk_window_type_hint_get_type + (c-name "gdk_window_type_hint_get_type") + (return-type "GType") +) + +(define-function gdk_wm_decoration_get_type + (c-name "gdk_wm_decoration_get_type") + (return-type "GType") +) + +(define-function gdk_wm_function_get_type + (c-name "gdk_wm_function_get_type") + (return-type "GType") +) + +(define-function gdk_gravity_get_type + (c-name "gdk_gravity_get_type") + (return-type "GType") +) + +(define-function gdk_window_edge_get_type + (c-name "gdk_window_edge_get_type") + (return-type "GType") +) + + + +;; From gdkevents.h + +(define-function gdk_event_get_type + (c-name "gdk_event_get_type") + (return-type "GType") +) + +(define-function gdk_events_pending + (c-name "gdk_events_pending") + (return-type "gboolean") +) + +(define-function gdk_event_get + (c-name "gdk_event_get") + (return-type "GdkEvent*") +) + +(define-function gdk_event_peek + (c-name "gdk_event_peek") + (return-type "GdkEvent*") +) + +(define-function gdk_event_get_graphics_expose + (c-name "gdk_event_get_graphics_expose") + (return-type "GdkEvent*") + (parameters + '("GdkWindow*" "window") + ) +) + +(define-method put + (of-object "GdkEvent") + (c-name "gdk_event_put") + (return-type "none") +) + +(define-function gdk_event_new + (c-name "gdk_event_new") + (is-constructor-of "GdkEvent") + (return-type "GdkEvent*") + (parameters + '("GdkEventType" "type") + ) +) + +(define-method copy + (of-object "GdkEvent") + (c-name "gdk_event_copy") + (return-type "GdkEvent*") +) + +(define-method free + (of-object "GdkEvent") + (c-name "gdk_event_free") + (return-type "none") +) + +(define-method get_time + (of-object "GdkEvent") + (c-name "gdk_event_get_time") + (return-type "guint32") +) + +(define-method get_state + (of-object "GdkEvent") + (c-name "gdk_event_get_state") + (return-type "gboolean") + (parameters + '("GdkModifierType*" "state") + ) +) + +(define-method get_coords + (of-object "GdkEvent") + (c-name "gdk_event_get_coords") + (return-type "gboolean") + (parameters + '("gdouble*" "x_win") + '("gdouble*" "y_win") + ) +) + +(define-method get_root_coords + (of-object "GdkEvent") + (c-name "gdk_event_get_root_coords") + (return-type "gboolean") + (parameters + '("gdouble*" "x_root") + '("gdouble*" "y_root") + ) +) + +(define-method get_axis + (of-object "GdkEvent") + (c-name "gdk_event_get_axis") + (return-type "gboolean") + (parameters + '("GdkAxisUse" "axis_use") + '("gdouble*" "value") + ) +) + +(define-function gdk_event_request_motions + (c-name "gdk_event_request_motions") + (return-type "none") + (parameters + '("GdkEventMotion*" "event") + ) +) + +(define-function gdk_event_handler_set + (c-name "gdk_event_handler_set") + (return-type "none") + (parameters + '("GdkEventFunc" "func") + '("gpointer" "data") + '("GDestroyNotify" "notify") + ) +) + +(define-method set_screen + (of-object "GdkEvent") + (c-name "gdk_event_set_screen") + (return-type "none") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-method get_screen + (of-object "GdkEvent") + (c-name "gdk_event_get_screen") + (return-type "GdkScreen*") +) + +(define-function gdk_set_show_events + (c-name "gdk_set_show_events") + (return-type "none") + (parameters + '("gboolean" "show_events") + ) +) + +(define-function gdk_get_show_events + (c-name "gdk_get_show_events") + (return-type "gboolean") +) + +(define-function gdk_add_client_message_filter + (c-name "gdk_add_client_message_filter") + (return-type "none") + (parameters + '("GdkAtom" "message_type") + '("GdkFilterFunc" "func") + '("gpointer" "data") + ) +) + +(define-function gdk_setting_get + (c-name "gdk_setting_get") + (return-type "gboolean") + (parameters + '("const-gchar*" "name") + '("GValue*" "value") + ) +) + + + +;; From gdkfont.h + +(define-function gdk_font_get_type + (c-name "gdk_font_get_type") + (return-type "GType") +) + +(define-method ref + (of-object "GdkFont") + (c-name "gdk_font_ref") + (return-type "GdkFont*") +) + +(define-method unref + (of-object "GdkFont") + (c-name "gdk_font_unref") + (return-type "none") +) + +(define-method id + (of-object "GdkFont") + (c-name "gdk_font_id") + (return-type "gint") +) + +(define-method equal + (of-object "GdkFont") + (c-name "gdk_font_equal") + (return-type "gboolean") + (parameters + '("const-GdkFont*" "fontb") + ) +) + +(define-function gdk_font_load_for_display + (c-name "gdk_font_load_for_display") + (return-type "GdkFont*") + (parameters + '("GdkDisplay*" "display") + '("const-gchar*" "font_name") + ) +) + +(define-function gdk_fontset_load_for_display + (c-name "gdk_fontset_load_for_display") + (return-type "GdkFont*") + (parameters + '("GdkDisplay*" "display") + '("const-gchar*" "fontset_name") + ) +) + +(define-function gdk_font_from_description_for_display + (c-name "gdk_font_from_description_for_display") + (return-type "GdkFont*") + (parameters + '("GdkDisplay*" "display") + '("PangoFontDescription*" "font_desc") + ) +) + +(define-function gdk_font_load + (c-name "gdk_font_load") + (return-type "GdkFont*") + (parameters + '("const-gchar*" "font_name") + ) +) + +(define-function gdk_fontset_load + (c-name "gdk_fontset_load") + (return-type "GdkFont*") + (parameters + '("const-gchar*" "fontset_name") + ) +) + +(define-function gdk_font_from_description + (c-name "gdk_font_from_description") + (return-type "GdkFont*") + (parameters + '("PangoFontDescription*" "font_desc") + ) +) + +(define-function gdk_string_width + (c-name "gdk_string_width") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "string") + ) +) + +(define-function gdk_text_width + (c-name "gdk_text_width") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "text") + '("gint" "text_length") + ) +) + +(define-function gdk_text_width_wc + (c-name "gdk_text_width_wc") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-GdkWChar*" "text") + '("gint" "text_length") + ) +) + +(define-function gdk_char_width + (c-name "gdk_char_width") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("gchar" "character") + ) +) + +(define-function gdk_char_width_wc + (c-name "gdk_char_width_wc") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("GdkWChar" "character") + ) +) + +(define-function gdk_string_measure + (c-name "gdk_string_measure") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "string") + ) +) + +(define-function gdk_text_measure + (c-name "gdk_text_measure") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "text") + '("gint" "text_length") + ) +) + +(define-function gdk_char_measure + (c-name "gdk_char_measure") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("gchar" "character") + ) +) + +(define-function gdk_string_height + (c-name "gdk_string_height") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "string") + ) +) + +(define-function gdk_text_height + (c-name "gdk_text_height") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "text") + '("gint" "text_length") + ) +) + +(define-function gdk_char_height + (c-name "gdk_char_height") + (return-type "gint") + (parameters + '("GdkFont*" "font") + '("gchar" "character") + ) +) + +(define-function gdk_text_extents + (c-name "gdk_text_extents") + (return-type "none") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "text") + '("gint" "text_length") + '("gint*" "lbearing") + '("gint*" "rbearing") + '("gint*" "width") + '("gint*" "ascent") + '("gint*" "descent") + ) +) + +(define-function gdk_text_extents_wc + (c-name "gdk_text_extents_wc") + (return-type "none") + (parameters + '("GdkFont*" "font") + '("const-GdkWChar*" "text") + '("gint" "text_length") + '("gint*" "lbearing") + '("gint*" "rbearing") + '("gint*" "width") + '("gint*" "ascent") + '("gint*" "descent") + ) +) + +(define-function gdk_string_extents + (c-name "gdk_string_extents") + (return-type "none") + (parameters + '("GdkFont*" "font") + '("const-gchar*" "string") + '("gint*" "lbearing") + '("gint*" "rbearing") + '("gint*" "width") + '("gint*" "ascent") + '("gint*" "descent") + ) +) + +(define-method get_display + (of-object "GdkFont") + (c-name "gdk_font_get_display") + (return-type "GdkDisplay*") +) + + + +;; From gdkgc.h + +(define-function gdk_gc_get_type + (c-name "gdk_gc_get_type") + (return-type "GType") +) + +(define-function gdk_gc_new + (c-name "gdk_gc_new") + (is-constructor-of "GdkGc") + (return-type "GdkGC*") + (parameters + '("GdkDrawable*" "drawable") + ) +) + +(define-function gdk_gc_new_with_values + (c-name "gdk_gc_new_with_values") + (return-type "GdkGC*") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGCValues*" "values") + '("GdkGCValuesMask" "values_mask") + ) +) + +(define-method ref + (of-object "GdkGC") + (c-name "gdk_gc_ref") + (return-type "GdkGC*") +) + +(define-method unref + (of-object "GdkGC") + (c-name "gdk_gc_unref") + (return-type "none") +) + +(define-method get_values + (of-object "GdkGC") + (c-name "gdk_gc_get_values") + (return-type "none") + (parameters + '("GdkGCValues*" "values") + ) +) + +(define-method set_values + (of-object "GdkGC") + (c-name "gdk_gc_set_values") + (return-type "none") + (parameters + '("GdkGCValues*" "values") + '("GdkGCValuesMask" "values_mask") + ) +) + +(define-method set_foreground + (of-object "GdkGC") + (c-name "gdk_gc_set_foreground") + (return-type "none") + (parameters + '("const-GdkColor*" "color") + ) +) + +(define-method set_background + (of-object "GdkGC") + (c-name "gdk_gc_set_background") + (return-type "none") + (parameters + '("const-GdkColor*" "color") + ) +) + +(define-method set_font + (of-object "GdkGC") + (c-name "gdk_gc_set_font") + (return-type "none") + (parameters + '("GdkFont*" "font") + ) +) + +(define-method set_function + (of-object "GdkGC") + (c-name "gdk_gc_set_function") + (return-type "none") + (parameters + '("GdkFunction" "function") + ) +) + +(define-method set_fill + (of-object "GdkGC") + (c-name "gdk_gc_set_fill") + (return-type "none") + (parameters + '("GdkFill" "fill") + ) +) + +(define-method set_tile + (of-object "GdkGC") + (c-name "gdk_gc_set_tile") + (return-type "none") + (parameters + '("GdkPixmap*" "tile") + ) +) + +(define-method set_stipple + (of-object "GdkGC") + (c-name "gdk_gc_set_stipple") + (return-type "none") + (parameters + '("GdkPixmap*" "stipple") + ) +) + +(define-method set_ts_origin + (of-object "GdkGC") + (c-name "gdk_gc_set_ts_origin") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + ) +) + +(define-method set_clip_origin + (of-object "GdkGC") + (c-name "gdk_gc_set_clip_origin") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + ) +) + +(define-method set_clip_mask + (of-object "GdkGC") + (c-name "gdk_gc_set_clip_mask") + (return-type "none") + (parameters + '("GdkBitmap*" "mask") + ) +) + +(define-method set_clip_rectangle + (of-object "GdkGC") + (c-name "gdk_gc_set_clip_rectangle") + (return-type "none") + (parameters + '("GdkRectangle*" "rectangle") + ) +) + +(define-method set_clip_region + (of-object "GdkGC") + (c-name "gdk_gc_set_clip_region") + (return-type "none") + (parameters + '("GdkRegion*" "region") + ) +) + +(define-method set_subwindow + (of-object "GdkGC") + (c-name "gdk_gc_set_subwindow") + (return-type "none") + (parameters + '("GdkSubwindowMode" "mode") + ) +) + +(define-method set_exposures + (of-object "GdkGC") + (c-name "gdk_gc_set_exposures") + (return-type "none") + (parameters + '("gboolean" "exposures") + ) +) + +(define-method set_line_attributes + (of-object "GdkGC") + (c-name "gdk_gc_set_line_attributes") + (return-type "none") + (parameters + '("gint" "line_width") + '("GdkLineStyle" "line_style") + '("GdkCapStyle" "cap_style") + '("GdkJoinStyle" "join_style") + ) +) + +(define-method set_dashes + (of-object "GdkGC") + (c-name "gdk_gc_set_dashes") + (return-type "none") + (parameters + '("gint" "dash_offset") + '("gint8[]" "dash_list") + '("gint" "n") + ) +) + +(define-method offset + (of-object "GdkGC") + (c-name "gdk_gc_offset") + (return-type "none") + (parameters + '("gint" "x_offset") + '("gint" "y_offset") + ) +) + +(define-method copy + (of-object "GdkGC") + (c-name "gdk_gc_copy") + (return-type "none") + (parameters + '("GdkGC*" "src_gc") + ) +) + +(define-method set_colormap + (of-object "GdkGC") + (c-name "gdk_gc_set_colormap") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + ) +) + +(define-method get_colormap + (of-object "GdkGC") + (c-name "gdk_gc_get_colormap") + (return-type "GdkColormap*") +) + +(define-method set_rgb_fg_color + (of-object "GdkGC") + (c-name "gdk_gc_set_rgb_fg_color") + (return-type "none") + (parameters + '("const-GdkColor*" "color") + ) +) + +(define-method set_rgb_bg_color + (of-object "GdkGC") + (c-name "gdk_gc_set_rgb_bg_color") + (return-type "none") + (parameters + '("const-GdkColor*" "color") + ) +) + +(define-method get_screen + (of-object "GdkGC") + (c-name "gdk_gc_get_screen") + (return-type "GdkScreen*") +) + + + +;; From gdk.h + +(define-function gdk_parse_args + (c-name "gdk_parse_args") + (return-type "none") + (parameters + '("gint*" "argc") + '("gchar***" "argv") + ) +) + +(define-function gdk_init + (c-name "gdk_init") + (return-type "none") + (parameters + '("gint*" "argc") + '("gchar***" "argv") + ) +) + +(define-function gdk_init_check + (c-name "gdk_init_check") + (return-type "gboolean") + (parameters + '("gint*" "argc") + '("gchar***" "argv") + ) +) + +(define-function gdk_add_option_entries_libgtk_only + (c-name "gdk_add_option_entries_libgtk_only") + (return-type "none") + (parameters + '("GOptionGroup*" "group") + ) +) + +(define-function gdk_pre_parse_libgtk_only + (c-name "gdk_pre_parse_libgtk_only") + (return-type "none") +) + +(define-function gdk_exit + (c-name "gdk_exit") + (return-type "none") + (parameters + '("gint" "error_code") + ) +) + +(define-function gdk_set_locale + (c-name "gdk_set_locale") + (return-type "gchar*") +) + +(define-function gdk_get_program_class + (c-name "gdk_get_program_class") + (return-type "const-char*") +) + +(define-function gdk_set_program_class + (c-name "gdk_set_program_class") + (return-type "none") + (parameters + '("const-char*" "program_class") + ) +) + +(define-function gdk_error_trap_push + (c-name "gdk_error_trap_push") + (return-type "none") +) + +(define-function gdk_error_trap_pop + (c-name "gdk_error_trap_pop") + (return-type "gint") +) + +(define-function gdk_set_use_xshm + (c-name "gdk_set_use_xshm") + (return-type "none") + (parameters + '("gboolean" "use_xshm") + ) +) + +(define-function gdk_get_use_xshm + (c-name "gdk_get_use_xshm") + (return-type "gboolean") +) + +(define-function gdk_get_display + (c-name "gdk_get_display") + (return-type "gchar*") +) + +(define-function gdk_get_display_arg_name + (c-name "gdk_get_display_arg_name") + (return-type "const-gchar*") +) + +(define-function gdk_input_add_full + (c-name "gdk_input_add_full") + (return-type "gint") + (parameters + '("gint" "source") + '("GdkInputCondition" "condition") + '("GdkInputFunction" "function") + '("gpointer" "data") + '("GdkDestroyNotify" "destroy") + ) +) + +(define-function gdk_input_add + (c-name "gdk_input_add") + (return-type "gint") + (parameters + '("gint" "source") + '("GdkInputCondition" "condition") + '("GdkInputFunction" "function") + '("gpointer" "data") + ) +) + +(define-function gdk_input_remove + (c-name "gdk_input_remove") + (return-type "none") + (parameters + '("gint" "tag") + ) +) + +(define-function gdk_pointer_grab + (c-name "gdk_pointer_grab") + (return-type "GdkGrabStatus") + (parameters + '("GdkWindow*" "window") + '("gboolean" "owner_events") + '("GdkEventMask" "event_mask") + '("GdkWindow*" "confine_to") + '("GdkCursor*" "cursor") + '("guint32" "time_") + ) +) + +(define-function gdk_keyboard_grab + (c-name "gdk_keyboard_grab") + (return-type "GdkGrabStatus") + (parameters + '("GdkWindow*" "window") + '("gboolean" "owner_events") + '("guint32" "time_") + ) +) + +(define-function gdk_pointer_grab_info_libgtk_only + (c-name "gdk_pointer_grab_info_libgtk_only") + (return-type "gboolean") + (parameters + '("GdkDisplay*" "display") + '("GdkWindow**" "grab_window") + '("gboolean*" "owner_events") + ) +) + +(define-function gdk_keyboard_grab_info_libgtk_only + (c-name "gdk_keyboard_grab_info_libgtk_only") + (return-type "gboolean") + (parameters + '("GdkDisplay*" "display") + '("GdkWindow**" "grab_window") + '("gboolean*" "owner_events") + ) +) + +(define-function gdk_pointer_ungrab + (c-name "gdk_pointer_ungrab") + (return-type "none") + (parameters + '("guint32" "time_") + ) +) + +(define-function gdk_keyboard_ungrab + (c-name "gdk_keyboard_ungrab") + (return-type "none") + (parameters + '("guint32" "time_") + ) +) + +(define-function gdk_pointer_is_grabbed + (c-name "gdk_pointer_is_grabbed") + (return-type "gboolean") +) + +(define-function gdk_screen_width + (c-name "gdk_screen_width") + (return-type "gint") +) + +(define-function gdk_screen_height + (c-name "gdk_screen_height") + (return-type "gint") +) + +(define-function gdk_screen_width_mm + (c-name "gdk_screen_width_mm") + (return-type "gint") +) + +(define-function gdk_screen_height_mm + (c-name "gdk_screen_height_mm") + (return-type "gint") +) + +(define-function gdk_beep + (c-name "gdk_beep") + (return-type "none") +) + +(define-function gdk_flush + (c-name "gdk_flush") + (return-type "none") +) + +(define-function gdk_set_double_click_time + (c-name "gdk_set_double_click_time") + (return-type "none") + (parameters + '("guint" "msec") + ) +) + +(define-method intersect + (of-object "GdkRectangle") + (c-name "gdk_rectangle_intersect") + (return-type "gboolean") + (parameters + '("GdkRectangle*" "src2") + '("GdkRectangle*" "dest") + ) +) + +(define-method union + (of-object "GdkRectangle") + (c-name "gdk_rectangle_union") + (return-type "none") + (parameters + '("GdkRectangle*" "src2") + '("GdkRectangle*" "dest") + ) +) + +(define-function gdk_rectangle_get_type + (c-name "gdk_rectangle_get_type") + (return-type "GType") +) + +(define-function gdk_wcstombs + (c-name "gdk_wcstombs") + (return-type "gchar*") + (parameters + '("const-GdkWChar*" "src") + ) +) + +(define-function gdk_mbstowcs + (c-name "gdk_mbstowcs") + (return-type "gint") + (parameters + '("GdkWChar*" "dest") + '("const-gchar*" "src") + '("gint" "dest_max") + ) +) + +(define-method send_client_message + (of-object "GdkEvent") + (c-name "gdk_event_send_client_message") + (return-type "gboolean") + (parameters + '("GdkNativeWindow" "winid") + ) +) + +(define-method send_clientmessage_toall + (of-object "GdkEvent") + (c-name "gdk_event_send_clientmessage_toall") + (return-type "none") +) + +(define-function gdk_event_send_client_message_for_display + (c-name "gdk_event_send_client_message_for_display") + (return-type "gboolean") + (parameters + '("GdkDisplay*" "display") + '("GdkEvent*" "event") + '("GdkNativeWindow" "winid") + ) +) + +(define-function gdk_notify_startup_complete + (c-name "gdk_notify_startup_complete") + (return-type "none") +) + +(define-function gdk_notify_startup_complete_with_id + (c-name "gdk_notify_startup_complete_with_id") + (return-type "none") + (parameters + '("const-gchar*" "startup_id") + ) +) + +(define-function gdk_threads_enter + (c-name "gdk_threads_enter") + (return-type "none") +) + +(define-function gdk_threads_leave + (c-name "gdk_threads_leave") + (return-type "none") +) + +(define-function gdk_threads_init + (c-name "gdk_threads_init") + (return-type "none") +) + +(define-function gdk_threads_set_lock_functions + (c-name "gdk_threads_set_lock_functions") + (return-type "none") + (parameters + '("GCallback" "enter_fn") + '("GCallback" "leave_fn") + ) +) + +(define-function gdk_threads_add_idle_full + (c-name "gdk_threads_add_idle_full") + (return-type "guint") + (parameters + '("gint" "priority") + '("GSourceFunc" "function") + '("gpointer" "data") + '("GDestroyNotify" "notify") + ) +) + +(define-function gdk_threads_add_idle + (c-name "gdk_threads_add_idle") + (return-type "guint") + (parameters + '("GSourceFunc" "function") + '("gpointer" "data") + ) +) + +(define-function gdk_threads_add_timeout_full + (c-name "gdk_threads_add_timeout_full") + (return-type "guint") + (parameters + '("gint" "priority") + '("guint" "interval") + '("GSourceFunc" "function") + '("gpointer" "data") + '("GDestroyNotify" "notify") + ) +) + +(define-function gdk_threads_add_timeout + (c-name "gdk_threads_add_timeout") + (return-type "guint") + (parameters + '("guint" "interval") + '("GSourceFunc" "function") + '("gpointer" "data") + ) +) + + + +;; From gdki18n.h + + + +;; From gdkimage.h + +(define-function gdk_image_get_type + (c-name "gdk_image_get_type") + (return-type "GType") +) + +(define-function gdk_image_new + (c-name "gdk_image_new") + (is-constructor-of "GdkImage") + (return-type "GdkImage*") + (parameters + '("GdkImageType" "type") + '("GdkVisual*" "visual") + '("gint" "width") + '("gint" "height") + ) +) + +(define-function gdk_image_get + (c-name "gdk_image_get") + (return-type "GdkImage*") + (parameters + '("GdkDrawable*" "drawable") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-method ref + (of-object "GdkImage") + (c-name "gdk_image_ref") + (return-type "GdkImage*") +) + +(define-method unref + (of-object "GdkImage") + (c-name "gdk_image_unref") + (return-type "none") +) + +(define-method put_pixel + (of-object "GdkImage") + (c-name "gdk_image_put_pixel") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + '("guint32" "pixel") + ) +) + +(define-method get_pixel + (of-object "GdkImage") + (c-name "gdk_image_get_pixel") + (return-type "guint32") + (parameters + '("gint" "x") + '("gint" "y") + ) +) + +(define-method set_colormap + (of-object "GdkImage") + (c-name "gdk_image_set_colormap") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + ) +) + +(define-method get_colormap + (of-object "GdkImage") + (c-name "gdk_image_get_colormap") + (return-type "GdkColormap*") +) + +(define-function gdk_image_new_bitmap + (c-name "gdk_image_new_bitmap") + (return-type "GdkImage*") + (parameters + '("GdkVisual*" "visual") + '("gpointer" "data") + '("gint" "width") + '("gint" "height") + ) +) + + + +;; From gdkinput.h + +(define-function gdk_device_get_type + (c-name "gdk_device_get_type") + (return-type "GType") +) + +(define-function gdk_devices_list + (c-name "gdk_devices_list") + (return-type "GList*") +) + +(define-method set_source + (of-object "GdkDevice") + (c-name "gdk_device_set_source") + (return-type "none") + (parameters + '("GdkInputSource" "source") + ) +) + +(define-method set_mode + (of-object "GdkDevice") + (c-name "gdk_device_set_mode") + (return-type "gboolean") + (parameters + '("GdkInputMode" "mode") + ) +) + +(define-method set_key + (of-object "GdkDevice") + (c-name "gdk_device_set_key") + (return-type "none") + (parameters + '("guint" "index_") + '("guint" "keyval") + '("GdkModifierType" "modifiers") + ) +) + +(define-method set_axis_use + (of-object "GdkDevice") + (c-name "gdk_device_set_axis_use") + (return-type "none") + (parameters + '("guint" "index_") + '("GdkAxisUse" "use") + ) +) + +(define-method get_state + (of-object "GdkDevice") + (c-name "gdk_device_get_state") + (return-type "none") + (parameters + '("GdkWindow*" "window") + '("gdouble*" "axes") + '("GdkModifierType*" "mask") + ) +) + +(define-method get_history + (of-object "GdkDevice") + (c-name "gdk_device_get_history") + (return-type "gboolean") + (parameters + '("GdkWindow*" "window") + '("guint32" "start") + '("guint32" "stop") + '("GdkTimeCoord***" "events") + '("gint*" "n_events") + ) +) + +(define-function gdk_device_free_history + (c-name "gdk_device_free_history") + (return-type "none") + (parameters + '("GdkTimeCoord**" "events") + '("gint" "n_events") + ) +) + +(define-method get_axis + (of-object "GdkDevice") + (c-name "gdk_device_get_axis") + (return-type "gboolean") + (parameters + '("gdouble*" "axes") + '("GdkAxisUse" "use") + '("gdouble*" "value") + ) +) + +(define-function gdk_input_set_extension_events + (c-name "gdk_input_set_extension_events") + (return-type "none") + (parameters + '("GdkWindow*" "window") + '("gint" "mask") + '("GdkExtensionMode" "mode") + ) +) + +(define-function gdk_device_get_core_pointer + (c-name "gdk_device_get_core_pointer") + (return-type "GdkDevice*") +) + + + +;; From gdkinternals.h + +(define-function gdk_synthesize_window_state + (c-name "gdk_synthesize_window_state") + (return-type "none") + (parameters + '("GdkWindow*" "window") + '("GdkWindowState" "unset_flags") + '("GdkWindowState" "set_flags") + ) +) + + + +;; From gdkintl.h + + + +;; From gdkkeys.h + +(define-function gdk_keymap_get_type + (c-name "gdk_keymap_get_type") + (return-type "GType") +) + +(define-function gdk_keymap_get_default + (c-name "gdk_keymap_get_default") + (return-type "GdkKeymap*") +) + +(define-function gdk_keymap_get_for_display + (c-name "gdk_keymap_get_for_display") + (return-type "GdkKeymap*") + (parameters + '("GdkDisplay*" "display") + ) +) + +(define-method lookup_key + (of-object "GdkKeymap") + (c-name "gdk_keymap_lookup_key") + (return-type "guint") + (parameters + '("const-GdkKeymapKey*" "key") + ) +) + +(define-method translate_keyboard_state + (of-object "GdkKeymap") + (c-name "gdk_keymap_translate_keyboard_state") + (return-type "gboolean") + (parameters + '("guint" "hardware_keycode") + '("GdkModifierType" "state") + '("gint" "group") + '("guint*" "keyval") + '("gint*" "effective_group") + '("gint*" "level") + '("GdkModifierType*" "consumed_modifiers") + ) +) + +(define-method get_entries_for_keyval + (of-object "GdkKeymap") + (c-name "gdk_keymap_get_entries_for_keyval") + (return-type "gboolean") + (parameters + '("guint" "keyval") + '("GdkKeymapKey**" "keys") + '("gint*" "n_keys") + ) +) + +(define-method get_entries_for_keycode + (of-object "GdkKeymap") + (c-name "gdk_keymap_get_entries_for_keycode") + (return-type "gboolean") + (parameters + '("guint" "hardware_keycode") + '("GdkKeymapKey**" "keys") + '("guint**" "keyvals") + '("gint*" "n_entries") + ) +) + +(define-method get_direction + (of-object "GdkKeymap") + (c-name "gdk_keymap_get_direction") + (return-type "PangoDirection") +) + +(define-method have_bidi_layouts + (of-object "GdkKeymap") + (c-name "gdk_keymap_have_bidi_layouts") + (return-type "gboolean") +) + +(define-function gdk_keyval_name + (c-name "gdk_keyval_name") + (return-type "gchar*") + (parameters + '("guint" "keyval") + ) +) + +(define-function gdk_keyval_from_name + (c-name "gdk_keyval_from_name") + (return-type "guint") + (parameters + '("const-gchar*" "keyval_name") + ) +) + +(define-function gdk_keyval_convert_case + (c-name "gdk_keyval_convert_case") + (return-type "none") + (parameters + '("guint" "symbol") + '("guint*" "lower") + '("guint*" "upper") + ) +) + +(define-function gdk_keyval_to_upper + (c-name "gdk_keyval_to_upper") + (return-type "guint") + (parameters + '("guint" "keyval") + ) +) + +(define-function gdk_keyval_to_lower + (c-name "gdk_keyval_to_lower") + (return-type "guint") + (parameters + '("guint" "keyval") + ) +) + +(define-function gdk_keyval_is_upper + (c-name "gdk_keyval_is_upper") + (return-type "gboolean") + (parameters + '("guint" "keyval") + ) +) + +(define-function gdk_keyval_is_lower + (c-name "gdk_keyval_is_lower") + (return-type "gboolean") + (parameters + '("guint" "keyval") + ) +) + +(define-function gdk_keyval_to_unicode + (c-name "gdk_keyval_to_unicode") + (return-type "guint32") + (parameters + '("guint" "keyval") + ) +) + +(define-function gdk_unicode_to_keyval + (c-name "gdk_unicode_to_keyval") + (return-type "guint") + (parameters + '("guint32" "wc") + ) +) + + + +;; From gdkkeysyms.h + + + +;; From gdkmarshalers.h + + + +;; From gdkmedialib.h + + + +;; From gdkpango.h + +(define-function gdk_pango_renderer_get_type + (c-name "gdk_pango_renderer_get_type") + (return-type "GType") +) + +(define-function gdk_pango_renderer_new + (c-name "gdk_pango_renderer_new") + (is-constructor-of "GdkPangoRenderer") + (return-type "PangoRenderer*") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-function gdk_pango_renderer_get_default + (c-name "gdk_pango_renderer_get_default") + (return-type "PangoRenderer*") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-method set_drawable + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_drawable") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + ) +) + +(define-method set_gc + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_gc") + (return-type "none") + (parameters + '("GdkGC*" "gc") + ) +) + +(define-method set_stipple + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_stipple") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("GdkBitmap*" "stipple") + ) +) + +(define-method set_override_color + (of-object "GdkPangoRenderer") + (c-name "gdk_pango_renderer_set_override_color") + (return-type "none") + (parameters + '("PangoRenderPart" "part") + '("const-GdkColor*" "color") + ) +) + +(define-function gdk_pango_context_get_for_screen + (c-name "gdk_pango_context_get_for_screen") + (return-type "PangoContext*") + (parameters + '("GdkScreen*" "screen") + ) +) + +(define-function gdk_pango_context_get + (c-name "gdk_pango_context_get") + (return-type "PangoContext*") +) + +(define-function gdk_pango_context_set_colormap + (c-name "gdk_pango_context_set_colormap") + (return-type "none") + (parameters + '("PangoContext*" "context") + '("GdkColormap*" "colormap") + ) +) + +(define-function gdk_pango_layout_line_get_clip_region + (c-name "gdk_pango_layout_line_get_clip_region") + (return-type "GdkRegion*") + (parameters + '("PangoLayoutLine*" "line") + '("gint" "x_origin") + '("gint" "y_origin") + '("gint*" "index_ranges") + '("gint" "n_ranges") + ) +) + +(define-function gdk_pango_layout_get_clip_region + (c-name "gdk_pango_layout_get_clip_region") + (return-type "GdkRegion*") + (parameters + '("PangoLayout*" "layout") + '("gint" "x_origin") + '("gint" "y_origin") + '("gint*" "index_ranges") + '("gint" "n_ranges") + ) +) + +(define-function gdk_pango_attr_stipple_new + (c-name "gdk_pango_attr_stipple_new") + (is-constructor-of "GdkPangoAttrStipple") + (return-type "PangoAttribute*") + (parameters + '("GdkBitmap*" "stipple") + ) +) + +(define-function gdk_pango_attr_embossed_new + (c-name "gdk_pango_attr_embossed_new") + (is-constructor-of "GdkPangoAttrEmbossed") + (return-type "PangoAttribute*") + (parameters + '("gboolean" "embossed") + ) +) + +(define-function gdk_pango_attr_emboss_color_new + (c-name "gdk_pango_attr_emboss_color_new") + (is-constructor-of "GdkPangoAttrEmbossColor") + (return-type "PangoAttribute*") + (parameters + '("const-GdkColor*" "color") + ) +) + + + +;; From gdkpixbuf.h + +(define-method render_threshold_alpha + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_render_threshold_alpha") + (return-type "none") + (parameters + '("GdkBitmap*" "bitmap") + '("int" "src_x") + '("int" "src_y") + '("int" "dest_x") + '("int" "dest_y") + '("int" "width") + '("int" "height") + '("int" "alpha_threshold") + ) +) + +(define-method render_to_drawable + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_render_to_drawable") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("int" "src_x") + '("int" "src_y") + '("int" "dest_x") + '("int" "dest_y") + '("int" "width") + '("int" "height") + '("GdkRgbDither" "dither") + '("int" "x_dither") + '("int" "y_dither") + ) +) + +(define-method render_to_drawable_alpha + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_render_to_drawable_alpha") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("int" "src_x") + '("int" "src_y") + '("int" "dest_x") + '("int" "dest_y") + '("int" "width") + '("int" "height") + '("GdkPixbufAlphaMode" "alpha_mode") + '("int" "alpha_threshold") + '("GdkRgbDither" "dither") + '("int" "x_dither") + '("int" "y_dither") + ) +) + +(define-method render_pixmap_and_mask_for_colormap + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_render_pixmap_and_mask_for_colormap") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + '("GdkPixmap**" "pixmap_return") + '("GdkBitmap**" "mask_return") + '("int" "alpha_threshold") + ) +) + +(define-method render_pixmap_and_mask + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_render_pixmap_and_mask") + (return-type "none") + (parameters + '("GdkPixmap**" "pixmap_return") + '("GdkBitmap**" "mask_return") + '("int" "alpha_threshold") + ) +) + +(define-method get_from_drawable + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_from_drawable") + (return-type "GdkPixbuf*") + (parameters + '("GdkDrawable*" "src") + '("GdkColormap*" "cmap") + '("int" "src_x") + '("int" "src_y") + '("int" "dest_x") + '("int" "dest_y") + '("int" "width") + '("int" "height") + ) +) + +(define-method get_from_image + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_from_image") + (return-type "GdkPixbuf*") + (parameters + '("GdkImage*" "src") + '("GdkColormap*" "cmap") + '("int" "src_x") + '("int" "src_y") + '("int" "dest_x") + '("int" "dest_y") + '("int" "width") + '("int" "height") + ) +) + + + +;; From gdkpixmap.h + +(define-function gdk_pixmap_get_type + (c-name "gdk_pixmap_get_type") + (return-type "GType") +) + +(define-function gdk_pixmap_new + (c-name "gdk_pixmap_new") + (is-constructor-of "GdkPixmap") + (return-type "GdkPixmap*") + (parameters + '("GdkDrawable*" "drawable") + '("gint" "width") + '("gint" "height") + '("gint" "depth") + ) +) + +(define-function gdk_bitmap_create_from_data + (c-name "gdk_bitmap_create_from_data") + (return-type "GdkBitmap*") + (parameters + '("GdkDrawable*" "drawable") + '("const-gchar*" "data") + '("gint" "width") + '("gint" "height") + ) +) + +(define-function gdk_pixmap_create_from_data + (c-name "gdk_pixmap_create_from_data") + (return-type "GdkPixmap*") + (parameters + '("GdkDrawable*" "drawable") + '("const-gchar*" "data") + '("gint" "width") + '("gint" "height") + '("gint" "depth") + '("const-GdkColor*" "fg") + '("const-GdkColor*" "bg") + ) +) + +(define-function gdk_pixmap_create_from_xpm + (c-name "gdk_pixmap_create_from_xpm") + (return-type "GdkPixmap*") + (parameters + '("GdkDrawable*" "drawable") + '("GdkBitmap**" "mask") + '("const-GdkColor*" "transparent_color") + '("const-gchar*" "filename") + ) +) + +(define-function gdk_pixmap_colormap_create_from_xpm + (c-name "gdk_pixmap_colormap_create_from_xpm") + (return-type "GdkPixmap*") + (parameters + '("GdkDrawable*" "drawable") + '("GdkColormap*" "colormap") + '("GdkBitmap**" "mask") + '("const-GdkColor*" "transparent_color") + '("const-gchar*" "filename") + ) +) + +(define-function gdk_pixmap_create_from_xpm_d + (c-name "gdk_pixmap_create_from_xpm_d") + (return-type "GdkPixmap*") + (parameters + '("GdkDrawable*" "drawable") + '("GdkBitmap**" "mask") + '("const-GdkColor*" "transparent_color") + '("gchar**" "data") + ) +) + +(define-function gdk_pixmap_colormap_create_from_xpm_d + (c-name "gdk_pixmap_colormap_create_from_xpm_d") + (return-type "GdkPixmap*") + (parameters + '("GdkDrawable*" "drawable") + '("GdkColormap*" "colormap") + '("GdkBitmap**" "mask") + '("const-GdkColor*" "transparent_color") + '("gchar**" "data") + ) +) + +(define-function gdk_pixmap_foreign_new + (c-name "gdk_pixmap_foreign_new") + (is-constructor-of "GdkPixmapForeign") + (return-type "GdkPixmap*") + (parameters + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_pixmap_lookup + (c-name "gdk_pixmap_lookup") + (return-type "GdkPixmap*") + (parameters + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_pixmap_foreign_new_for_display + (c-name "gdk_pixmap_foreign_new_for_display") + (return-type "GdkPixmap*") + (parameters + '("GdkDisplay*" "display") + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_pixmap_lookup_for_display + (c-name "gdk_pixmap_lookup_for_display") + (return-type "GdkPixmap*") + (parameters + '("GdkDisplay*" "display") + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_pixmap_foreign_new_for_screen + (c-name "gdk_pixmap_foreign_new_for_screen") + (return-type "GdkPixmap*") + (parameters + '("GdkScreen*" "screen") + '("GdkNativeWindow" "anid") + '("gint" "width") + '("gint" "height") + '("gint" "depth") + ) +) + + + +;; From gdkpoly-generic.h + + + +;; From gdkprivate.h + +(define-method destroy_notify + (of-object "GdkWindow") + (c-name "gdk_window_destroy_notify") + (return-type "none") +) + +(define-function gdk_synthesize_window_state + (c-name "gdk_synthesize_window_state") + (return-type "none") + (parameters + '("GdkWindow*" "window") + '("GdkWindowState" "unset_flags") + '("GdkWindowState" "set_flags") + ) +) + + + +;; From gdkproperty.h + +(define-function gdk_atom_intern + (c-name "gdk_atom_intern") + (return-type "GdkAtom") + (parameters + '("const-gchar*" "atom_name") + '("gboolean" "only_if_exists") + ) +) + +(define-function gdk_atom_intern_static_string + (c-name "gdk_atom_intern_static_string") + (return-type "GdkAtom") + (parameters + '("const-gchar*" "atom_name") + ) +) + +(define-method name + (of-object "GdkAtom") + (c-name "gdk_atom_name") + (return-type "gchar*") +) + +(define-function gdk_property_get + (c-name "gdk_property_get") + (return-type "gboolean") + (parameters + '("GdkWindow*" "window") + '("GdkAtom" "property") + '("GdkAtom" "type") + '("gulong" "offset") + '("gulong" "length") + '("gint" "pdelete") + '("GdkAtom*" "actual_property_type") + '("gint*" "actual_format") + '("gint*" "actual_length") + '("guchar**" "data") + ) +) + +(define-function gdk_property_change + (c-name "gdk_property_change") + (return-type "none") + (parameters + '("GdkWindow*" "window") + '("GdkAtom" "property") + '("GdkAtom" "type") + '("gint" "format") + '("GdkPropMode" "mode") + '("const-guchar*" "data") + '("gint" "nelements") + ) +) + +(define-function gdk_property_delete + (c-name "gdk_property_delete") + (return-type "none") + (parameters + '("GdkWindow*" "window") + '("GdkAtom" "property") + ) +) + +(define-function gdk_text_property_to_text_list + (c-name "gdk_text_property_to_text_list") + (return-type "gint") + (parameters + '("GdkAtom" "encoding") + '("gint" "format") + '("const-guchar*" "text") + '("gint" "length") + '("gchar***" "list") + ) +) + +(define-function gdk_text_property_to_utf8_list + (c-name "gdk_text_property_to_utf8_list") + (return-type "gint") + (parameters + '("GdkAtom" "encoding") + '("gint" "format") + '("const-guchar*" "text") + '("gint" "length") + '("gchar***" "list") + ) +) + +(define-function gdk_utf8_to_compound_text + (c-name "gdk_utf8_to_compound_text") + (return-type "gboolean") + (parameters + '("const-gchar*" "str") + '("GdkAtom*" "encoding") + '("gint*" "format") + '("guchar**" "ctext") + '("gint*" "length") + ) +) + +(define-function gdk_string_to_compound_text + (c-name "gdk_string_to_compound_text") + (return-type "gint") + (parameters + '("const-gchar*" "str") + '("GdkAtom*" "encoding") + '("gint*" "format") + '("guchar**" "ctext") + '("gint*" "length") + ) +) + +(define-function gdk_text_property_to_text_list_for_display + (c-name "gdk_text_property_to_text_list_for_display") + (return-type "gint") + (parameters + '("GdkDisplay*" "display") + '("GdkAtom" "encoding") + '("gint" "format") + '("const-guchar*" "text") + '("gint" "length") + '("gchar***" "list") + ) +) + +(define-function gdk_text_property_to_utf8_list_for_display + (c-name "gdk_text_property_to_utf8_list_for_display") + (return-type "gint") + (parameters + '("GdkDisplay*" "display") + '("GdkAtom" "encoding") + '("gint" "format") + '("const-guchar*" "text") + '("gint" "length") + '("gchar***" "list") + ) +) + +(define-function gdk_utf8_to_string_target + (c-name "gdk_utf8_to_string_target") + (return-type "gchar*") + (parameters + '("const-gchar*" "str") + ) +) + +(define-function gdk_string_to_compound_text_for_display + (c-name "gdk_string_to_compound_text_for_display") + (return-type "gint") + (parameters + '("GdkDisplay*" "display") + '("const-gchar*" "str") + '("GdkAtom*" "encoding") + '("gint*" "format") + '("guchar**" "ctext") + '("gint*" "length") + ) +) + +(define-function gdk_utf8_to_compound_text_for_display + (c-name "gdk_utf8_to_compound_text_for_display") + (return-type "gboolean") + (parameters + '("GdkDisplay*" "display") + '("const-gchar*" "str") + '("GdkAtom*" "encoding") + '("gint*" "format") + '("guchar**" "ctext") + '("gint*" "length") + ) +) + +(define-function gdk_free_text_list + (c-name "gdk_free_text_list") + (return-type "none") + (parameters + '("gchar**" "list") + ) +) + +(define-function gdk_free_compound_text + (c-name "gdk_free_compound_text") + (return-type "none") + (parameters + '("guchar*" "ctext") + ) +) + + + +;; From gdkregion-generic.h + + + +;; From gdkregion.h + +(define-function gdk_region_new + (c-name "gdk_region_new") + (is-constructor-of "GdkRegion") + (return-type "GdkRegion*") +) + +(define-function gdk_region_polygon + (c-name "gdk_region_polygon") + (return-type "GdkRegion*") + (parameters + '("GdkPoint*" "points") + '("gint" "npoints") + '("GdkFillRule" "fill_rule") + ) +) + +(define-method copy + (of-object "GdkRegion") + (c-name "gdk_region_copy") + (return-type "GdkRegion*") +) + +(define-function gdk_region_rectangle + (c-name "gdk_region_rectangle") + (return-type "GdkRegion*") + (parameters + '("GdkRectangle*" "rectangle") + ) +) + +(define-method destroy + (of-object "GdkRegion") + (c-name "gdk_region_destroy") + (return-type "none") +) + +(define-method get_clipbox + (of-object "GdkRegion") + (c-name "gdk_region_get_clipbox") + (return-type "none") + (parameters + '("GdkRectangle*" "rectangle") + ) +) + +(define-method get_rectangles + (of-object "GdkRegion") + (c-name "gdk_region_get_rectangles") + (return-type "none") + (parameters + '("GdkRectangle**" "rectangles") + '("gint*" "n_rectangles") + ) +) + +(define-method empty + (of-object "GdkRegion") + (c-name "gdk_region_empty") + (return-type "gboolean") +) + +(define-method equal + (of-object "GdkRegion") + (c-name "gdk_region_equal") + (return-type "gboolean") + (parameters + '("GdkRegion*" "region2") + ) +) + +(define-method point_in + (of-object "GdkRegion") + (c-name "gdk_region_point_in") + (return-type "gboolean") + (parameters + '("int" "x") + '("int" "y") + ) +) + +(define-method rect_in + (of-object "GdkRegion") + (c-name "gdk_region_rect_in") + (return-type "GdkOverlapType") + (parameters + '("GdkRectangle*" "rectangle") + ) +) + +(define-method offset + (of-object "GdkRegion") + (c-name "gdk_region_offset") + (return-type "none") + (parameters + '("gint" "dx") + '("gint" "dy") + ) +) + +(define-method shrink + (of-object "GdkRegion") + (c-name "gdk_region_shrink") + (return-type "none") + (parameters + '("gint" "dx") + '("gint" "dy") + ) +) + +(define-method union_with_rect + (of-object "GdkRegion") + (c-name "gdk_region_union_with_rect") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) +) + +(define-method intersect + (of-object "GdkRegion") + (c-name "gdk_region_intersect") + (return-type "none") + (parameters + '("GdkRegion*" "source2") + ) +) + +(define-method union + (of-object "GdkRegion") + (c-name "gdk_region_union") + (return-type "none") + (parameters + '("GdkRegion*" "source2") + ) +) + +(define-method subtract + (of-object "GdkRegion") + (c-name "gdk_region_subtract") + (return-type "none") + (parameters + '("GdkRegion*" "source2") + ) +) + +(define-method xor + (of-object "GdkRegion") + (c-name "gdk_region_xor") + (return-type "none") + (parameters + '("GdkRegion*" "source2") + ) +) + +(define-method spans_intersect_foreach + (of-object "GdkRegion") + (c-name "gdk_region_spans_intersect_foreach") + (return-type "none") + (parameters + '("GdkSpan*" "spans") + '("int" "n_spans") + '("gboolean" "sorted") + '("GdkSpanFunc" "function") + '("gpointer" "data") + ) +) + + + +;; From gdkrgb.h + +(define-function gdk_rgb_init + (c-name "gdk_rgb_init") + (return-type "none") +) + +(define-function gdk_rgb_xpixel_from_rgb + (c-name "gdk_rgb_xpixel_from_rgb") + (return-type "gulong") + (parameters + '("guint32" "rgb") + ) +) + +(define-function gdk_rgb_gc_set_foreground + (c-name "gdk_rgb_gc_set_foreground") + (return-type "none") + (parameters + '("GdkGC*" "gc") + '("guint32" "rgb") + ) +) + +(define-function gdk_rgb_gc_set_background + (c-name "gdk_rgb_gc_set_background") + (return-type "none") + (parameters + '("GdkGC*" "gc") + '("guint32" "rgb") + ) +) + +(define-function gdk_rgb_find_color + (c-name "gdk_rgb_find_color") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + '("GdkColor*" "color") + ) +) + +(define-function gdk_draw_rgb_image + (c-name "gdk_draw_rgb_image") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dith") + '("guchar*" "rgb_buf") + '("gint" "rowstride") + ) +) + +(define-function gdk_draw_rgb_image_dithalign + (c-name "gdk_draw_rgb_image_dithalign") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dith") + '("guchar*" "rgb_buf") + '("gint" "rowstride") + '("gint" "xdith") + '("gint" "ydith") + ) +) + +(define-function gdk_draw_rgb_32_image + (c-name "gdk_draw_rgb_32_image") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dith") + '("guchar*" "buf") + '("gint" "rowstride") + ) +) + +(define-function gdk_draw_rgb_32_image_dithalign + (c-name "gdk_draw_rgb_32_image_dithalign") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dith") + '("guchar*" "buf") + '("gint" "rowstride") + '("gint" "xdith") + '("gint" "ydith") + ) +) + +(define-function gdk_draw_gray_image + (c-name "gdk_draw_gray_image") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dith") + '("guchar*" "buf") + '("gint" "rowstride") + ) +) + +(define-function gdk_draw_indexed_image + (c-name "gdk_draw_indexed_image") + (return-type "none") + (parameters + '("GdkDrawable*" "drawable") + '("GdkGC*" "gc") + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + '("GdkRgbDither" "dith") + '("guchar*" "buf") + '("gint" "rowstride") + '("GdkRgbCmap*" "cmap") + ) +) + +(define-function gdk_rgb_cmap_new + (c-name "gdk_rgb_cmap_new") + (is-constructor-of "GdkRgbCmap") + (return-type "GdkRgbCmap*") + (parameters + '("guint32*" "colors") + '("gint" "n_colors") + ) +) + +(define-method free + (of-object "GdkRgbCmap") + (c-name "gdk_rgb_cmap_free") + (return-type "none") +) + +(define-function gdk_rgb_set_verbose + (c-name "gdk_rgb_set_verbose") + (return-type "none") + (parameters + '("gboolean" "verbose") + ) +) + +(define-function gdk_rgb_set_install + (c-name "gdk_rgb_set_install") + (return-type "none") + (parameters + '("gboolean" "install") + ) +) + +(define-function gdk_rgb_set_min_colors + (c-name "gdk_rgb_set_min_colors") + (return-type "none") + (parameters + '("gint" "min_colors") + ) +) + +(define-function gdk_rgb_get_colormap + (c-name "gdk_rgb_get_colormap") + (return-type "GdkColormap*") +) + +(define-function gdk_rgb_get_visual + (c-name "gdk_rgb_get_visual") + (return-type "GdkVisual*") +) + +(define-function gdk_rgb_ditherable + (c-name "gdk_rgb_ditherable") + (return-type "gboolean") +) + +(define-function gdk_rgb_colormap_ditherable + (c-name "gdk_rgb_colormap_ditherable") + (return-type "gboolean") + (parameters + '("GdkColormap*" "cmap") + ) +) + + + +;; From gdkscreen.h + +(define-function gdk_screen_get_type + (c-name "gdk_screen_get_type") + (return-type "GType") +) + +(define-method get_default_colormap + (of-object "GdkScreen") + (c-name "gdk_screen_get_default_colormap") + (return-type "GdkColormap*") +) + +(define-method set_default_colormap + (of-object "GdkScreen") + (c-name "gdk_screen_set_default_colormap") + (return-type "none") + (parameters + '("GdkColormap*" "colormap") + ) +) + +(define-method get_system_colormap + (of-object "GdkScreen") + (c-name "gdk_screen_get_system_colormap") + (return-type "GdkColormap*") +) + +(define-method get_system_visual + (of-object "GdkScreen") + (c-name "gdk_screen_get_system_visual") + (return-type "GdkVisual*") +) + +(define-method get_rgb_colormap + (of-object "GdkScreen") + (c-name "gdk_screen_get_rgb_colormap") + (return-type "GdkColormap*") +) + +(define-method get_rgb_visual + (of-object "GdkScreen") + (c-name "gdk_screen_get_rgb_visual") + (return-type "GdkVisual*") +) + +(define-method get_rgba_colormap + (of-object "GdkScreen") + (c-name "gdk_screen_get_rgba_colormap") + (return-type "GdkColormap*") +) + +(define-method get_rgba_visual + (of-object "GdkScreen") + (c-name "gdk_screen_get_rgba_visual") + (return-type "GdkVisual*") +) + +(define-method is_composited + (of-object "GdkScreen") + (c-name "gdk_screen_is_composited") + (return-type "gboolean") +) + +(define-method get_root_window + (of-object "GdkScreen") + (c-name "gdk_screen_get_root_window") + (return-type "GdkWindow*") +) + +(define-method get_display + (of-object "GdkScreen") + (c-name "gdk_screen_get_display") + (return-type "GdkDisplay*") +) + +(define-method get_number + (of-object "GdkScreen") + (c-name "gdk_screen_get_number") + (return-type "gint") +) + +(define-method get_width + (of-object "GdkScreen") + (c-name "gdk_screen_get_width") + (return-type "gint") +) + +(define-method get_height + (of-object "GdkScreen") + (c-name "gdk_screen_get_height") + (return-type "gint") +) + +(define-method get_width_mm + (of-object "GdkScreen") + (c-name "gdk_screen_get_width_mm") + (return-type "gint") +) + +(define-method get_height_mm + (of-object "GdkScreen") + (c-name "gdk_screen_get_height_mm") + (return-type "gint") +) + +(define-method list_visuals + (of-object "GdkScreen") + (c-name "gdk_screen_list_visuals") + (return-type "GList*") +) + +(define-method get_toplevel_windows + (of-object "GdkScreen") + (c-name "gdk_screen_get_toplevel_windows") + (return-type "GList*") +) + +(define-method make_display_name + (of-object "GdkScreen") + (c-name "gdk_screen_make_display_name") + (return-type "gchar*") +) + +(define-method get_n_monitors + (of-object "GdkScreen") + (c-name "gdk_screen_get_n_monitors") + (return-type "gint") +) + +(define-method get_monitor_geometry + (of-object "GdkScreen") + (c-name "gdk_screen_get_monitor_geometry") + (return-type "none") + (parameters + '("gint" "monitor_num") + '("GdkRectangle*" "dest") + ) +) + +(define-method get_monitor_at_point + (of-object "GdkScreen") + (c-name "gdk_screen_get_monitor_at_point") + (return-type "gint") + (parameters + '("gint" "x") + '("gint" "y") + ) +) + +(define-method get_monitor_at_window + (of-object "GdkScreen") + (c-name "gdk_screen_get_monitor_at_window") + (return-type "gint") + (parameters + '("GdkWindow*" "window") + ) +) + +(define-method broadcast_client_message + (of-object "GdkScreen") + (c-name "gdk_screen_broadcast_client_message") + (return-type "none") + (parameters + '("GdkEvent*" "event") + ) +) + +(define-function gdk_screen_get_default + (c-name "gdk_screen_get_default") + (return-type "GdkScreen*") +) + +(define-method get_setting + (of-object "GdkScreen") + (c-name "gdk_screen_get_setting") + (return-type "gboolean") + (parameters + '("const-gchar*" "name") + '("GValue*" "value") + ) +) + +(define-method set_font_options + (of-object "GdkScreen") + (c-name "gdk_screen_set_font_options") + (return-type "none") + (parameters + '("const-cairo_font_options_t*" "options") + ) +) + +(define-method get_font_options + (of-object "GdkScreen") + (c-name "gdk_screen_get_font_options") + (return-type "const-cairo_font_options_t*") +) + +(define-method set_resolution + (of-object "GdkScreen") + (c-name "gdk_screen_set_resolution") + (return-type "none") + (parameters + '("gdouble" "dpi") + ) +) + +(define-method get_resolution + (of-object "GdkScreen") + (c-name "gdk_screen_get_resolution") + (return-type "gdouble") +) + +(define-method get_active_window + (of-object "GdkScreen") + (c-name "gdk_screen_get_active_window") + (return-type "GdkWindow*") +) + +(define-method get_window_stack + (of-object "GdkScreen") + (c-name "gdk_screen_get_window_stack") + (return-type "GList*") +) + + + +;; From gdkselection.h + +(define-function gdk_selection_owner_set + (c-name "gdk_selection_owner_set") + (return-type "gboolean") + (parameters + '("GdkWindow*" "owner") + '("GdkAtom" "selection") + '("guint32" "time_") + '("gboolean" "send_event") + ) +) + +(define-function gdk_selection_owner_get + (c-name "gdk_selection_owner_get") + (return-type "GdkWindow*") + (parameters + '("GdkAtom" "selection") + ) +) + +(define-function gdk_selection_owner_set_for_display + (c-name "gdk_selection_owner_set_for_display") + (return-type "gboolean") + (parameters + '("GdkDisplay*" "display") + '("GdkWindow*" "owner") + '("GdkAtom" "selection") + '("guint32" "time_") + '("gboolean" "send_event") + ) +) + +(define-function gdk_selection_owner_get_for_display + (c-name "gdk_selection_owner_get_for_display") + (return-type "GdkWindow*") + (parameters + '("GdkDisplay*" "display") + '("GdkAtom" "selection") + ) +) + +(define-function gdk_selection_convert + (c-name "gdk_selection_convert") + (return-type "none") + (parameters + '("GdkWindow*" "requestor") + '("GdkAtom" "selection") + '("GdkAtom" "target") + '("guint32" "time_") + ) +) + +(define-function gdk_selection_property_get + (c-name "gdk_selection_property_get") + (return-type "gboolean") + (parameters + '("GdkWindow*" "requestor") + '("guchar**" "data") + '("GdkAtom*" "prop_type") + '("gint*" "prop_format") + ) +) + +(define-function gdk_selection_send_notify + (c-name "gdk_selection_send_notify") + (return-type "none") + (parameters + '("guint32" "requestor") + '("GdkAtom" "selection") + '("GdkAtom" "target") + '("GdkAtom" "property") + '("guint32" "time_") + ) +) + +(define-function gdk_selection_send_notify_for_display + (c-name "gdk_selection_send_notify_for_display") + (return-type "none") + (parameters + '("GdkDisplay*" "display") + '("guint32" "requestor") + '("GdkAtom" "selection") + '("GdkAtom" "target") + '("GdkAtom" "property") + '("guint32" "time_") + ) +) + + + +;; From gdkspawn.h + +(define-function gdk_spawn_on_screen + (c-name "gdk_spawn_on_screen") + (return-type "gboolean") + (parameters + '("GdkScreen*" "screen") + '("const-gchar*" "working_directory") + '("gchar**" "argv") + '("gchar**" "envp") + '("GSpawnFlags" "flags") + '("GSpawnChildSetupFunc" "child_setup") + '("gpointer" "user_data") + '("gint*" "child_pid") + '("GError**" "error") + ) +) + +(define-function gdk_spawn_on_screen_with_pipes + (c-name "gdk_spawn_on_screen_with_pipes") + (return-type "gboolean") + (parameters + '("GdkScreen*" "screen") + '("const-gchar*" "working_directory") + '("gchar**" "argv") + '("gchar**" "envp") + '("GSpawnFlags" "flags") + '("GSpawnChildSetupFunc" "child_setup") + '("gpointer" "user_data") + '("gint*" "child_pid") + '("gint*" "standard_input") + '("gint*" "standard_output") + '("gint*" "standard_error") + '("GError**" "error") + ) +) + +(define-function gdk_spawn_command_line_on_screen + (c-name "gdk_spawn_command_line_on_screen") + (return-type "gboolean") + (parameters + '("GdkScreen*" "screen") + '("const-gchar*" "command_line") + '("GError**" "error") + ) +) + + + +;; From gdktypes.h + + + +;; From gdkvisual.h + +(define-function gdk_visual_get_type + (c-name "gdk_visual_get_type") + (return-type "GType") +) + +(define-function gdk_visual_get_best_depth + (c-name "gdk_visual_get_best_depth") + (return-type "gint") +) + +(define-function gdk_visual_get_best_type + (c-name "gdk_visual_get_best_type") + (return-type "GdkVisualType") +) + +(define-function gdk_visual_get_system + (c-name "gdk_visual_get_system") + (return-type "GdkVisual*") +) + +(define-function gdk_visual_get_best + (c-name "gdk_visual_get_best") + (return-type "GdkVisual*") +) + +(define-function gdk_visual_get_best_with_depth + (c-name "gdk_visual_get_best_with_depth") + (return-type "GdkVisual*") + (parameters + '("gint" "depth") + ) +) + +(define-function gdk_visual_get_best_with_type + (c-name "gdk_visual_get_best_with_type") + (return-type "GdkVisual*") + (parameters + '("GdkVisualType" "visual_type") + ) +) + +(define-function gdk_visual_get_best_with_both + (c-name "gdk_visual_get_best_with_both") + (return-type "GdkVisual*") + (parameters + '("gint" "depth") + '("GdkVisualType" "visual_type") + ) +) + +(define-function gdk_query_depths + (c-name "gdk_query_depths") + (return-type "none") + (parameters + '("gint**" "depths") + '("gint*" "count") + ) +) + +(define-function gdk_query_visual_types + (c-name "gdk_query_visual_types") + (return-type "none") + (parameters + '("GdkVisualType**" "visual_types") + '("gint*" "count") + ) +) + +(define-function gdk_list_visuals + (c-name "gdk_list_visuals") + (return-type "GList*") +) + +(define-method get_screen + (of-object "GdkVisual") + (c-name "gdk_visual_get_screen") + (return-type "GdkScreen*") +) + + + +;; From gdkwindow.h + +(define-function gdk_window_object_get_type + (c-name "gdk_window_object_get_type") + (return-type "GType") +) + +(define-method new + (of-object "GdkWindow") + (c-name "gdk_window_new") + (return-type "GdkWindow*") + (parameters + '("GdkWindowAttr*" "attributes") + '("gint" "attributes_mask") + ) +) + +(define-method destroy + (of-object "GdkWindow") + (c-name "gdk_window_destroy") + (return-type "none") +) + +(define-method get_window_type + (of-object "GdkWindow") + (c-name "gdk_window_get_window_type") + (return-type "GdkWindowType") +) + +(define-function gdk_window_at_pointer + (c-name "gdk_window_at_pointer") + (return-type "GdkWindow*") + (parameters + '("gint*" "win_x") + '("gint*" "win_y") + ) +) + +(define-method show + (of-object "GdkWindow") + (c-name "gdk_window_show") + (return-type "none") +) + +(define-method hide + (of-object "GdkWindow") + (c-name "gdk_window_hide") + (return-type "none") +) + +(define-method withdraw + (of-object "GdkWindow") + (c-name "gdk_window_withdraw") + (return-type "none") +) + +(define-method show_unraised + (of-object "GdkWindow") + (c-name "gdk_window_show_unraised") + (return-type "none") +) + +(define-method move + (of-object "GdkWindow") + (c-name "gdk_window_move") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + ) +) + +(define-method resize + (of-object "GdkWindow") + (c-name "gdk_window_resize") + (return-type "none") + (parameters + '("gint" "width") + '("gint" "height") + ) +) + +(define-method move_resize + (of-object "GdkWindow") + (c-name "gdk_window_move_resize") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-method reparent + (of-object "GdkWindow") + (c-name "gdk_window_reparent") + (return-type "none") + (parameters + '("GdkWindow*" "new_parent") + '("gint" "x") + '("gint" "y") + ) +) + +(define-method clear + (of-object "GdkWindow") + (c-name "gdk_window_clear") + (return-type "none") +) + +(define-method clear_area + (of-object "GdkWindow") + (c-name "gdk_window_clear_area") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-method clear_area_e + (of-object "GdkWindow") + (c-name "gdk_window_clear_area_e") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "width") + '("gint" "height") + ) +) + +(define-method raise + (of-object "GdkWindow") + (c-name "gdk_window_raise") + (return-type "none") +) + +(define-method lower + (of-object "GdkWindow") + (c-name "gdk_window_lower") + (return-type "none") +) + +(define-method focus + (of-object "GdkWindow") + (c-name "gdk_window_focus") + (return-type "none") + (parameters + '("guint32" "timestamp") + ) +) + +(define-method set_user_data + (of-object "GdkWindow") + (c-name "gdk_window_set_user_data") + (return-type "none") + (parameters + '("gpointer" "user_data") + ) +) + +(define-method set_override_redirect + (of-object "GdkWindow") + (c-name "gdk_window_set_override_redirect") + (return-type "none") + (parameters + '("gboolean" "override_redirect") + ) +) + +(define-method set_accept_focus + (of-object "GdkWindow") + (c-name "gdk_window_set_accept_focus") + (return-type "none") + (parameters + '("gboolean" "accept_focus") + ) +) + +(define-method set_focus_on_map + (of-object "GdkWindow") + (c-name "gdk_window_set_focus_on_map") + (return-type "none") + (parameters + '("gboolean" "focus_on_map") + ) +) + +(define-method add_filter + (of-object "GdkWindow") + (c-name "gdk_window_add_filter") + (return-type "none") + (parameters + '("GdkFilterFunc" "function") + '("gpointer" "data") + ) +) + +(define-method remove_filter + (of-object "GdkWindow") + (c-name "gdk_window_remove_filter") + (return-type "none") + (parameters + '("GdkFilterFunc" "function") + '("gpointer" "data") + ) +) + +(define-method scroll + (of-object "GdkWindow") + (c-name "gdk_window_scroll") + (return-type "none") + (parameters + '("gint" "dx") + '("gint" "dy") + ) +) + +(define-method move_region + (of-object "GdkWindow") + (c-name "gdk_window_move_region") + (return-type "none") + (parameters + '("GdkRegion*" "region") + '("gint" "dx") + '("gint" "dy") + ) +) + +(define-method shape_combine_mask + (of-object "GdkWindow") + (c-name "gdk_window_shape_combine_mask") + (return-type "none") + (parameters + '("GdkBitmap*" "mask") + '("gint" "x") + '("gint" "y") + ) +) + +(define-method shape_combine_region + (of-object "GdkWindow") + (c-name "gdk_window_shape_combine_region") + (return-type "none") + (parameters + '("GdkRegion*" "shape_region") + '("gint" "offset_x") + '("gint" "offset_y") + ) +) + +(define-method set_child_shapes + (of-object "GdkWindow") + (c-name "gdk_window_set_child_shapes") + (return-type "none") +) + +(define-method set_composited + (of-object "GdkWindow") + (c-name "gdk_window_set_composited") + (return-type "none") + (parameters + '("gboolean" "composited") + ) +) + +(define-method merge_child_shapes + (of-object "GdkWindow") + (c-name "gdk_window_merge_child_shapes") + (return-type "none") +) + +(define-method input_shape_combine_mask + (of-object "GdkWindow") + (c-name "gdk_window_input_shape_combine_mask") + (return-type "none") + (parameters + '("GdkBitmap*" "mask") + '("gint" "x") + '("gint" "y") + ) +) + +(define-method input_shape_combine_region + (of-object "GdkWindow") + (c-name "gdk_window_input_shape_combine_region") + (return-type "none") + (parameters + '("GdkRegion*" "shape_region") + '("gint" "offset_x") + '("gint" "offset_y") + ) +) + +(define-method set_child_input_shapes + (of-object "GdkWindow") + (c-name "gdk_window_set_child_input_shapes") + (return-type "none") +) + +(define-method merge_child_input_shapes + (of-object "GdkWindow") + (c-name "gdk_window_merge_child_input_shapes") + (return-type "none") +) + +(define-method is_visible + (of-object "GdkWindow") + (c-name "gdk_window_is_visible") + (return-type "gboolean") +) + +(define-method is_viewable + (of-object "GdkWindow") + (c-name "gdk_window_is_viewable") + (return-type "gboolean") +) + +(define-method get_state + (of-object "GdkWindow") + (c-name "gdk_window_get_state") + (return-type "GdkWindowState") +) + +(define-method set_static_gravities + (of-object "GdkWindow") + (c-name "gdk_window_set_static_gravities") + (return-type "gboolean") + (parameters + '("gboolean" "use_static") + ) +) + +(define-function gdk_window_foreign_new + (c-name "gdk_window_foreign_new") + (is-constructor-of "GdkWindowForeign") + (return-type "GdkWindow*") + (parameters + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_window_lookup + (c-name "gdk_window_lookup") + (return-type "GdkWindow*") + (parameters + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_window_foreign_new_for_display + (c-name "gdk_window_foreign_new_for_display") + (return-type "GdkWindow*") + (parameters + '("GdkDisplay*" "display") + '("GdkNativeWindow" "anid") + ) +) + +(define-function gdk_window_lookup_for_display + (c-name "gdk_window_lookup_for_display") + (return-type "GdkWindow*") + (parameters + '("GdkDisplay*" "display") + '("GdkNativeWindow" "anid") + ) +) + +(define-method set_hints + (of-object "GdkWindow") + (c-name "gdk_window_set_hints") + (return-type "none") + (parameters + '("gint" "x") + '("gint" "y") + '("gint" "min_width") + '("gint" "min_height") + '("gint" "max_width") + '("gint" "max_height") + '("gint" "flags") + ) +) + +(define-method set_type_hint + (of-object "GdkWindow") + (c-name "gdk_window_set_type_hint") + (return-type "none") + (parameters + '("GdkWindowTypeHint" "hint") + ) +) + +(define-method get_type_hint + (of-object "GdkWindow") + (c-name "gdk_window_get_type_hint") + (return-type "GdkWindowTypeHint") +) + +(define-method set_modal_hint + (of-object "GdkWindow") + (c-name "gdk_window_set_modal_hint") + (return-type "none") + (parameters + '("gboolean" "modal") + ) +) + +(define-method set_skip_taskbar_hint + (of-object "GdkWindow") + (c-name "gdk_window_set_skip_taskbar_hint") + (return-type "none") + (parameters + '("gboolean" "skips_taskbar") + ) +) + +(define-method set_skip_pager_hint + (of-object "GdkWindow") + (c-name "gdk_window_set_skip_pager_hint") + (return-type "none") + (parameters + '("gboolean" "skips_pager") + ) +) + +(define-method set_urgency_hint + (of-object "GdkWindow") + (c-name "gdk_window_set_urgency_hint") + (return-type "none") + (parameters + '("gboolean" "urgent") + ) +) + +(define-method set_geometry_hints + (of-object "GdkWindow") + (c-name "gdk_window_set_geometry_hints") + (return-type "none") + (parameters + '("GdkGeometry*" "geometry") + '("GdkWindowHints" "geom_mask") + ) +) + +(define-function gdk_set_sm_client_id + (c-name "gdk_set_sm_client_id") + (return-type "none") + (parameters + '("const-gchar*" "sm_client_id") + ) +) + +(define-method begin_paint_rect + (of-object "GdkWindow") + (c-name "gdk_window_begin_paint_rect") + (return-type "none") + (parameters + '("GdkRectangle*" "rectangle") + ) +) + +(define-method begin_paint_region + (of-object "GdkWindow") + (c-name "gdk_window_begin_paint_region") + (return-type "none") + (parameters + '("GdkRegion*" "region") + ) +) + +(define-method end_paint + (of-object "GdkWindow") + (c-name "gdk_window_end_paint") + (return-type "none") +) + +(define-method set_title + (of-object "GdkWindow") + (c-name "gdk_window_set_title") + (return-type "none") + (parameters + '("const-gchar*" "title") + ) +) + +(define-method set_role + (of-object "GdkWindow") + (c-name "gdk_window_set_role") + (return-type "none") + (parameters + '("const-gchar*" "role") + ) +) + +(define-method set_startup_id + (of-object "GdkWindow") + (c-name "gdk_window_set_startup_id") + (return-type "none") + (parameters + '("const-gchar*" "startup_id") + ) +) + +(define-method set_transient_for + (of-object "GdkWindow") + (c-name "gdk_window_set_transient_for") + (return-type "none") + (parameters + '("GdkWindow*" "parent") + ) +) + +(define-method set_background + (of-object "GdkWindow") + (c-name "gdk_window_set_background") + (return-type "none") + (parameters + '("const-GdkColor*" "color") + ) +) + +(define-method set_back_pixmap + (of-object "GdkWindow") + (c-name "gdk_window_set_back_pixmap") + (return-type "none") + (parameters + '("GdkPixmap*" "pixmap") + '("gboolean" "parent_relative") + ) +) + +(define-method set_cursor + (of-object "GdkWindow") + (c-name "gdk_window_set_cursor") + (return-type "none") + (parameters + '("GdkCursor*" "cursor") + ) +) + +(define-method get_user_data + (of-object "GdkWindow") + (c-name "gdk_window_get_user_data") + (return-type "none") + (parameters + '("gpointer*" "data") + ) +) + +(define-method get_geometry + (of-object "GdkWindow") + (c-name "gdk_window_get_geometry") + (return-type "none") + (parameters + '("gint*" "x") + '("gint*" "y") + '("gint*" "width") + '("gint*" "height") + '("gint*" "depth") + ) +) + +(define-method get_position + (of-object "GdkWindow") + (c-name "gdk_window_get_position") + (return-type "none") + (parameters + '("gint*" "x") + '("gint*" "y") + ) +) + +(define-method get_origin + (of-object "GdkWindow") + (c-name "gdk_window_get_origin") + (return-type "gint") + (parameters + '("gint*" "x") + '("gint*" "y") + ) +) + +(define-method get_deskrelative_origin + (of-object "GdkWindow") + (c-name "gdk_window_get_deskrelative_origin") + (return-type "gboolean") + (parameters + '("gint*" "x") + '("gint*" "y") + ) +) + +(define-method get_root_origin + (of-object "GdkWindow") + (c-name "gdk_window_get_root_origin") + (return-type "none") + (parameters + '("gint*" "x") + '("gint*" "y") + ) +) + +(define-method get_frame_extents + (of-object "GdkWindow") + (c-name "gdk_window_get_frame_extents") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + ) +) + +(define-method get_pointer + (of-object "GdkWindow") + (c-name "gdk_window_get_pointer") + (return-type "GdkWindow*") + (parameters + '("gint*" "x") + '("gint*" "y") + '("GdkModifierType*" "mask") + ) +) + +(define-method get_parent + (of-object "GdkWindow") + (c-name "gdk_window_get_parent") + (return-type "GdkWindow*") +) + +(define-method get_toplevel + (of-object "GdkWindow") + (c-name "gdk_window_get_toplevel") + (return-type "GdkWindow*") +) + +(define-method get_children + (of-object "GdkWindow") + (c-name "gdk_window_get_children") + (return-type "GList*") +) + +(define-method peek_children + (of-object "GdkWindow") + (c-name "gdk_window_peek_children") + (return-type "GList*") +) + +(define-method get_events + (of-object "GdkWindow") + (c-name "gdk_window_get_events") + (return-type "GdkEventMask") +) + +(define-method set_events + (of-object "GdkWindow") + (c-name "gdk_window_set_events") + (return-type "none") + (parameters + '("GdkEventMask" "event_mask") + ) +) + +(define-method set_icon_list + (of-object "GdkWindow") + (c-name "gdk_window_set_icon_list") + (return-type "none") + (parameters + '("GList*" "pixbufs") + ) +) + +(define-method set_icon + (of-object "GdkWindow") + (c-name "gdk_window_set_icon") + (return-type "none") + (parameters + '("GdkWindow*" "icon_window") + '("GdkPixmap*" "pixmap") + '("GdkBitmap*" "mask") + ) +) + +(define-method set_icon_name + (of-object "GdkWindow") + (c-name "gdk_window_set_icon_name") + (return-type "none") + (parameters + '("const-gchar*" "name") + ) +) + +(define-method set_group + (of-object "GdkWindow") + (c-name "gdk_window_set_group") + (return-type "none") + (parameters + '("GdkWindow*" "leader") + ) +) + +(define-method get_group + (of-object "GdkWindow") + (c-name "gdk_window_get_group") + (return-type "GdkWindow*") +) + +(define-method set_decorations + (of-object "GdkWindow") + (c-name "gdk_window_set_decorations") + (return-type "none") + (parameters + '("GdkWMDecoration" "decorations") + ) +) + +(define-method get_decorations + (of-object "GdkWindow") + (c-name "gdk_window_get_decorations") + (return-type "gboolean") + (parameters + '("GdkWMDecoration*" "decorations") + ) +) + +(define-method set_functions + (of-object "GdkWindow") + (c-name "gdk_window_set_functions") + (return-type "none") + (parameters + '("GdkWMFunction" "functions") + ) +) + +(define-function gdk_window_get_toplevels + (c-name "gdk_window_get_toplevels") + (return-type "GList*") +) + +(define-method beep + (of-object "GdkWindow") + (c-name "gdk_window_beep") + (return-type "none") +) + +(define-method iconify + (of-object "GdkWindow") + (c-name "gdk_window_iconify") + (return-type "none") +) + +(define-method deiconify + (of-object "GdkWindow") + (c-name "gdk_window_deiconify") + (return-type "none") +) + +(define-method stick + (of-object "GdkWindow") + (c-name "gdk_window_stick") + (return-type "none") +) + +(define-method unstick + (of-object "GdkWindow") + (c-name "gdk_window_unstick") + (return-type "none") +) + +(define-method maximize + (of-object "GdkWindow") + (c-name "gdk_window_maximize") + (return-type "none") +) + +(define-method unmaximize + (of-object "GdkWindow") + (c-name "gdk_window_unmaximize") + (return-type "none") +) + +(define-method fullscreen + (of-object "GdkWindow") + (c-name "gdk_window_fullscreen") + (return-type "none") +) + +(define-method unfullscreen + (of-object "GdkWindow") + (c-name "gdk_window_unfullscreen") + (return-type "none") +) + +(define-method set_keep_above + (of-object "GdkWindow") + (c-name "gdk_window_set_keep_above") + (return-type "none") + (parameters + '("gboolean" "setting") + ) +) + +(define-method set_keep_below + (of-object "GdkWindow") + (c-name "gdk_window_set_keep_below") + (return-type "none") + (parameters + '("gboolean" "setting") + ) +) + +(define-method set_opacity + (of-object "GdkWindow") + (c-name "gdk_window_set_opacity") + (return-type "none") + (parameters + '("gdouble" "opacity") + ) +) + +(define-method register_dnd + (of-object "GdkWindow") + (c-name "gdk_window_register_dnd") + (return-type "none") +) + +(define-method begin_resize_drag + (of-object "GdkWindow") + (c-name "gdk_window_begin_resize_drag") + (return-type "none") + (parameters + '("GdkWindowEdge" "edge") + '("gint" "button") + '("gint" "root_x") + '("gint" "root_y") + '("guint32" "timestamp") + ) +) + +(define-method begin_move_drag + (of-object "GdkWindow") + (c-name "gdk_window_begin_move_drag") + (return-type "none") + (parameters + '("gint" "button") + '("gint" "root_x") + '("gint" "root_y") + '("guint32" "timestamp") + ) +) + +(define-method invalidate_rect + (of-object "GdkWindow") + (c-name "gdk_window_invalidate_rect") + (return-type "none") + (parameters + '("GdkRectangle*" "rect") + '("gboolean" "invalidate_children") + ) +) + +(define-method invalidate_region + (of-object "GdkWindow") + (c-name "gdk_window_invalidate_region") + (return-type "none") + (parameters + '("GdkRegion*" "region") + '("gboolean" "invalidate_children") + ) +) + +(define-method get_update_area + (of-object "GdkWindow") + (c-name "gdk_window_get_update_area") + (return-type "GdkRegion*") +) + +(define-method freeze_updates + (of-object "GdkWindow") + (c-name "gdk_window_freeze_updates") + (return-type "none") +) + +(define-method thaw_updates + (of-object "GdkWindow") + (c-name "gdk_window_thaw_updates") + (return-type "none") +) + +(define-function gdk_window_process_all_updates + (c-name "gdk_window_process_all_updates") + (return-type "none") +) + +(define-method process_updates + (of-object "GdkWindow") + (c-name "gdk_window_process_updates") + (return-type "none") + (parameters + '("gboolean" "update_children") + ) +) + +(define-function gdk_window_set_debug_updates + (c-name "gdk_window_set_debug_updates") + (return-type "none") + (parameters + '("gboolean" "setting") + ) +) + +(define-function gdk_window_constrain_size + (c-name "gdk_window_constrain_size") + (return-type "none") + (parameters + '("GdkGeometry*" "geometry") + '("guint" "flags") + '("gint" "width") + '("gint" "height") + '("gint*" "new_width") + '("gint*" "new_height") + ) +) + +(define-method get_internal_paint_info + (of-object "GdkWindow") + (c-name "gdk_window_get_internal_paint_info") + (return-type "none") + (parameters + '("GdkDrawable**" "real_drawable") + '("gint*" "x_offset") + '("gint*" "y_offset") + ) +) + +(define-method enable_synchronized_configure + (of-object "GdkWindow") + (c-name "gdk_window_enable_synchronized_configure") + (return-type "none") +) + +(define-method configure_finished + (of-object "GdkWindow") + (c-name "gdk_window_configure_finished") + (return-type "none") +) + +(define-function gdk_set_pointer_hooks + (c-name "gdk_set_pointer_hooks") + (return-type "GdkPointerHooks*") + (parameters + '("const-GdkPointerHooks*" "new_hooks") + ) +) + +(define-function gdk_get_default_root_window + (c-name "gdk_get_default_root_window") + (return-type "GdkWindow*") +) + + diff --git a/libs/gtkmm2/gdk/src/gdk_pixbuf.defs b/libs/gtkmm2/gdk/src/gdk_pixbuf.defs new file mode 100644 index 0000000000..0031fb7f06 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_pixbuf.defs @@ -0,0 +1,1041 @@ +;; -*- scheme -*- +; object definitions ... +(define-object Pixbuf + (in-module "Gdk") + (parent "GObject") + (c-name "GdkPixbuf") + (gtype-id "GDK_TYPE_PIXBUF") +) + +(define-object PixbufAnimation + (in-module "Gdk") + (parent "GObject") + (c-name "GdkPixbufAnimation") + (gtype-id "GDK_TYPE_PIXBUF_ANIMATION") +) + +(define-object PixbufAniAnim + (in-module "Gdk") + (parent "GdkPixbufAnimation") + (c-name "GdkPixbufAniAnim") + (gtype-id "GDK_TYPE_PIXBUF_ANI_ANIM") +) + +(define-object PixbufAnimationIter + (in-module "Gdk") + (parent "GObject") + (c-name "GdkPixbufAnimationIter") + (gtype-id "GDK_TYPE_PIXBUF_ANIMATION_ITER") +) + +(define-object PixbufAniAnimIter + (in-module "Gdk") + (parent "GdkPixbufAnimationIter") + (c-name "GdkPixbufAniAnimIter") + (gtype-id "GDK_TYPE_PIXBUF_ANI_ANIM_ITER") +) + +(define-object PixbufGifAnim + (in-module "Gdk") + (parent "GdkPixbufAnimation") + (c-name "GdkPixbufGifAnim") + (gtype-id "GDK_TYPE_PIXBUF_GIF_ANIM") +) + +(define-object PixbufGifAnimIter + (in-module "Gdk") + (parent "GdkPixbufAnimationIter") + (c-name "GdkPixbufGifAnimIter") + (gtype-id "GDK_TYPE_PIXBUF_GIF_ANIM_ITER") +) + +(define-object PixbufLoader + (in-module "Gdk") + (parent "GObject") + (c-name "GdkPixbufLoader") + (gtype-id "GDK_TYPE_PIXBUF_LOADER") +) + +;; Enumerations and flags ... + +(define-enum PixbufAlphaMode + (in-module "Gdk") + (c-name "GdkPixbufAlphaMode") + (gtype-id "GDK_TYPE_PIXBUF_ALPHA_MODE") + (values + '("bilevel" "GDK_PIXBUF_ALPHA_BILEVEL") + '("full" "GDK_PIXBUF_ALPHA_FULL") + ) +) + +(define-enum Colorspace + (in-module "Gdk") + (c-name "GdkColorspace") + (gtype-id "GDK_TYPE_COLORSPACE") + (values + '("b" "GDK_COLORSPACE_RGB") + ) +) + +(define-enum PixbufError + (in-module "Gdk") + (c-name "GdkPixbufError") + (gtype-id "GDK_TYPE_PIXBUF_ERROR") + (values + '("corrupt-image" "GDK_PIXBUF_ERROR_CORRUPT_IMAGE") + '("insufficient-memory" "GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY") + '("bad-option" "GDK_PIXBUF_ERROR_BAD_OPTION") + '("unknown-type" "GDK_PIXBUF_ERROR_UNKNOWN_TYPE") + '("unsupported-operation" "GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION") + '("failed" "GDK_PIXBUF_ERROR_FAILED") + ) +) + +(define-flags PixbufFormatFlags + (in-module "Gdk") + (c-name "GdkPixbufFormatFlags") + (gtype-id "GDK_TYPE_PIXBUF_FORMAT_FLAGS") + (values + '("writable" "GDK_PIXBUF_FORMAT_WRITABLE") + '("scalable" "GDK_PIXBUF_FORMAT_SCALABLE") + '("threadsafe" "GDK_PIXBUF_FORMAT_THREADSAFE") + ) +) + +(define-enum InterpType + (in-module "Gdk") + (c-name "GdkInterpType") + (gtype-id "GDK_TYPE_INTERP_TYPE") + (values + '("nearest" "GDK_INTERP_NEAREST") + '("tiles" "GDK_INTERP_TILES") + '("bilinear" "GDK_INTERP_BILINEAR") + '("hyper" "GDK_INTERP_HYPER") + ) +) + +(define-enum PixbufRotation + (in-module "Gdk") + (c-name "GdkPixbufRotation") + (gtype-id "GDK_TYPE_PIXBUF_ROTATION") + (values + '("none" "GDK_PIXBUF_ROTATE_NONE") + '("counterclockwise" "GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE") + '("upsidedown" "GDK_PIXBUF_ROTATE_UPSIDEDOWN") + '("clockwise" "GDK_PIXBUF_ROTATE_CLOCKWISE") + ) +) + +(define-flags PixdataType + (in-module "Gdk") + (c-name "GdkPixdataType") + (gtype-id "GDK_TYPE_PIXDATA_TYPE") + (values + '("color-type-rgb" "GDK_PIXDATA_COLOR_TYPE_RGB") + '("color-type-rgba" "GDK_PIXDATA_COLOR_TYPE_RGBA") + '("color-type-mask" "GDK_PIXDATA_COLOR_TYPE_MASK") + '("sample-width-8" "GDK_PIXDATA_SAMPLE_WIDTH_8") + '("sample-width-mask" "GDK_PIXDATA_SAMPLE_WIDTH_MASK") + '("encoding-raw" "GDK_PIXDATA_ENCODING_RAW") + '("encoding-rle" "GDK_PIXDATA_ENCODING_RLE") + '("encoding-mask" "GDK_PIXDATA_ENCODING_MASK") + ) +) + +(define-flags PixdataDumpType + (in-module "Gdk") + (c-name "GdkPixdataDumpType") + (gtype-id "GDK_TYPE_PIXDATA_DUMP_TYPE") + (values + '("pixdata-stream" "GDK_PIXDATA_DUMP_PIXDATA_STREAM") + '("pixdata-struct" "GDK_PIXDATA_DUMP_PIXDATA_STRUCT") + '("macros" "GDK_PIXDATA_DUMP_MACROS") + '("gtypes" "GDK_PIXDATA_DUMP_GTYPES") + '("ctypes" "GDK_PIXDATA_DUMP_CTYPES") + '("static" "GDK_PIXDATA_DUMP_STATIC") + '("const" "GDK_PIXDATA_DUMP_CONST") + '("rle-decoder" "GDK_PIXDATA_DUMP_RLE_DECODER") + ) +) + +(define-enum PixbufFrameAction + (in-module "Gdk") + (c-name "GdkPixbufFrameAction") + (gtype-id "GDK_TYPE_PIXBUF_FRAME_ACTION") + (values + '("retain" "GDK_PIXBUF_FRAME_RETAIN") + '("dispose" "GDK_PIXBUF_FRAME_DISPOSE") + '("revert" "GDK_PIXBUF_FRAME_REVERT") + ) +) + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-alias.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-animation.h + +(define-function gdk_pixbuf_animation_get_type + (c-name "gdk_pixbuf_animation_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_animation_new_from_file + (c-name "gdk_pixbuf_animation_new_from_file") + (return-type "GdkPixbufAnimation*") + (parameters + '("const-char*" "filename") + '("GError**" "error") + ) +) + +(define-method ref + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_ref") + (return-type "GdkPixbufAnimation*") +) + +(define-method unref + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_unref") + (return-type "none") +) + +(define-method get_width + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_get_width") + (return-type "int") +) + +(define-method get_height + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_get_height") + (return-type "int") +) + +(define-method is_static_image + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_is_static_image") + (return-type "gboolean") +) + +(define-method get_static_image + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_get_static_image") + (return-type "GdkPixbuf*") +) + +(define-method get_iter + (of-object "GdkPixbufAnimation") + (c-name "gdk_pixbuf_animation_get_iter") + (return-type "GdkPixbufAnimationIter*") + (parameters + '("const-GTimeVal*" "start_time") + ) +) + +(define-function gdk_pixbuf_animation_iter_get_type + (c-name "gdk_pixbuf_animation_iter_get_type") + (return-type "GType") +) + +(define-method get_delay_time + (of-object "GdkPixbufAnimationIter") + (c-name "gdk_pixbuf_animation_iter_get_delay_time") + (return-type "int") +) + +(define-method get_pixbuf + (of-object "GdkPixbufAnimationIter") + (c-name "gdk_pixbuf_animation_iter_get_pixbuf") + (return-type "GdkPixbuf*") +) + +(define-method on_currently_loading_frame + (of-object "GdkPixbufAnimationIter") + (c-name "gdk_pixbuf_animation_iter_on_currently_loading_frame") + (return-type "gboolean") +) + +(define-method advance + (of-object "GdkPixbufAnimationIter") + (c-name "gdk_pixbuf_animation_iter_advance") + (return-type "gboolean") + (parameters + '("const-GTimeVal*" "current_time") + ) +) + +(define-method non_anim_new + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_non_anim_new") + (return-type "GdkPixbufAnimation*") +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-core.h + +(define-function gdk_pixbuf_error_quark + (c-name "gdk_pixbuf_error_quark") + (return-type "GQuark") +) + +(define-function gdk_pixbuf_get_type + (c-name "gdk_pixbuf_get_type") + (return-type "GType") +) + +(define-method ref + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_ref") + (return-type "GdkPixbuf*") +) + +(define-method unref + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_unref") + (return-type "none") +) + +(define-method get_colorspace + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_colorspace") + (return-type "GdkColorspace") +) + +(define-method get_n_channels + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_n_channels") + (return-type "int") +) + +(define-method get_has_alpha + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_has_alpha") + (return-type "gboolean") +) + +(define-method get_bits_per_sample + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_bits_per_sample") + (return-type "int") +) + +(define-method get_pixels + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_pixels") + (return-type "guchar*") +) + +(define-method get_width + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_width") + (return-type "int") +) + +(define-method get_height + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_height") + (return-type "int") +) + +(define-method get_rowstride + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_rowstride") + (return-type "int") +) + +(define-function gdk_pixbuf_new + (c-name "gdk_pixbuf_new") + (is-constructor-of "GdkPixbuf") + (return-type "GdkPixbuf*") + (parameters + '("GdkColorspace" "colorspace") + '("gboolean" "has_alpha") + '("int" "bits_per_sample") + '("int" "width") + '("int" "height") + ) +) + +(define-method copy + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_copy") + (return-type "GdkPixbuf*") +) + +(define-method new_subpixbuf + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_new_subpixbuf") + (return-type "GdkPixbuf*") + (parameters + '("int" "src_x") + '("int" "src_y") + '("int" "width") + '("int" "height") + ) +) + +(define-function gdk_pixbuf_new_from_file + (c-name "gdk_pixbuf_new_from_file") + (return-type "GdkPixbuf*") + (parameters + '("const-char*" "filename") + '("GError**" "error") + ) +) + +(define-function gdk_pixbuf_new_from_file_at_size + (c-name "gdk_pixbuf_new_from_file_at_size") + (return-type "GdkPixbuf*") + (parameters + '("const-char*" "filename") + '("int" "width") + '("int" "height") + '("GError**" "error") + ) +) + +(define-function gdk_pixbuf_new_from_file_at_scale + (c-name "gdk_pixbuf_new_from_file_at_scale") + (return-type "GdkPixbuf*") + (parameters + '("const-char*" "filename") + '("int" "width") + '("int" "height") + '("gboolean" "preserve_aspect_ratio") + '("GError**" "error") + ) +) + +(define-function gdk_pixbuf_new_from_data + (c-name "gdk_pixbuf_new_from_data") + (return-type "GdkPixbuf*") + (parameters + '("const-guchar*" "data") + '("GdkColorspace" "colorspace") + '("gboolean" "has_alpha") + '("int" "bits_per_sample") + '("int" "width") + '("int" "height") + '("int" "rowstride") + '("GdkPixbufDestroyNotify" "destroy_fn") + '("gpointer" "destroy_fn_data") + ) +) + +(define-function gdk_pixbuf_new_from_xpm_data + (c-name "gdk_pixbuf_new_from_xpm_data") + (return-type "GdkPixbuf*") + (parameters + '("const-char**" "data") + ) +) + +(define-function gdk_pixbuf_new_from_inline + (c-name "gdk_pixbuf_new_from_inline") + (return-type "GdkPixbuf*") + (parameters + '("gint" "data_length") + '("const-guint8*" "data") + '("gboolean" "copy_pixels") + '("GError**" "error") + ) +) + +(define-method fill + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_fill") + (return-type "none") + (parameters + '("guint32" "pixel") + ) +) + +(define-method save + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_save") + (return-type "gboolean") + (parameters + '("const-char*" "filename") + '("const-char*" "type") + '("GError**" "error") + ) + (varargs #t) +) + +(define-method savev + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_savev") + (return-type "gboolean") + (parameters + '("const-char*" "filename") + '("const-char*" "type") + '("char**" "option_keys") + '("char**" "option_values") + '("GError**" "error") + ) +) + +(define-method save_to_callback + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_save_to_callback") + (return-type "gboolean") + (parameters + '("GdkPixbufSaveFunc" "save_func") + '("gpointer" "user_data") + '("const-char*" "type") + '("GError**" "error") + ) + (varargs #t) +) + +(define-method save_to_callbackv + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_save_to_callbackv") + (return-type "gboolean") + (parameters + '("GdkPixbufSaveFunc" "save_func") + '("gpointer" "user_data") + '("const-char*" "type") + '("char**" "option_keys") + '("char**" "option_values") + '("GError**" "error") + ) +) + +(define-method save_to_buffer + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_save_to_buffer") + (return-type "gboolean") + (parameters + '("gchar**" "buffer") + '("gsize*" "buffer_size") + '("const-char*" "type") + '("GError**" "error") + ) + (varargs #t) +) + +(define-method save_to_bufferv + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_save_to_bufferv") + (return-type "gboolean") + (parameters + '("gchar**" "buffer") + '("gsize*" "buffer_size") + '("const-char*" "type") + '("char**" "option_keys") + '("char**" "option_values") + '("GError**" "error") + ) +) + +(define-method add_alpha + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_add_alpha") + (return-type "GdkPixbuf*") + (parameters + '("gboolean" "substitute_color") + '("guchar" "r") + '("guchar" "g") + '("guchar" "b") + ) +) + +(define-method copy_area + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_copy_area") + (return-type "none") + (parameters + '("int" "src_x") + '("int" "src_y") + '("int" "width") + '("int" "height") + '("GdkPixbuf*" "dest_pixbuf") + '("int" "dest_x") + '("int" "dest_y") + ) +) + +(define-method saturate_and_pixelate + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_saturate_and_pixelate") + (return-type "none") + (parameters + '("GdkPixbuf*" "dest") + '("gfloat" "saturation") + '("gboolean" "pixelate") + ) +) + +(define-method get_option + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_get_option") + (return-type "const-gchar*") + (parameters + '("const-gchar*" "key") + ) +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-enum-types.h + +(define-function gdk_pixbuf_alpha_mode_get_type + (c-name "gdk_pixbuf_alpha_mode_get_type") + (return-type "GType") +) + +(define-function gdk_colorspace_get_type + (c-name "gdk_colorspace_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_error_get_type + (c-name "gdk_pixbuf_error_get_type") + (return-type "GType") +) + +(define-function gdk_interp_type_get_type + (c-name "gdk_interp_type_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_rotation_get_type + (c-name "gdk_pixbuf_rotation_get_type") + (return-type "GType") +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-features.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-i18n.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-io.h + +(define-function gdk_pixbuf_get_formats + (c-name "gdk_pixbuf_get_formats") + (return-type "GSList*") +) + +(define-method get_name + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_get_name") + (return-type "gchar*") +) + +(define-method get_description + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_get_description") + (return-type "gchar*") +) + +(define-method get_mime_types + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_get_mime_types") + (return-type "gchar**") +) + +(define-method get_extensions + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_get_extensions") + (return-type "gchar**") +) + +(define-method is_writable + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_is_writable") + (return-type "gboolean") +) + +(define-method is_scalable + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_is_scalable") + (return-type "gboolean") +) + +(define-method is_disabled + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_is_disabled") + (return-type "gboolean") +) + +(define-method set_disabled + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_set_disabled") + (return-type "none") + (parameters + '("gboolean" "disabled") + ) +) + +(define-method get_license + (of-object "GdkPixbufFormat") + (c-name "gdk_pixbuf_format_get_license") + (return-type "gchar*") +) + +(define-function gdk_pixbuf_get_file_info + (c-name "gdk_pixbuf_get_file_info") + (return-type "GdkPixbufFormat*") + (parameters + '("const-gchar*" "filename") + '("gint*" "width") + '("gint*" "height") + ) +) + +(define-method set_option + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_set_option") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("const-gchar*" "value") + ) +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-loader.h + +(define-function gdk_pixbuf_loader_get_type + (c-name "gdk_pixbuf_loader_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_loader_new + (c-name "gdk_pixbuf_loader_new") + (is-constructor-of "GdkPixbufLoader") + (return-type "GdkPixbufLoader*") +) + +(define-function gdk_pixbuf_loader_new_with_type + (c-name "gdk_pixbuf_loader_new_with_type") + (return-type "GdkPixbufLoader*") + (parameters + '("const-char*" "image_type") + '("GError**" "error") + ) +) + +(define-function gdk_pixbuf_loader_new_with_mime_type + (c-name "gdk_pixbuf_loader_new_with_mime_type") + (return-type "GdkPixbufLoader*") + (parameters + '("const-char*" "mime_type") + '("GError**" "error") + ) +) + +(define-method set_size + (of-object "GdkPixbufLoader") + (c-name "gdk_pixbuf_loader_set_size") + (return-type "none") + (parameters + '("int" "width") + '("int" "height") + ) +) + +(define-method write + (of-object "GdkPixbufLoader") + (c-name "gdk_pixbuf_loader_write") + (return-type "gboolean") + (parameters + '("const-guchar*" "buf") + '("gsize" "count") + '("GError**" "error") + ) +) + +(define-method get_pixbuf + (of-object "GdkPixbufLoader") + (c-name "gdk_pixbuf_loader_get_pixbuf") + (return-type "GdkPixbuf*") +) + +(define-method get_animation + (of-object "GdkPixbufLoader") + (c-name "gdk_pixbuf_loader_get_animation") + (return-type "GdkPixbufAnimation*") +) + +(define-method close + (of-object "GdkPixbufLoader") + (c-name "gdk_pixbuf_loader_close") + (return-type "gboolean") + (parameters + '("GError**" "error") + ) +) + +(define-method get_format + (of-object "GdkPixbufLoader") + (c-name "gdk_pixbuf_loader_get_format") + (return-type "GdkPixbufFormat*") +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-marshal.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-private.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-simple-anim.h + +(define-function gdk_pixbuf_simple_anim_get_type + (c-name "gdk_pixbuf_simple_anim_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_simple_anim_iter_get_type + (c-name "gdk_pixbuf_simple_anim_iter_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_simple_anim_new + (c-name "gdk_pixbuf_simple_anim_new") + (is-constructor-of "GdkPixbufSimpleAnim") + (return-type "GdkPixbufSimpleAnim*") + (parameters + '("gint" "width") + '("gint" "height") + '("gfloat" "rate") + ) +) + +(define-method add_frame + (of-object "GdkPixbufSimpleAnim") + (c-name "gdk_pixbuf_simple_anim_add_frame") + (return-type "none") + (parameters + '("GdkPixbuf*" "pixbuf") + ) +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixbuf-transform.h + +(define-method scale + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_scale") + (return-type "none") + (parameters + '("GdkPixbuf*" "dest") + '("int" "dest_x") + '("int" "dest_y") + '("int" "dest_width") + '("int" "dest_height") + '("double" "offset_x") + '("double" "offset_y") + '("double" "scale_x") + '("double" "scale_y") + '("GdkInterpType" "interp_type") + ) +) + +(define-method composite + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_composite") + (return-type "none") + (parameters + '("GdkPixbuf*" "dest") + '("int" "dest_x") + '("int" "dest_y") + '("int" "dest_width") + '("int" "dest_height") + '("double" "offset_x") + '("double" "offset_y") + '("double" "scale_x") + '("double" "scale_y") + '("GdkInterpType" "interp_type") + '("int" "overall_alpha") + ) +) + +(define-method composite_color + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_composite_color") + (return-type "none") + (parameters + '("GdkPixbuf*" "dest") + '("int" "dest_x") + '("int" "dest_y") + '("int" "dest_width") + '("int" "dest_height") + '("double" "offset_x") + '("double" "offset_y") + '("double" "scale_x") + '("double" "scale_y") + '("GdkInterpType" "interp_type") + '("int" "overall_alpha") + '("int" "check_x") + '("int" "check_y") + '("int" "check_size") + '("guint32" "color1") + '("guint32" "color2") + ) +) + +(define-method scale_simple + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_scale_simple") + (return-type "GdkPixbuf*") + (parameters + '("int" "dest_width") + '("int" "dest_height") + '("GdkInterpType" "interp_type") + ) +) + +(define-method composite_color_simple + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_composite_color_simple") + (return-type "GdkPixbuf*") + (parameters + '("int" "dest_width") + '("int" "dest_height") + '("GdkInterpType" "interp_type") + '("int" "overall_alpha") + '("int" "check_size") + '("guint32" "color1") + '("guint32" "color2") + ) +) + +(define-method rotate_simple + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_rotate_simple") + (return-type "GdkPixbuf*") + (parameters + '("GdkPixbufRotation" "angle") + ) +) + +(define-method flip + (of-object "GdkPixbuf") + (c-name "gdk_pixbuf_flip") + (return-type "GdkPixbuf*") + (parameters + '("gboolean" "horizontal") + ) +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/gdk-pixdata.h + +(define-method serialize + (of-object "GdkPixdata") + (c-name "gdk_pixdata_serialize") + (return-type "guint8*") + (parameters + '("guint*" "stream_length_p") + ) +) + +(define-method deserialize + (of-object "GdkPixdata") + (c-name "gdk_pixdata_deserialize") + (return-type "gboolean") + (parameters + '("guint" "stream_length") + '("const-guint8*" "stream") + '("GError**" "error") + ) +) + +(define-method from_pixbuf + (of-object "GdkPixdata") + (c-name "gdk_pixdata_from_pixbuf") + (return-type "gpointer") + (parameters + '("const-GdkPixbuf*" "pixbuf") + '("gboolean" "use_rle") + ) +) + +(define-function gdk_pixbuf_from_pixdata + (c-name "gdk_pixbuf_from_pixdata") + (return-type "GdkPixbuf*") + (parameters + '("const-GdkPixdata*" "pixdata") + '("gboolean" "copy_pixels") + '("GError**" "error") + ) +) + +(define-method to_csource + (of-object "GdkPixdata") + (c-name "gdk_pixdata_to_csource") + (return-type "GString*") + (parameters + '("const-gchar*" "name") + '("GdkPixdataDumpType" "dump_type") + ) +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/io-ani-animation.h + +(define-function gdk_pixbuf_ani_anim_get_type + (c-name "gdk_pixbuf_ani_anim_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_ani_anim_iter_get_type + (c-name "gdk_pixbuf_ani_anim_iter_get_type") + (return-type "GType") +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/io-gif-animation.h + +(define-function gdk_pixbuf_gif_anim_get_type + (c-name "gdk_pixbuf_gif_anim_get_type") + (return-type "GType") +) + +(define-function gdk_pixbuf_gif_anim_iter_get_type + (c-name "gdk_pixbuf_gif_anim_iter_get_type") + (return-type "GType") +) + +(define-method frame_composite + (of-object "GdkPixbufGifAnim") + (c-name "gdk_pixbuf_gif_anim_frame_composite") + (return-type "none") + (parameters + '("GdkPixbufFrame*" "frame") + ) +) + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/stamp-gdk-pixbuf-marshal.h + + + +;; From /home/murrayc/cvs/gnome212/gtk+/gdk-pixbuf/xpm-color-table.h + + diff --git a/libs/gtkmm2/gdk/src/gdk_pixbuf_enums.defs b/libs/gtkmm2/gdk/src/gdk_pixbuf_enums.defs new file mode 100644 index 0000000000..2d1edfc078 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_pixbuf_enums.defs @@ -0,0 +1,95 @@ +;; From /home/murrayc/svn/gnome218/gtk+/gdk-pixbuf/gdk-pixbuf-core.h + +(define-enum-extended PixbufAlphaMode + (in-module "Gdk") + (c-name "GdkPixbufAlphaMode") + (values + '("bilevel" "GDK_PIXBUF_ALPHA_BILEVEL" "0") + '("full" "GDK_PIXBUF_ALPHA_FULL" "1") + ) +) + +(define-enum-extended Colorspace + (in-module "Gdk") + (c-name "GdkColorspace") + (values + '("b" "GDK_COLORSPACE_RGB" "0") + ) +) + +(define-enum-extended PixbufError + (in-module "Gdk") + (c-name "GdkPixbufError") + (values + '("corrupt-image" "GDK_PIXBUF_ERROR_CORRUPT_IMAGE" "0") + '("insufficient-memory" "GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY" "1") + '("bad-option" "GDK_PIXBUF_ERROR_BAD_OPTION" "2") + '("unknown-type" "GDK_PIXBUF_ERROR_UNKNOWN_TYPE" "3") + '("unsupported-operation" "GDK_PIXBUF_ERROR_UNSUPPORTED_OPERATION" "4") + '("failed" "GDK_PIXBUF_ERROR_FAILED" "5") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk-pixbuf/gdk-pixbuf-io.h + +(define-flags-extended PixbufFormatFlags + (in-module "Gdk") + (c-name "GdkPixbufFormatFlags") + (values + '("writable" "GDK_PIXBUF_FORMAT_WRITABLE" "1 << 0") + '("scalable" "GDK_PIXBUF_FORMAT_SCALABLE" "1 << 1") + '("threadsafe" "GDK_PIXBUF_FORMAT_THREADSAFE" "1 << 2") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk-pixbuf/gdk-pixbuf-transform.h + +(define-enum-extended InterpType + (in-module "Gdk") + (c-name "GdkInterpType") + (values + '("nearest" "GDK_INTERP_NEAREST" "0") + '("tiles" "GDK_INTERP_TILES" "1") + '("bilinear" "GDK_INTERP_BILINEAR" "2") + '("hyper" "GDK_INTERP_HYPER" "3") + ) +) + +(define-enum-extended PixbufRotation + (in-module "Gdk") + (c-name "GdkPixbufRotation") + (values + '("none" "GDK_PIXBUF_ROTATE_NONE" "0") + '("counterclockwise" "GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE" "90") + '("upsidedown" "GDK_PIXBUF_ROTATE_UPSIDEDOWN" "180") + '("clockwise" "GDK_PIXBUF_ROTATE_CLOCKWISE" "270") + ) +) + +;; From /home/murrayc/svn/gnome218/gtk+/gdk-pixbuf/gdk-pixdata.h + +(define-flags-extended PixdataType + (in-module "Gdk") + (c-name "GdkPixdataType") + (values + '("rgb" "GDK_PIXDATA_COLOR_TYPE_RGB" "0x01") + '("rgba" "GDK_PIXDATA_COLOR_TYPE_RGBA" "0x02") + '("mask" "GDK_PIXDATA_COLOR_TYPE_MASK" "0xff") + ) +) + +(define-flags-extended PixdataDumpType + (in-module "Gdk") + (c-name "GdkPixdataDumpType") + (values + '("pixdata-stream" "GDK_PIXDATA_DUMP_PIXDATA_STREAM" "0") + '("pixdata-struct" "GDK_PIXDATA_DUMP_PIXDATA_STRUCT" "1") + '("macros" "GDK_PIXDATA_DUMP_MACROS" "2") + '("gtypes" "GDK_PIXDATA_DUMP_GTYPES" "0") + '("ctypes" "GDK_PIXDATA_DUMP_CTYPES" "1 << 8") + '("static" "GDK_PIXDATA_DUMP_STATIC" "1 << 9") + '("const" "GDK_PIXDATA_DUMP_CONST" "1 << 10") + '("rle-decoder" "GDK_PIXDATA_DUMP_RLE_DECODER" "1 << 16") + ) +) + diff --git a/libs/gtkmm2/gdk/src/gdk_signals.defs b/libs/gtkmm2/gdk/src/gdk_signals.defs new file mode 100644 index 0000000000..7313265cd1 --- /dev/null +++ b/libs/gtkmm2/gdk/src/gdk_signals.defs @@ -0,0 +1,167 @@ +;; From GdkColormap + +;; From GdkDragContext + +;; From GdkDisplay + +(define-signal closed + (of-object "GdkDisplay") + (return-type "void") + (when "last") + (parameters + '("gboolean" "p0") + ) +) + +;; From GdkDisplayManager + +(define-signal display-opened + (of-object "GdkDisplayManager") + (return-type "void") + (when "last") + (parameters + '("GdkDisplay*" "p0") + ) +) + +(define-property default-display + (of-object "GdkDisplayManager") + (prop-type "GParamObject") + (docs "The default display for GDK") + (readable #t) + (writable #t) + (construct-only #f) +) + +;; From GdkDrawable + +;; From GdkGC + +;; From GdkImage + +;; From GdkPixbuf + +(define-property colorspace + (of-object "GdkPixbuf") + (prop-type "GParamEnum") + (docs "The colorspace in which the samples are interpreted") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property n-channels + (of-object "GdkPixbuf") + (prop-type "GParamInt") + (docs "The number of samples per pixel") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property has-alpha + (of-object "GdkPixbuf") + (prop-type "GParamBoolean") + (docs "Whether the pixbuf has an alpha channel") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property bits-per-sample + (of-object "GdkPixbuf") + (prop-type "GParamInt") + (docs "The number of bits per sample") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property width + (of-object "GdkPixbuf") + (prop-type "GParamInt") + (docs "The number of columns of the pixbuf") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property height + (of-object "GdkPixbuf") + (prop-type "GParamInt") + (docs "The number of rows of the pixbuf") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property rowstride + (of-object "GdkPixbuf") + (prop-type "GParamInt") + (docs "The number of bytes between the start of a row and the start of the next row") + (readable #t) + (writable #t) + (construct-only #t) +) + +(define-property pixels + (of-object "GdkPixbuf") + (prop-type "GParamPointer") + (docs "A pointer to the pixel data of the pixbuf") + (readable #t) + (writable #t) + (construct-only #t) +) + +;; From GdkPixbufAnimation + +;; From GdkPixbufLoader + +(define-signal closed + (of-object "GdkPixbufLoader") + (return-type "void") + (when "last") +) + +(define-signal size-prepared + (of-object "GdkPixbufLoader") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + ) +) + +(define-signal area-prepared + (of-object "GdkPixbufLoader") + (return-type "void") + (when "last") +) + +(define-signal area-updated + (of-object "GdkPixbufLoader") + (return-type "void") + (when "last") + (parameters + '("gint" "p0") + '("gint" "p1") + '("gint" "p2") + '("gint" "p3") + ) +) + +;; From GdkPixmap + +;; From GdkScreen + +(define-signal size-changed + (of-object "GdkScreen") + (return-type "void") + (when "last") +) + +;; From GdkVisual + +;; From GdkWindow + diff --git a/libs/gtkmm2/gdk/src/image.ccg b/libs/gtkmm2/gdk/src/image.ccg new file mode 100644 index 0000000000..2c76900e68 --- /dev/null +++ b/libs/gtkmm2/gdk/src/image.ccg @@ -0,0 +1,32 @@ +// -*- c++ -*- +/* $Id: image.ccg,v 1.1 2003/01/21 13:38:35 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +namespace Gdk +{ + +Image::Image(ImageType type, const Glib::RefPtr& visual, int width, int height) +: + Object( G_OBJECT( gdk_image_new((GdkImageType)type, visual->gobj(), width, height) ) ) +{} + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/image.hg b/libs/gtkmm2/gdk/src/image.hg new file mode 100644 index 0000000000..f92ee53cd3 --- /dev/null +++ b/libs/gtkmm2/gdk/src/image.hg @@ -0,0 +1,91 @@ +/* $Id: image.hg,v 1.5 2006/04/12 11:11:24 murrayc Exp $ */ + +/* bitmap.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include //For ByteOrder. +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(ImageType, GdkImageType) + +/** This represents an area for drawing graphics. It has now been superceded to a large extent by the much more flexible + * Gdk::Drawable RGB functions. + * To create an image from part of a Gdk::Window use Gdk::Drawable::get_image(). + * + * The image can be manipulated with get_pixel() and put_pixel(), or alternatively by changing the actual pixel data, though + * manipulating the pixel data requires complicated code to cope with the different formats that may be used. + * To draw a Gdk::Image in a Gdk::Window or Gdk::Pixmap use Gdk::Drawable::draw_image(). + */ +class Image : public Glib::Object +{ + _CLASS_GOBJECT(Image,GdkImage,GDK_IMAGE,Glib::Object,GObject) + _IGNORE(gdk_image_unref, gdk_image_ref) +protected: + + /** Instantiate a new Gdk::Image. + * + * @param type The type of the Gdk::Image. Gdk::IMAGE_FASTEST is probably the best choice, since it will try to create a Gdk::IMAGE_SHARED image first and if that fails it will then use Gdk::IMAGE_NORMAL. + * @param visual The Gdk::Visual to use for the image. + * @param width The width of the image in pixels. + * @param height The height of the image in pixels. + */ + Image(ImageType type, const Glib::RefPtr& visual, int width, int height); + _IGNORE(gdk_image_new) + +public: + _WRAP_CREATE(ImageType type, const Glib::RefPtr& visual, int width, int height) + + //We ignore gdk_image_new_bitmap() because the documentation says that it is deprecated. + _IGNORE(gdk_image_new_bitmap) + + _WRAP_METHOD(void put_pixel(int x, int y, guint32 pixel), gdk_image_put_pixel) + _WRAP_METHOD(guint32 get_pixel(int x, int y) const, gdk_image_get_pixel) + _WRAP_METHOD(void set_colormap(const Glib::RefPtr& colormap), gdk_image_set_colormap) + _WRAP_METHOD(Glib::RefPtr get_colormap(), gdk_image_get_colormap, refreturn) + _WRAP_METHOD(Glib::RefPtr get_colormap() const, gdk_image_get_colormap, refreturn, constversion) + + _MEMBER_GET(image_type, type, ImageType, GdkImageType) + _MEMBER_GET_GOBJECT(visual, visual, Visual, GdkVisual*) + _MEMBER_GET(byte_order, byte_order, ByteOrder, GdkByteOrder) + _MEMBER_GET(width, width, int, gint) + _MEMBER_GET(height, height, int, gint) + _MEMBER_GET(bpp, bpp, guint16, guint16) + _MEMBER_GET(bpl, bpl, guint16, guint16) + _MEMBER_GET(bits_per_pixel, bits_per_pixel, guint16, guint16) + + //This memory block is not read-only, apparently: + _MEMBER_GET_PTR(mem, mem, void*, gpointer) + + //TODO: This should be const really. + _MEMBER_GET(windowing_data, windowing_data, void*, gpointer) +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/pixbuf.ccg b/libs/gtkmm2/gdk/src/pixbuf.ccg new file mode 100644 index 0000000000..ce19b4786e --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbuf.ccg @@ -0,0 +1,291 @@ +// -*- c++ -*- +/* $Id: pixbuf.ccg,v 1.8 2006/05/11 11:40:23 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +namespace +{ + +static void pixbuf_destroy_data_callback(guint8* pixels, void* user_data) +{ + Gdk::Pixbuf::SlotDestroyData *const slot = static_cast(user_data); + g_return_if_fail(slot != 0); + + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + (*slot)(pixels); // invoke callback + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + + delete slot; +} + +} // anonymous namespace + + +namespace Gdk +{ + +_DEPRECATE_IFDEF_START +Pixbuf::Pixbuf(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_image( + 0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height)) +{} +_DEPRECATE_IFDEF_END + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_image( + 0, src->gobj(), cmap->gobj(), src_x, src_y, 0, 0, width, height)) +{} + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_image( + 0, src->gobj(), 0, src_x, src_y, 0, 0, width, height)) +{} + +_DEPRECATE_IFDEF_START +Pixbuf::Pixbuf(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_drawable( + 0, src->gobj(), cmap->gobj(), src_x, src_y, dest_x, dest_y, width, height)) +{} +_DEPRECATE_IFDEF_END + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_drawable( + 0, src->gobj(), cmap->gobj(), src_x, src_y, 0, 0, width, height)) +{} + +Pixbuf::Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, + int width, int height) +: + Object((GObject*) gdk_pixbuf_get_from_drawable( + 0, src->gobj(), 0, src_x, src_y, 0, 0, width, height)) +{} + +_DEPRECATE_IFDEF_START +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height) +{ + return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) ); +} + +Glib::RefPtr Pixbuf::create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height) +{ + return Glib::RefPtr( new Pixbuf(src, cmap, src_x, src_y, dest_x, dest_y, width, height) ); +} +_DEPRECATE_IFDEF_END + +Glib::RefPtr Pixbuf::create_from_data(const guint8* data, Colorspace colorspace, + bool has_alpha, int bits_per_sample, + int width, int height, int rowstride) +{ + GdkPixbuf *const pixbuf = gdk_pixbuf_new_from_data( + data, (GdkColorspace) colorspace, has_alpha, bits_per_sample, width, height, rowstride, + 0, 0); + + return Glib::wrap(pixbuf); +} + +Glib::RefPtr Pixbuf::create_from_data(const guint8* data, Colorspace colorspace, + bool has_alpha, int bits_per_sample, + int width, int height, int rowstride, + const Pixbuf::SlotDestroyData& destroy_slot) +{ + GdkPixbuf *const pixbuf = gdk_pixbuf_new_from_data( + data, (GdkColorspace) colorspace, has_alpha, bits_per_sample, width, height, rowstride, + &pixbuf_destroy_data_callback, new SlotDestroyData(destroy_slot)); + + return Glib::wrap(pixbuf); +} + +void Pixbuf::render_pixmap_and_mask_for_colormap(const Glib::RefPtr& colormap, + Glib::RefPtr& pixmap_return, + Glib::RefPtr& mask_return, + int alpha_threshold) +{ + GdkPixmap* pPixmap = 0; + GdkBitmap* pBitmap = 0; + + gdk_pixbuf_render_pixmap_and_mask_for_colormap( + gobj(), colormap->gobj(), &pPixmap, &pBitmap, alpha_threshold); + + pixmap_return = Glib::wrap((GdkPixmapObject*) pPixmap); + mask_return = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) pBitmap)); +} + +void Pixbuf::render_pixmap_and_mask(Glib::RefPtr& pixmap_return, + Glib::RefPtr& mask_return, + int alpha_threshold) +{ + GdkPixmap* pPixmap = 0; + GdkBitmap* pBitmap = 0; + + gdk_pixbuf_render_pixmap_and_mask(gobj(), &pPixmap, &pBitmap, alpha_threshold); + + pixmap_return = Glib::wrap((GdkPixmapObject*) pPixmap); + mask_return = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) pBitmap)); +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +void Pixbuf::save(const std::string& filename, const Glib::ustring& type) +#else +void Pixbuf::save(const std::string& filename, const Glib::ustring& type, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + gdk_pixbuf_savev(gobj(), filename.c_str(), type.c_str(), 0, 0, &gerror); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +void Pixbuf::save(const std::string& filename, const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values) +#else +void Pixbuf::save(const std::string& filename, const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + + gdk_pixbuf_savev( + gobj(), filename.c_str(), type.c_str(), + const_cast(option_keys.data()), const_cast(option_values.data()), + &gerror); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type) +#else +void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + + gdk_pixbuf_save_to_buffer( + gobj(), &buffer, &buffer_size, + type.c_str(), + &gerror, NULL); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values) +#else +void Pixbuf::save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + + gdk_pixbuf_save_to_bufferv( + gobj(), &buffer, &buffer_size, + type.c_str(), + const_cast(option_keys.data()), const_cast(option_values.data()), + &gerror); + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED +} + +Pixbuf::SListHandle_PixbufFormat Pixbuf::get_formats() +{ + return SListHandle_PixbufFormat(gdk_pixbuf_get_formats(), Glib::OWNERSHIP_SHALLOW); +} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixbuf.hg b/libs/gtkmm2/gdk/src/pixbuf.hg new file mode 100644 index 0000000000..5a9dedf205 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbuf.hg @@ -0,0 +1,622 @@ +/* $Id: pixbuf.hg,v 1.16 2006/05/11 11:40:23 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +// This is for including the config header before any code (such as +// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated: +_CONFIGINCLUDE(gdkmmconfig.h) + +#include +#include +#include +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +_CC_INCLUDE(gdk-pixbuf/gdk-pixbuf-enum-types.h) +_WRAP_ENUM(Colorspace, GdkColorspace) +_WRAP_ENUM(InterpType, GdkInterpType) +_WRAP_ENUM(PixbufAlphaMode, GdkPixbufAlphaMode) +_WRAP_ENUM(PixbufRotation, GdkPixbufRotation) + +/** Exception class for Gdk::Pixbuf errors. + */ +_WRAP_GERROR(PixbufError,GdkPixbufError,GDK_PIXBUF_ERROR) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +struct PixbufFormatTraits +{ + typedef PixbufFormat CppType; + typedef const GdkPixbufFormat* CType; + typedef GdkPixbufFormat* CTypeNonConst; + + static CType to_c_type (const CppType& obj) { return obj.gobj(); } + static CType to_c_type (CType ptr) { return ptr; } + static CppType to_cpp_type (CType ptr) { return PixbufFormat(ptr); /* Does not take ownership */ } + static void release_c_type (CType /* ptr */) { /* Doesn't happen */ } +}; +#endif //DOXYGEN_SHOULD_SKIP_THIS + +class Pixbuf : public Glib::Object +{ + _CLASS_GOBJECT(Pixbuf, GdkPixbuf, GDK_PIXBUF, Glib::Object, GObject) + _IGNORE(gdk_pixbuf_ref, gdk_pixbuf_unref, gdk_pixbuf_render_pixmap_and_mask, + gdk_pixbuf_render_pixmap_and_mask_for_colormap, + gdk_pixbuf_get_from_image, gdk_pixbuf_get_from_drawable, + gdk_pixbuf_set_option, gdk_pixbuf_get_option, gdk_pixbuf_non_anim_new) + +protected: + + /** Creates a pixbuf object from a drawable. + * + * Transfers image data from a Drawable and converts it to an RGB(A) + * representation inside a Pixbuf. In other words, copies + * image data from a server-side drawable to a client-side RGB(A) buffer. + * This allows you to efficiently read individual pixels on the client side. + * + * If the drawable @src has no colormap (See Gdk::Drawable::get_colormap()), + * then a suitable colormap must be specified. Otherwise, you may use the + * constructor that takes no colormap argument. + * Typically a Gdk::Window or a pixmap created by passing a Gdk:Window + * to the Gdk::Pixbuf constructor will already have a colormap associated with + * it. If the drawable is a bitmap (1 bit per pixel pixmap), + * then a colormap is not required; pixels with a value of 1 are + * assumed to be white, and pixels with a value of 0 are assumed to be + * black. For taking screenshots, Gdk::Colormap::get_system() returns + * the correct colormap to use. + * + * This will create an RGB pixbuf with 8 bits per channel and no + * alpha, with the same size specified by the @a width and @a height + * arguments. + * + * If the specified drawable is a pixmap, then the requested source + * rectangle must be completely contained within the pixmap, otherwise + * the constructor will fail. For pixmaps only (not for windows) + * passing -1 for width or height is allowed to mean the full width + * or height of the pixmap. + * + * If the specified drawable is a window, and the window is off the + * screen, then there is no image data in the obscured/offscreen + * regions to be placed in the pixbuf. The contents of portions of the + * pixbuf corresponding to the offscreen region are undefined. + * + * If the window you're obtaining data from is partially obscured by + * other windows, then the contents of the pixbuf areas corresponding + * to the obscured regions are undefined. + * + * See alo Gdk::Drawable::get_image(). + * + * @param src Source drawable. + * @param cmap: A colormap. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int width, int height); + + /** Creates a pixbuf object from a drawable, using the colormap from the drawable. + * + * @param src Source drawable. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, int width, int height); + + _DEPRECATE_IFDEF_START + /// @deprecated Use the constructor without dest_x and dest_y parameters. + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int dest_x, int dest_y, int width, int height); + _DEPRECATE_IFDEF_END + + /** Creates a pixbuf object from an image. + * + * @param src Source Image. + * @param cmap A colormap. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int width, int height); + + /** Creates a pixbuf object from an image, using the colormap from the image. + * + * @param src Source Image. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newinp212 + */ + Pixbuf(const Glib::RefPtr& src, + int src_x, int src_y, int width, int height); + + _DEPRECATE_IFDEF_START + /// @deprecated Use the constructors without dest_x and dest_y parameters. + Pixbuf(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int dest_x, int dest_y, int width, int height); + _DEPRECATE_IFDEF_END + +public: + typedef sigc::slot SlotDestroyData; + + // Hand-coded so the implementation in the .ccg is also only + // built when GDKMM_DISABLE_DEPRECATED is defined. + _DEPRECATE_IFDEF_START + /** @deprecated Use the create() methods that don't have the unused dest_x and dest_y parameters. */ + static Glib::RefPtr create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height); + + /** @deprecated Use the create() methods that that don't have the unused dest_x and dest_y parameters. */ + static Glib::RefPtr create(const Glib::RefPtr& src, + const Glib::RefPtr& cmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height); + _DEPRECATE_IFDEF_END + + /** Creates a pixbuf object from a drawable. + * + * Transfers image data from a Drawable and converts it to an RGB(A) + * representation inside a Pixbuf. In other words, copies + * image data from a server-side drawable to a client-side RGB(A) buffer. + * This allows you to efficiently read individual pixels on the client side. + * + * If the drawable @src has no colormap (See Gdk::Drawable::get_colormap()), + * then a suitable colormap must be specified. Otherwise, you may use the + * constructor that takes no colormap argument. + * Typically a Gdk::Window or a pixmap created by passing a Gdk:Window + * to the Gdk::Pixbuf constructor will already have a colormap associated with + * it. If the drawable is a bitmap (1 bit per pixel pixmap), + * then a colormap is not required; pixels with a value of 1 are + * assumed to be white, and pixels with a value of 0 are assumed to be + * black. For taking screenshots, Gdk::Colormap::get_system() returns + * the correct colormap to use. + * + * This will create an RGB pixbuf with 8 bits per channel and no + * alpha, with the same size specified by the @a width and @a height + * arguments. + * + * If the specified drawable is a pixmap, then the requested source + * rectangle must be completely contained within the pixmap, otherwise + * the constructor will fail. For pixmaps only (not for windows) + * passing -1 for width or height is allowed to mean the full width + * or height of the pixmap. + * + * If the specified drawable is a window, and the window is off the + * screen, then there is no image data in the obscured/offscreen + * regions to be placed in the pixbuf. The contents of portions of the + * pixbuf corresponding to the offscreen region are undefined. + * + * If the window you're obtaining data from is partially obscured by + * other windows, then the contents of the pixbuf areas corresponding + * to the obscured regions are undefined. + * + * See alo Gdk::Drawable::get_image(). + * + * @param src Source drawable. + * @param cmap: A colormap. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + _WRAP_CREATE(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int width, int height) + + /** Creates a pixbuf object from a drawable, using the colormap from the drawable. + * + * @param src Source drawable. + * @param src_x Source X coordinate within drawable. + * @param src_y Source Y coordinate within drawable. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + _WRAP_CREATE(const Glib::RefPtr& src, + int src_x, int src_y, int width, int height) + + /** Creates a pixbuf object from an image. + * + * @param src Source Image. + * @param cmap A colormap. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newin2p12 + */ + _WRAP_CREATE(const Glib::RefPtr& src, const Glib::RefPtr& cmap, + int src_x, int src_y, int width, int height) + + /** Creates a pixbuf object from an image, using the colormap from the image. + * + * @param src Source Image. + * @param src_x Source X coordinate within the image. + * @param src_y Source Y coordinate within the image. + * @param width Width in pixels of region to get. + * @param height Height in pixels of region to get. + * + * @newinp212 + */ + _WRAP_CREATE(const Glib::RefPtr& src, + int src_x, int src_y, int width, int height) + + _WRAP_METHOD(Glib::RefPtr copy() const, gdk_pixbuf_copy) + + _WRAP_METHOD(static Glib::RefPtr create( + Colorspace colorspace, bool has_alpha, + int bits_per_sample, int width, int height), + gdk_pixbuf_new) + + _WRAP_METHOD(static Glib::RefPtr create_subpixbuf( + const Glib::RefPtr& src_pixbuf, + int src_x, int src_y, int width, int height), + gdk_pixbuf_new_subpixbuf) + + /** Creates a new pixbuf by loading an image from a file. The file format is detected automatically. + * @param filename The path to the pixbuf file. + * + * @throw Glib::FileError + * @throw Gdk::PixbufError + */ + _WRAP_METHOD(static Glib::RefPtr create_from_file(const std::string& filename), gdk_pixbuf_new_from_file, errthrow) + + /** Creates a new pixbuf by loading an image from a file. The file format is detected automatically. + * The image will be scaled to fit in the requested size. + * @param filename The path to the pixbuf file. + * @param width The desired width + * @param height The desired height + * @param preserve_aspect_ratio: Whether the image's aspect ratio will be preserved when scaling. + * + * @throw Glib::FileError + * @throw Gdk::PixbufError + */ + _WRAP_METHOD(static Glib::RefPtr create_from_file(const std::string& filename, int width, int height, bool preserve_aspect_ratio = true), gdk_pixbuf_new_from_file_at_scale, errthrow) + _IGNORE(gdk_pixbuf_new_from_file_at_scale, gdk_pixbuf_new_from_file_at_size) //gdk_pixbuf_new_from_file_at_size() just calls gdk_pixbuf_new_from_file_at_scale(). + + /** Creates a new Gdk::Pixbuf out of in-memory image data. + * Currently only RGB images with 8 bits per sample are supported. + * + * @param data %Image data in 8-bit/sample packed format. + * @param colorspace Colorspace for the image data. + * @param has_alpha Whether the data has an opacity channel. + * @param bits_per_sample Number of bits per sample. + * @param width Width of the image in pixels. + * @param height Height of the image in pixels. + * @param rowstride Distance in bytes between rows. + * @return A newly-created Gdk::Pixbuf object. + */ + static Glib::RefPtr create_from_data(const guint8* data, Colorspace colorspace, + bool has_alpha, int bits_per_sample, + int width, int height, int rowstride); + + /** Creates a new Gdk::Pixbuf out of in-memory image data. + * Currently only RGB images with 8 bits per sample are supported. + * + * @param data %Image data in 8-bit/sample packed format. + * @param colorspace Colorspace for the image data. + * @param has_alpha Whether the data has an opacity channel. + * @param bits_per_sample Number of bits per sample. + * @param width Width of the image in pixels. + * @param height Height of the image in pixels. + * @param rowstride Distance in bytes between rows. + * @param destroy_slot Slot used to free the data when the pixbuf's + * reference count drops to zero. + * @return A newly-created Gdk::Pixbuf object. + */ + static Glib::RefPtr create_from_data(const guint8* data, Colorspace colorspace, + bool has_alpha, int bits_per_sample, + int width, int height, int rowstride, + const SlotDestroyData& destroy_slot); + + _WRAP_METHOD(static Glib::RefPtr create_from_xpm_data(const char *const * data), + gdk_pixbuf_new_from_xpm_data) + + /** Create a Gdk::Pixbuf from a flat representation that is suitable for + * storing as inline data in a program. This is useful if you want to ship a + * program with images, but don't want to depend on any external files. + * + * GTK+ ships with a program called gdk-pixbuf-csource which allows + * for conversion of GdkPixbufs into such a inline representation. In almost + * all cases, you should pass the --raw flag to + * gdk-pixbuf-csource. A sample invocation would be: + * + * gdk-pixbuf-csource --raw --name=myimage_inline myimage.png + * + * For the typical case where the inline pixbuf is read-only static data, you + * don't need to copy the pixel data unless you intend to write to it, so you + * can pass false for @a copy_pixels. (If you pass --rle to + * gdk-pixbuf-csource, a copy will be made even if @a copy_pixels is + * false, so using this option is generally a bad idea.) + * + * If you create a pixbuf from const inline data compiled into your program, + * it's probably safe to ignore errors, since things will always succeed. For + * non-const inline data, you could get out of memory. For untrusted inline + * data located at runtime, you could have corrupt inline data in addition. + * + * @param data_length Length in bytes of the @a data argument. + * @param data Byte data containing a serialized GdkPixdata structure. + * @param copy_pixels Whether to copy the pixel data, or use direct pointers + * to @a data for the resulting pixbuf. + * @throw Gdk::PixbufError + */ + _WRAP_METHOD(static Glib::RefPtr create_from_inline(int data_length, const guint8* data, + bool copy_pixels = false), gdk_pixbuf_new_from_inline, errthrow) + + + _WRAP_METHOD(Colorspace get_colorspace() const, gdk_pixbuf_get_colorspace) + + _WRAP_METHOD(int get_n_channels() const, gdk_pixbuf_get_n_channels) + _WRAP_METHOD(bool get_has_alpha() const, gdk_pixbuf_get_has_alpha) + _WRAP_METHOD(int get_bits_per_sample() const, gdk_pixbuf_get_bits_per_sample) + _WRAP_METHOD(guint8* get_pixels() const, gdk_pixbuf_get_pixels) + _WRAP_METHOD(int get_width() const, gdk_pixbuf_get_width) + _WRAP_METHOD(int get_height() const, gdk_pixbuf_get_height) + _WRAP_METHOD(int get_rowstride() const, gdk_pixbuf_get_rowstride) + + _WRAP_METHOD(void fill(guint32 pixel), gdk_pixbuf_fill) + + /** Saves pixbuf to a file in format @a type. + * By default, "jpeg", "png", "ico" and "bmp" are possible file formats to save in, but more formats may be installed. + * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with + * Gdk::PixbufFormat::is_writable(). + * + * @param filename The path of the file to be created. + * @param type The file type. + * + * @throw Glib::FileError + * @throw Gdk::PixbufError + */ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + void save(const std::string& filename, const Glib::ustring& type); + #else + void save(const std::string& filename, const Glib::ustring& type, std::auto_ptr& error); + #endif //GLIBMM_EXCEPTIONS_ENABLED + _IGNORE(gdk_pixbuf_save) + + /** Saves pixbuf to a file in format @a type. + * By default, "jpeg", "png", "ico" and "bmp" are possible file formats to save in, but more formats may be installed. + * TThe list of all writable formats can be determined by using Gdk::Pixbuf::get_formats() with + * Gdk::PixbufFormat::is_writable(). + * + * The @a option_keys and @option_values, if not empty, should contain pairs of strings that modify the save parameters. + * For example, "quality", "100". + * + * Currently only a few parameters exist. JPEG images can be saved with a "quality" parameter; + * its value should be in the range [0,100]. Text chunks can be attached to PNG images by specifying parameters of the + * form "tEXt::key", where key is an ASCII string of length 1-79. The values are UTF-8 encoded strings. ICO images can be + * saved in depth 16, 24, or 32, by using the "depth" parameter. When the ICO saver is given "x_hot" and "y_hot" + * parameters, it produces a CUR instead of an ICO. + * + * @param filename The path of the file to be created. + * @param type The file type. + * @param option_keys + * @param option_values + * + * @throw Glib::FileError + * @throw Gdk::PixbufError + */ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + void save(const std::string& filename, const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values); + #else + void save(const std::string& filename, const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values, std::auto_ptr& error); + #endif //GLIBMM_EXCEPTIONS_ENABLED + + _IGNORE(gdk_pixbuf_savev) + + +/* TODO: +typedef gboolean (*GdkPixbufSaveFunc) (const gchar *buf, + gsize count, + GError **error, + gpointer data); + +gboolean gdk_pixbuf_save_to_callback (GdkPixbuf *pixbuf, + GdkPixbufSaveFunc save_func, + gpointer user_data, + const char *type, + GError **error, + ...); + +gboolean gdk_pixbuf_save_to_callbackv (GdkPixbuf *pixbuf, + GdkPixbufSaveFunc save_func, + gpointer user_data, + const char *type, + char **option_keys, + char **option_values, + GError **error); + +*/ + + /* Saves the pixbuf to a new buffer in format @a type. + * Note that the buffer is not nul-terminated and may contain embedded nulls. + * @see save(). + * + * @param buffer This will be set to the address of a new buffer. + * @param size This will be set to the size of the @a buffer. + * @param type Currently "jpeg", "png", "ico" or "bmp". + * + * @throw Glib::FileError + * @throw Gdk::PixbufError + */ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + void save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type = "png"); + #else + void save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type, std::auto_ptr& error); + #endif //GLIBMM_EXCEPTIONS_ENABLED + + /* Saves the pixbuf to a new buffer in format @a type. + * Note that the buffer is not nul-terminated and may contain embedded nulls. + * @see save(). + * + * @param buffer This will be set to the address of a new buffer. + * @param size This will be set to the size of the @a buffer. + * @param type Currently "jpeg", "png", "ico" or "bmp". + * + * @throw Glib::FileError + * @throw Gdk::PixbufError + */ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + void save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values); + #else + void save_to_buffer(gchar*& buffer, gsize& buffer_size, + const Glib::ustring& type, + const Glib::StringArrayHandle& option_keys, + const Glib::StringArrayHandle& option_values, std::auto_ptr& error); + #endif //GLIBMM_EXCEPTIONS_ENABLED + _IGNORE(gdk_pixbuf_save_to_bufferv, gdk_pixbuf_save_to_buffer) + + + + _WRAP_METHOD(Glib::RefPtr add_alpha( + bool substitute_color, guint8 r, guint8 g, guint8 b) const, + gdk_pixbuf_add_alpha) + + _WRAP_METHOD(void copy_area( + int src_x, int src_y, int width, int height, + const Glib::RefPtr& dest_pixbuf, + int dest_x, int dest_y) const, + gdk_pixbuf_copy_area) + + _WRAP_METHOD(void saturate_and_pixelate( + const Glib::RefPtr& dest, + float saturation, bool pixelate) const, + gdk_pixbuf_saturate_and_pixelate) + + + _WRAP_METHOD(void scale(const Glib::RefPtr& dest, + int dest_x, int dest_y, + int dest_width, int dest_height, + double offset_x, double offset_y, + double scale_x, double scale_y, + InterpType interp_type) const, + gdk_pixbuf_scale) + + _WRAP_METHOD(void composite(const Glib::RefPtr& dest, + int dest_x, int dest_y, + int dest_width, int dest_height, + double offset_x, double offset_y, + double scale_x, double scale_y, + InterpType interp_type, + int overall_alpha) const, + gdk_pixbuf_composite) + + _WRAP_METHOD(void composite_color(const Glib::RefPtr& dest, + int dest_x, int dest_y, + int dest_width, int dest_height, + double offset_x, double offset_y, + double scale_x, double scale_y, + InterpType interp_type, + int overall_alpha, + int check_x, int check_y, + int check_size, + guint32 color1, guint32 color2) const, + gdk_pixbuf_composite_color) + + _WRAP_METHOD(Glib::RefPtr scale_simple( + int dest_width, int dest_height, + InterpType interp_type) const, + gdk_pixbuf_scale_simple) + + _WRAP_METHOD(Glib::RefPtr composite_color_simple( + int dest_width, int dest_height, + InterpType interp_type, + int overall_alpha, int check_size, + guint32 color1, guint32 color2) const, + gdk_pixbuf_composite_color_simple) + + _WRAP_METHOD(Glib::RefPtr rotate_simple(PixbufRotation angle) const, gdk_pixbuf_rotate_simple) + _WRAP_METHOD(Glib::RefPtr flip(bool horizontal = true) const, gdk_pixbuf_flip) + + _WRAP_METHOD(void render_threshold_alpha(const Glib::RefPtr& bitmap, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height, + int alpha_threshold), gdk_pixbuf_render_threshold_alpha) + + _WRAP_METHOD(void render_to_drawable(const Glib::RefPtr& drawable, + const Glib::RefPtr& gc, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height, + RgbDither dither, + int x_dither, int y_dither), gdk_pixbuf_render_to_drawable) + _WRAP_METHOD(void render_to_drawable_alpha(const Glib::RefPtr& drawable, + int src_x, int src_y, + int dest_x, int dest_y, + int width, int height, + PixbufAlphaMode alpha_mode, + int alpha_threshold, + RgbDither dither, + int x_dither, int y_dither), gdk_pixbuf_render_to_drawable_alpha) + + void render_pixmap_and_mask_for_colormap(const Glib::RefPtr& colormap, + Glib::RefPtr& pixmap_return, + Glib::RefPtr& mask_return, + int alpha_threshold); + + void render_pixmap_and_mask(Glib::RefPtr& pixmap_return, + Glib::RefPtr& mask_return, int alpha_threshold); + + _WRAP_METHOD(Glib::ustring get_option(const Glib::ustring& key) const, gdk_pixbuf_get_option) + + + typedef Glib::SListHandle< Glib::RefPtr, PixbufFormatTraits > SListHandle_PixbufFormat; + static SListHandle_PixbufFormat get_formats(); + _IGNORE(gdk_pixbuf_get_formats) +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixbufanimation.ccg b/libs/gtkmm2/gdk/src/pixbufanimation.ccg new file mode 100644 index 0000000000..74c9b95e11 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufanimation.ccg @@ -0,0 +1,36 @@ +// -*- c++ -*- +/* $Id: pixbufanimation.ccg,v 1.1 2003/01/21 13:38:36 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gdk +{ + +Glib::RefPtr PixbufAnimation::create_from_file(const Glib::ustring& filename) +{ + GError* pError = 0; + return Glib::wrap(gdk_pixbuf_animation_new_from_file(filename.c_str(), &pError)); +} + +} //Gdk + + diff --git a/libs/gtkmm2/gdk/src/pixbufanimation.hg b/libs/gtkmm2/gdk/src/pixbufanimation.hg new file mode 100644 index 0000000000..f83a154754 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufanimation.hg @@ -0,0 +1,52 @@ +/* $Id: pixbufanimation.hg,v 1.1 2003/01/21 13:38:37 murrayc Exp $ */ + +/* box.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +class PixbufAnimation : public Glib::Object +{ + _CLASS_GOBJECT(PixbufAnimation, GdkPixbufAnimation, GDK_PIXBUF_ANIMATION, Glib::Object, GObject) + _IGNORE(gdk_pixbuf_animation_ref, gdk_pixbuf_animation_unref) +protected: + +public: + + static Glib::RefPtr create_from_file(const Glib::ustring& filename); + + _WRAP_METHOD(int get_width() const, gdk_pixbuf_animation_get_width) + _WRAP_METHOD(int get_height() const, gdk_pixbuf_animation_get_height) + _WRAP_METHOD(bool is_static_image() const, gdk_pixbuf_animation_is_static_image) + _WRAP_METHOD(Glib::RefPtr get_static_image(), gdk_pixbuf_animation_get_static_image, refreturn) + _WRAP_METHOD(Glib::RefPtr get_iter(const GTimeVal* start_time), gdk_pixbuf_animation_get_iter, refreturn) +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/pixbufanimationiter.ccg b/libs/gtkmm2/gdk/src/pixbufanimationiter.ccg new file mode 100644 index 0000000000..3c5e019859 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufanimationiter.ccg @@ -0,0 +1,23 @@ +// -*- c++ -*- +/* $Id: pixbufanimationiter.ccg,v 1.1 2003/01/21 13:38:37 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + diff --git a/libs/gtkmm2/gdk/src/pixbufanimationiter.hg b/libs/gtkmm2/gdk/src/pixbufanimationiter.hg new file mode 100644 index 0000000000..c5c10efa1c --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufanimationiter.hg @@ -0,0 +1,41 @@ +/* $Id: pixbufanimationiter.hg,v 1.2 2004/04/12 11:04:05 murrayc Exp $ */ + +/* pixbufanimationiter.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +class PixbufAnimationIter : public Glib::Object +{ + _CLASS_GOBJECT(PixbufAnimationIter, GdkPixbufAnimationIter, GDK_PIXBUF_ANIMATION_ITER, Glib::Object, GObject) +protected: + + +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/pixbufformat.ccg b/libs/gtkmm2/gdk/src/pixbufformat.ccg new file mode 100644 index 0000000000..0c30113e67 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufformat.ccg @@ -0,0 +1,58 @@ +// -*- c++ -*- +/* $Id: pixbufformat.ccg,v 1.2 2003/11/22 18:58:20 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +namespace Gdk +{ + +PixbufFormat::PixbufFormat() +: gobject_ (0) +{} + +PixbufFormat::PixbufFormat(const GdkPixbufFormat* gobject) +: gobject_ (gobject) +{} + +PixbufFormat::~PixbufFormat() +{ + //We don't free anything because we did not take ownership of the underlying C instance + //(because we can't.) +} + +PixbufFormat::PixbufFormat(const PixbufFormat& src) +: gobject_(src.gobject_) +{ +} + +PixbufFormat& PixbufFormat::operator=(const PixbufFormat& src) +{ + gobject_ = src.gobject_; + return *this; +} + + + + + + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixbufformat.hg b/libs/gtkmm2/gdk/src/pixbufformat.hg new file mode 100644 index 0000000000..87a0d5a329 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufformat.hg @@ -0,0 +1,65 @@ +/* $Id: pixbufformat.hg,v 1.4 2005/01/05 17:30:16 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(gdkmm,gdk) + +#include + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { typedef struct _GdkPixbufFormat GdkPixbufFormat; } +#endif + +namespace Gdk +{ + +class PixbufFormat +{ + _CLASS_GENERIC(PixbufFormat, GdkPixbufFormat) + +public: + PixbufFormat(); + explicit PixbufFormat(const GdkPixbufFormat* gobject); + virtual ~PixbufFormat(); + + PixbufFormat(const PixbufFormat& src); + PixbufFormat& operator=(const PixbufFormat& src); + + _WRAP_METHOD(Glib::ustring get_name() const, gdk_pixbuf_format_get_name) + _WRAP_METHOD(Glib::ustring get_description() const, gdk_pixbuf_format_get_description) + _WRAP_METHOD(Glib::StringArrayHandle get_mime_types() const, gdk_pixbuf_format_get_mime_types) + _WRAP_METHOD(Glib::StringArrayHandle get_extensions() const, gdk_pixbuf_format_get_extensions) + _WRAP_METHOD(bool is_writable() const, gdk_pixbuf_format_is_writable) + + _WRAP_METHOD(bool is_scalable() const, gdk_pixbuf_format_is_scalable) + _WRAP_METHOD(bool is_disabled() const, gdk_pixbuf_format_is_disabled) + _WRAP_METHOD(void set_disabled(bool disabled = true), gdk_pixbuf_format_set_disabled) + _WRAP_METHOD(Glib::ustring get_license() const, gdk_pixbuf_format_get_license) + + /// Provides access to the underlying C GObject. + GdkPixbufFormat* gobj() { return const_cast(gobject_); } + /// Provides access to the underlying C GObject. + const GdkPixbufFormat* gobj() const { return gobject_; } + +protected: + const GdkPixbufFormat* gobject_; +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixbufloader.ccg b/libs/gtkmm2/gdk/src/pixbufloader.ccg new file mode 100644 index 0000000000..171622d422 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufloader.ccg @@ -0,0 +1,60 @@ +// -*- c++ -*- +/* $Id: pixbufloader.ccg,v 1.6 2006/05/11 11:40:23 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + + +namespace +{ + +/* We use this helper function in the constructor to be able to throw + * before the base class' (Glib::Object) constructor is called. + */ +static GdkPixbufLoader* pixbuf_loader_create_with_type(const Glib::ustring& image_type, bool mime_type) +{ + GError* error = 0; + GdkPixbufLoader* loader = 0; + + if(mime_type) + loader = gdk_pixbuf_loader_new_with_mime_type(image_type.c_str(), &error); + else + loader = gdk_pixbuf_loader_new_with_type(image_type.c_str(), &error); + + if(error) + Glib::Error::throw_exception(error); + + return loader; +} + +} // anonymous namespace + + +namespace Gdk +{ + +PixbufLoader::PixbufLoader(const Glib::ustring& image_type, bool mime_type) +: + Glib::ObjectBase(0), + Glib::Object((GObject*) pixbuf_loader_create_with_type(image_type, mime_type)) +{} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixbufloader.hg b/libs/gtkmm2/gdk/src/pixbufloader.hg new file mode 100644 index 0000000000..90c7f8e00c --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixbufloader.hg @@ -0,0 +1,173 @@ +/* $Id: pixbufloader.hg,v 1.13 2006/05/18 17:53:14 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +class PixbufLoader : public Glib::Object +{ + _CLASS_GOBJECT(PixbufLoader, GdkPixbufLoader, GDK_PIXBUF_LOADER, Glib::Object, GObject) +protected: + + /** Constructs a pixbuf loader object. + */ + _CTOR_DEFAULT() + + /** Constructs a pixbuf loader object for a specific image type. + * Constructs a new pixbuf loader object that always attempts to parse image + * data as if it were an image of type @a image_type, instead of identifying + * the type automatically. Useful if you want an error if the image isn't the + * expected type, for loading image formats that can't be reliably identified + * by looking at the data, or if the user manually forces a specific type. + * + * The image_type can be one of the types returned by Gdk::Pixbuf::get_formats(), or a MIME type. + * + * Common MIME Types are listed here + * http://www.iana.org/assignments/media-types/ + * and here: + * http://www.freedesktop.org/Software/shared-mime-info + * + * The list of non-mime-type image formats depends on what image loaders + * are installed, but typically "png", "jpeg", "gif", "tiff" and + * "xpm" are among the supported formats. To obtain the full list of + * supported image formats, call PixbufFormat::get_name() on each + * of the PixbufFormats returned by Gdk::Pixbuf::get_formats(). + * + * @param image_type Name of the image format to be loaded with the image. + * @param mime_type If this is true then the image_type is a MIME type. + * @throw Gdk::PixbufError + */ + explicit PixbufLoader(const Glib::ustring& image_type, bool mime_type = false); + +public: + + /** Creates a new pixbuf loader object. + * @return A newly-created pixbuf loader. + */ + _WRAP_CREATE() + + /** Constructs a pixbuf loader object for a specific image type. + * Constructs a new pixbuf loader object that always attempts to parse image + * data as if it were an image of type @a image_type, instead of identifying + * the type automatically. Useful if you want an error if the image isn't the + * expected type, for loading image formats that can't be reliably identified + * by looking at the data, or if the user manually forces a specific type. + * + * The image_type can be one of the types returned by Gdk::Pixbuf::get_formats(), or a MIME type. + * + * Common MIME Types are listed here + * http://www.iana.org/assignments/media-types/ + * and here: + * http://www.freedesktop.org/Software/shared-mime-info + * + * The list of non-mime-type image formats depends on what image loaders + * are installed, but typically "png", "jpeg", "gif", "tiff" and + * "xpm" are among the supported formats. To obtain the full list of + * supported image formats, call PixbufFormat::get_name() on each + * of the PixbufFormats returned by Gdk::Pixbuf::get_formats(). + * + * @param image_type Name of the image format to be loaded with the image. + * @param mime_type If this is true then the image_type is a MIME type. + * @throw Gdk::PixbufError + */ + _WRAP_CREATE(const Glib::ustring& image_type, bool mime_type = false) + + _WRAP_METHOD(void set_size(int width, int height), gdk_pixbuf_loader_set_size) + +#m4 _CONVERSION(`const guint8*',`const guchar*',`($3)') + + /** Causes the pixbuf loader to parse the next @a count bytes of an image. + * It will return if the data was loaded successfully, and throw an exception + * if an error occurred. In the latter case, the loader will be closed, and + * will not accept further writes. + * @param buf Pointer to image data. + * @param count Length of the @a buf buffer in bytes. + * @throw Gdk::PixbufError + * @throw Glib::FileError + */ + _WRAP_METHOD(void write(const guint8* buf, gsize count), gdk_pixbuf_loader_write, errthrow) + + /** Informs a pixbuf loader that no further writes with PixbufLoader::write() + * will occur, so that it can free its internal loading structures. Also, + * tries to parse any data that hasn't yet been parsed; if the remaining data + * is partial or corrupt, an exception will be thrown. If you're just + * cancelling a load rather than expecting it to be finished, writing an + * empty catch() block to ignore errors is reasonable. + * @throw Gdk::PixbufError + * @throw Glib::FileError + */ + _WRAP_METHOD(void close(), gdk_pixbuf_loader_close, errthrow) + + _WRAP_METHOD(Glib::RefPtr get_pixbuf(), gdk_pixbuf_loader_get_pixbuf, refreturn) + _WRAP_METHOD(Glib::RefPtr get_animation(), gdk_pixbuf_loader_get_animation, refreturn) + + _WRAP_METHOD(PixbufFormat get_format() const, gdk_pixbuf_loader_get_format) + + /** This signal is emitted when the pixbuf loader has allocated the + * pixbuf in the desired size. After this signal is emitted, + * applications can call get_pixbuf() to fetch + * the partially-loaded pixbuf. + */ + _WRAP_SIGNAL(void area_prepared(), "area_prepared") + + /** This signal is emitted when a significant area of the image being + * loaded has been updated. Normally it means that a complete + * scanline has been read in, but it could be a different area as + * well. Applications can use this signal to know when to repaint + * areas of an image that is being loaded. + * + * @param X offset of upper-left corner of the updated area. + * @param y Y offset of upper-left corner of the updated area. + * @param width Width of updated area. + * @param height Height of updated area. + */ + _WRAP_SIGNAL(void area_updated(int x, int y, int width, int height), "area_updated") + + /** This signal is emitted when close() is called. + * It can be used by different parts of an application to receive + * notification when an image loader is closed by the code that + * drives it. + */ + _WRAP_SIGNAL(void closed(), "closed") + + //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI. + //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install. + /** This signal is emitted when the pixbuf loader has been fed the + * initial amount of data that is required to figure out the size + * of the image that it will create. Applications can call + * set_size() in response to this signal to set + * the desired size to which the image should be scaled. + * + * @param width The original width of the image. + * @param height The original height of the image + */ + _WRAP_SIGNAL(void size_prepared(int width, int height), "size_prepared", no_default_handler) +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixmap.ccg b/libs/gtkmm2/gdk/src/pixmap.ccg new file mode 100644 index 0000000000..1a8125b6c2 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixmap.ccg @@ -0,0 +1,204 @@ +// -*- c++ -*- +/* $Id: pixmap.ccg,v 1.4 2004/03/10 01:17:36 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +namespace Gdk +{ + +Glib::ObjectBase* Pixmap_Class::wrap_new(GObject* object) +{ + GdkPixmapObject *const pixmap_object = GDK_PIXMAP_OBJECT(object); + + g_return_val_if_fail(pixmap_object != 0, 0); + + // GdkPixmap and GdkBitmap are actually both of type GdkPixmapObject. + // A Bitmap is is a Pixmap with a depth of 1. Since these are distinct + // types in gtkmm, we dynamically create either a Pixmap or a Bitmap, + // depending on the depth field. + + if(pixmap_object->depth != 1) + return new Gdk::Pixmap((GdkPixmap*) pixmap_object); + else + return new Gdk::Bitmap((GdkBitmap*) pixmap_object); +} + + +Pixmap::Pixmap(const Glib::RefPtr& drawable, int width, int height, int depth) +: + Drawable((GdkDrawable*) gdk_pixmap_new(Glib::unwrap(drawable), width, height, depth)) +{ + //gdk_pixmap_new() is implemented differently for x11, win32, etc, + //so we can't really derived a new GType for GdkPixmap. +} + +Pixmap::Pixmap(const Glib::RefPtr& drawable, const char* data, int width, int height, int depth, + const Color& fg, const Color& bg) +: + Drawable((GdkDrawable*) gdk_pixmap_create_from_data( + Glib::unwrap(drawable), data, width, height, depth, + const_cast(fg.gobj()), const_cast(bg.gobj()))) +{ + //gdk_pixmap_new() is implemented differently for x11, win32, etc, + //so we can't really derived a new GType for GdkPixmap. +} + +Pixmap::Pixmap(const Glib::RefPtr& display, NativeWindow anid) +: + Drawable( (GdkDrawable*) gdk_pixmap_foreign_new_for_display(display->gobj(), anid) ) +{ + //gdk_pixmap_new() is implemented differently for x11, win32, etc, + //so we can't really derived a new GType for GdkPixmap. +} + +Glib::RefPtr Pixmap::create_from_data(const Glib::RefPtr& drawable, + const char* data, int width, int height, int depth, + const Color& fg, const Color& bg) +{ + GdkPixmap *const pixmap = gdk_pixmap_create_from_data( + const_cast(Glib::unwrap(drawable)), + const_cast(data), width, height, depth, + const_cast(fg.gobj()), + const_cast(bg.gobj())); + + return Glib::wrap((GdkPixmapObject*) pixmap); +} + + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& drawable, + const Color& transparent_color, + const std::string& filename) +{ + GdkPixmap *const pixmap = gdk_pixmap_create_from_xpm( + const_cast(Glib::unwrap(drawable)), 0, + const_cast(transparent_color.gobj()), + const_cast(filename.c_str())); + + return Glib::wrap((GdkPixmapObject*) pixmap); +} + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& drawable, + Glib::RefPtr& mask, + const Color& transparent_color, + const std::string& filename) +{ + GdkBitmap* bitmap = 0; + + GdkPixmap *const pixmap = gdk_pixmap_create_from_xpm( + const_cast(Glib::unwrap(drawable)), &bitmap, + const_cast(transparent_color.gobj()), + const_cast(filename.c_str())); + + mask = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) bitmap)); + return Glib::wrap((GdkPixmapObject*) pixmap); +} + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& drawable, + const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const Color& transparent_color, + const std::string& filename) +{ + GdkBitmap* bitmap = 0; + + GdkPixmap *const pixmap = gdk_pixmap_colormap_create_from_xpm( + const_cast(Glib::unwrap(drawable)), + Glib::unwrap(colormap), &bitmap, + const_cast(transparent_color.gobj()), + const_cast(filename.c_str())); + + mask = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) bitmap)); + return Glib::wrap((GdkPixmapObject*) pixmap); +} + + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& drawable, + Glib::RefPtr& mask, + const Color& transparent_color, + const char* const* data) +{ + GdkBitmap* bitmap = 0; + + GdkPixmap *const pixmap = gdk_pixmap_create_from_xpm_d( + const_cast(Glib::unwrap(drawable)), + &bitmap, + const_cast(transparent_color.gobj()), + const_cast(data)); + + mask = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) bitmap)); + return Glib::wrap((GdkPixmapObject*) pixmap); +} + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& drawable, + const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const Color& transparent_color, + const char* const* data) +{ + GdkBitmap* bitmap = 0; + + GdkPixmap *const pixmap = gdk_pixmap_colormap_create_from_xpm_d( + const_cast(Glib::unwrap(drawable)), + Glib::unwrap(colormap), &bitmap, + const_cast(transparent_color.gobj()), + const_cast(data)); + + mask = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) bitmap)); + return Glib::wrap((GdkPixmapObject*) pixmap); +} + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const Color& transparent_color, + const char* const* data) +{ + GdkBitmap* bitmap = 0; + + GdkPixmap *const pixmap = gdk_pixmap_colormap_create_from_xpm_d( + 0, // drawable + Glib::unwrap(colormap), &bitmap, + const_cast(transparent_color.gobj()), + const_cast(data)); + + mask = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) bitmap)); + return Glib::wrap((GdkPixmapObject*) pixmap); +} + +Glib::RefPtr Pixmap::create_from_xpm(const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const char* const* data) +{ + GdkBitmap* bitmap = 0; + + GdkPixmap *const pixmap = gdk_pixmap_colormap_create_from_xpm_d( + 0, // drawable + Glib::unwrap(colormap), &bitmap, + 0, // transparent_color + const_cast(data)); + + mask = Glib::RefPtr::cast_dynamic(Glib::wrap((GdkPixmapObject*) bitmap)); + return Glib::wrap((GdkPixmapObject*) pixmap); +} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/pixmap.hg b/libs/gtkmm2/gdk/src/pixmap.hg new file mode 100644 index 0000000000..2d5d3033b0 --- /dev/null +++ b/libs/gtkmm2/gdk/src/pixmap.hg @@ -0,0 +1,120 @@ +/* $Id: pixmap.hg,v 1.5 2004/03/10 01:17:36 murrayc Exp $ */ + +/* Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(gdkmm/private/drawable_p.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { +//Custom stuct prototypes, because they aren't what the code-generator expects: +typedef struct _GdkDrawable GdkPixmap; +typedef struct _GdkPixmapClass GdkPixmapClass; +} // extern "C" +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gdk +{ + +class Window; + +/** Pixmaps are offscreen drawables. They can be drawn upon with the standard drawing primitives, then copied to another + * drawable (such as a Gdk::Window) with Gdk::Drawable::draw_drawable(). The depth of a pixmap is the number of bits per + * pixels. + * Bitmaps are simply pixmaps with a depth of 1. (That is, they are monochrome bitmaps - each pixel can be either on or off). + */ +class Pixmap : public Gdk::Drawable +{ + // GdkPixmap is a typedef to GdkDrawable, but it's actually a GdkPixmapObject. + _CLASS_GOBJECT(Pixmap,GdkPixmap,GDK_PIXMAP,Gdk::Drawable,GdkDrawable,GdkPixmapObject) + _CUSTOM_WRAP_NEW // see wrap_new() implementation in pixmap.ccg + _STRUCT_NOT_HIDDEN + +protected: + _CTOR_DEFAULT() + + Pixmap(const Glib::RefPtr& drawable, int width, int height, int depth = -1); + + /// Initialize a Pixmap from data. + Pixmap(const Glib::RefPtr& drawable, + const char* data, int width, int height, int depth, + const Color& fg, const Color& bg); + + Pixmap(const Glib::RefPtr& display, NativeWindow anid); + +public: + + _WRAP_CREATE(const Glib::RefPtr& drawable, int width, int height, int depth = -1) + _WRAP_CREATE(const Glib::RefPtr& drawable, const char* data, int width, int height, int depth, const Color& fg, const Color& bg) + + _WRAP_CREATE(const Glib::RefPtr& display, NativeWindow anid) + _IGNORE(gdk_pixmap_foreign_new_for_display) + + static Glib::RefPtr create_from_data(const Glib::RefPtr& drawable, + const char* data, int width, int height, int depth, + const Color& fg, const Color& bg); + + /// Create a Pixmap from a xpm file. + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& drawable, + const Color& transparent_color, + const std::string& filename); + + // Create a Pixmap from a xpm file. + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& drawable, + Glib::RefPtr& mask, + const Color& transparent_color, + const std::string& filename); + + /// Create a Pixmap from a xpm file with colormap. + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& drawable, + const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const Color& transparent_color, + const std::string& filename); + + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& drawable, + Glib::RefPtr& mask, + const Color& transparent_color, + const char* const* data); + + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& drawable, + const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const Color& transparent_color, + const char* const* data); + + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const Color& transparent_color, + const char* const* data); + + static Glib::RefPtr create_from_xpm(const Glib::RefPtr& colormap, + Glib::RefPtr& mask, + const char* const* data); + + +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/rectangle.ccg b/libs/gtkmm2/gdk/src/rectangle.ccg new file mode 100644 index 0000000000..ec00dc38bf --- /dev/null +++ b/libs/gtkmm2/gdk/src/rectangle.ccg @@ -0,0 +1,65 @@ +// -*- c++ -*- +/* $Id: rectangle.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +namespace Gdk +{ + +Rectangle::Rectangle(int x, int y, int width, int height) +{ + gobject_.x = x; + gobject_.y = y; + gobject_.width = width; + gobject_.height = height; +} + +// gdk_rectangle_union() and gdk_rectangle_intersect() work fine even if +// the destination points to one of the input rectangles. The join() and +// intersect() implementations rely on this ability. + +Rectangle& Rectangle::join(const Rectangle& src2) +{ + gdk_rectangle_union( + &gobject_, const_cast(&src2.gobject_), &gobject_); + return *this; +} + +Rectangle& Rectangle::intersect(const Rectangle& src2) +{ + gdk_rectangle_intersect( + &gobject_, const_cast(&src2.gobject_), &gobject_); + return *this; +} + +Rectangle& Rectangle::intersect(const Rectangle& src2, bool& rectangles_intersect) +{ + rectangles_intersect = gdk_rectangle_intersect( + &gobject_, const_cast(&src2.gobject_), &gobject_); + return *this; +} + +bool Rectangle::has_zero_area() const +{ + return (gobject_.width == 0 || gobject_.height == 0); +} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/rectangle.hg b/libs/gtkmm2/gdk/src/rectangle.hg new file mode 100644 index 0000000000..543e99cbbb --- /dev/null +++ b/libs/gtkmm2/gdk/src/rectangle.hg @@ -0,0 +1,57 @@ +/* $Id: rectangle.hg,v 1.2 2004/01/05 17:32:12 murrayc Exp $ */ + +/* rectangle.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +_DEFS(gdkmm,gdk) + +namespace Gdk +{ + +/** Gdk::Rectangle is a structure holding the position and size of a rectangle. + * The intersection of two rectangles can be computed with intersect(). To find the union of two rectangles use union(). + */ +class Rectangle +{ + _CLASS_BOXEDTYPE_STATIC(Rectangle, GdkRectangle) +public: +//_CUSTOM_DEFAULT_CTOR +//Rectangle(); + Rectangle(int x, int y, int width, int height); + + Rectangle& join(const Rectangle& src2); + Rectangle& intersect(const Rectangle& src2); + Rectangle& intersect(const Rectangle& src2, bool& rectangles_intersect); + + bool has_zero_area() const; + + _MEMBER_GET(x, x, int, int) + _MEMBER_SET(x, x, int, int) + _MEMBER_GET(y, y, int, int) + _MEMBER_SET(y, y, int, int) + _MEMBER_GET(width, width, int, int) + _MEMBER_SET(width, width, int, int) + _MEMBER_GET(height, height, int, int) + _MEMBER_SET(height, height, int, int) +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/region.ccg b/libs/gtkmm2/gdk/src/region.ccg new file mode 100644 index 0000000000..3be7cc52d8 --- /dev/null +++ b/libs/gtkmm2/gdk/src/region.ccg @@ -0,0 +1,60 @@ +// -*- c++ -*- +/* $Id: region.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */ + +/* + * + * Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gdk +{ + +Region::Region(const Glib::ArrayHandle& points, FillRule fill_rule) +: + // The dangerous-looking cast to GdkPoint* works, because Gdk::Point + // has only one member variable of type GdkPoint, and no vtable. Please + // don't copy this code, casts like that won't work with most other types. + + gobject_ (gdk_region_polygon( + reinterpret_cast(const_cast(points.data())), + points.size(), (GdkFillRule)(fill_rule))) +{} + +Region::Region(const Rectangle& rectangle) +: + gobject_ (gdk_region_rectangle(const_cast(rectangle.gobj()))) +{} + +Glib::ArrayHandle Region::get_rectangles() const +{ + GdkRectangle* rectangles = 0; + int n_rectangles = 0; + + gdk_region_get_rectangles(gobject_, &rectangles, &n_rectangles); + + // The dangerous-looking cast to Rectangle* works, because Gdk::Rectangle + // has only one member variable of type GdkRectangle, and no vtable. Please + // don't copy this code, casts like that won't work with most other types. + + return Glib::ArrayHandle( + reinterpret_cast(rectangles), n_rectangles, Glib::OWNERSHIP_SHALLOW); +} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/region.hg b/libs/gtkmm2/gdk/src/region.hg new file mode 100644 index 0000000000..8d02365df8 --- /dev/null +++ b/libs/gtkmm2/gdk/src/region.hg @@ -0,0 +1,73 @@ +/* $Id: region.hg,v 1.3 2004/02/03 11:06:48 murrayc Exp $ */ + +/* region.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +extern "C" { typedef struct _GdkRegion GdkRegion; } + +#include +#include +#include + +_DEFS(gdkmm,gdk) + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(FillRule, GdkFillRule) +_WRAP_ENUM(OverlapType, GdkOverlapType) + + +/** This is an opaque data type holding a set of arbitrary pixels, and is usually used for clipping graphical operations + * (see Gdk::GC::set_clip_region()). + */ +class Region +{ + _CLASS_OPAQUE_COPYABLE(Region, GdkRegion, gdk_region_new, gdk_region_copy, gdk_region_destroy) + _IGNORE(gdk_region_copy, gdk_region_destroy, gdk_region_get_rectangles, gdk_region_equal) + +public: + + Region(const Glib::ArrayHandle& points, FillRule fill_rule); + explicit Region(const Rectangle& rectangle); + + _WRAP_METHOD(void get_clipbox(const Rectangle& rectangle), gdk_region_get_clipbox) + Glib::ArrayHandle get_rectangles() const; + + _WRAP_METHOD(bool empty(), gdk_region_empty) + _WRAP_METHOD(bool point_in(int x, int y), gdk_region_point_in) + _WRAP_METHOD(OverlapType rect_in(const Rectangle& rect), gdk_region_rect_in) + + _WRAP_METHOD(void offset(int dx, int dy), gdk_region_offset) + _WRAP_METHOD(void shrink(int dx, int dy), gdk_region_shrink) + _WRAP_METHOD(void union_with_rect(const Rectangle& rect), gdk_region_union_with_rect) + _WRAP_METHOD(void intersect(const Region& source2), gdk_region_intersect) + _WRAP_METHOD(void union_(const Region& source2), gdk_region_union) //union is a keyword. + _WRAP_METHOD(void subtract(const Region& source2), gdk_region_subtract) + _WRAP_METHOD(void xor_(const Region& source2), gdk_region_xor) //xor is a keyword + _WRAP_METHOD(void spans_intersect_foreach(GdkSpan* spans, int n_spans, bool sorted, GdkSpanFunc function, gpointer data), gdk_region_spans_intersect_foreach) + +#m4begin + _WRAP_EQUAL(gdk_region_equal, unconst) +#m4end +}; + +} //namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/rgbcmap.ccg b/libs/gtkmm2/gdk/src/rgbcmap.ccg new file mode 100644 index 0000000000..3381910bda --- /dev/null +++ b/libs/gtkmm2/gdk/src/rgbcmap.ccg @@ -0,0 +1,54 @@ +// -*- c++ -*- +/* $Id: rgbcmap.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include + +namespace Gdk +{ + +RgbCmap::RgbCmap(const Glib::ArrayHandle& colors) +: gobject_ (gdk_rgb_cmap_new(const_cast(colors.data()), colors.size())) +{} + +RgbCmap::~RgbCmap() +{ + if(gobject_) + gdk_rgb_cmap_free(gobject_); +} + +guint32& RgbCmap::operator[](unsigned long index) +{ + return gobject_->colors[index]; +} + +const guint32& RgbCmap::operator[](unsigned long index) const +{ + return gobject_->colors[index]; +} + + +unsigned long RgbCmap::size() const +{ + return gobject_->n_colors; +} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/rgbcmap.hg b/libs/gtkmm2/gdk/src/rgbcmap.hg new file mode 100644 index 0000000000..ee4c8c2f8c --- /dev/null +++ b/libs/gtkmm2/gdk/src/rgbcmap.hg @@ -0,0 +1,65 @@ +/* $Id: rgbcmap.hg,v 1.2 2003/12/14 11:54:01 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(gdkmm,gdk) + +#include + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { typedef struct _GdkRgbCmap GdkRgbCmap; } +#endif + +namespace Gdk +{ + +class RgbCmap +{ + _CLASS_GENERIC(RgbCmap, GdkRgbCmap) + _IGNORE(gdk_rgb_cmap_new, gdk_rgb_cmap_free) + +public: + explicit RgbCmap(const Glib::ArrayHandle& colors); + virtual ~RgbCmap(); + + ///Number of colors. + unsigned long size() const; + + ///Access the colors. + guint32& operator[](unsigned long index); + + ///Access the colors. + const guint32& operator[](unsigned long index) const; + + /// Provides access to the underlying C GObject. + GdkRgbCmap* gobj() { return gobject_; } + /// Provides access to the underlying C GObject. + const GdkRgbCmap* gobj() const { return gobject_; } + +protected: + GdkRgbCmap* gobject_; + +private: + // noncopyable + RgbCmap(const RgbCmap&); + RgbCmap& operator=(const RgbCmap&); +}; + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/screen.ccg b/libs/gtkmm2/gdk/src/screen.ccg new file mode 100644 index 0000000000..2e2b06e976 --- /dev/null +++ b/libs/gtkmm2/gdk/src/screen.ccg @@ -0,0 +1,34 @@ +// -*- c++ -*- +/* $Id: screen.ccg,v 1.1 2003/01/21 13:38:38 murrayc Exp $ */ + +/* + * + * Copyright 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include + +namespace Gdk +{ + +} //Gdk + + diff --git a/libs/gtkmm2/gdk/src/screen.hg b/libs/gtkmm2/gdk/src/screen.hg new file mode 100644 index 0000000000..69d6f02fe3 --- /dev/null +++ b/libs/gtkmm2/gdk/src/screen.hg @@ -0,0 +1,142 @@ +/* $Id: screen.hg,v 1.8 2006/06/10 15:26:24 murrayc Exp $ */ + +/* screen.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +//#include +//#include +#include +#include +#include +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +class Display; +class Colormap; +class Visual; +class Window; + +/** Object representing a physical screen + * Gdk::Screen objects are the GDK representation of a physical screen. It is used throughout GDK and GTK+ to specify + * which screen the top level windows are to be displayed on. It is also used to query the screen specification and + * default settings such as the default colormap (get_default_colormap()), the screen width (get_width()), etc. + * Note that a screen may consist of multiple monitors which are merged to form a large screen area. + */ +class Screen : public Glib::Object +{ + _CLASS_GOBJECT(Screen,GdkScreen,GDK_SCREEN,Glib::Object,GObject) +protected: + +public: + _WRAP_METHOD(Glib::RefPtr get_default_colormap(), gdk_screen_get_default_colormap, refreturn) + _WRAP_METHOD(Glib::RefPtr get_default_colormap() const, gdk_screen_get_default_colormap, refreturn, constversion) + + _WRAP_METHOD(void set_default_colormap(const Glib::RefPtr& colormap), gdk_screen_set_default_colormap) + _WRAP_METHOD(Glib::RefPtr get_system_colormap(), gdk_screen_get_system_colormap, refreturn) + _WRAP_METHOD(Glib::RefPtr get_system_colormap() const, gdk_screen_get_system_colormap, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_system_visual(), gdk_screen_get_system_visual, refreturn) + _WRAP_METHOD(Glib::RefPtr get_system_visual() const, gdk_screen_get_system_visual, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_rgb_colormap(), gdk_screen_get_rgb_colormap, refreturn) + _WRAP_METHOD(Glib::RefPtr get_rgb_colormap() const, gdk_screen_get_rgb_colormap, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_rgb_visual(), gdk_screen_get_rgb_visual, refreturn) + _WRAP_METHOD(Glib::RefPtr get_rgb_visual() const, gdk_screen_get_rgb_visual, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_rgba_colormap(), gdk_screen_get_rgba_colormap, refreturn) + _WRAP_METHOD(Glib::RefPtr get_rgba_colormap() const, gdk_screen_get_rgba_colormap, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_rgba_visual(), gdk_screen_get_rgba_visual, refreturn) + _WRAP_METHOD(Glib::RefPtr get_rgba_visual() const, gdk_screen_get_rgba_visual, refreturn, constversion) + + _WRAP_METHOD(bool is_composited() const, gdk_screen_is_composited) + + _WRAP_METHOD(Glib::RefPtr get_root_window(), gdk_screen_get_root_window, refreturn) + _WRAP_METHOD(Glib::RefPtr get_root_window() const, gdk_screen_get_root_window, refreturn, constversion) + + _WRAP_METHOD(Glib::RefPtr get_display(), gdk_screen_get_display, refreturn) + _WRAP_METHOD(Glib::RefPtr get_display() const, gdk_screen_get_display, refreturn, constversion) + + _WRAP_METHOD(int get_number() const, gdk_screen_get_number) + _WRAP_METHOD(int get_width() const, gdk_screen_get_width) + _WRAP_METHOD(int get_height() const, gdk_screen_get_height) + _WRAP_METHOD(int get_width_mm() const, gdk_screen_get_width_mm) + _WRAP_METHOD(int get_height_mm() const, gdk_screen_get_height_mm) + +#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr >',`$2($3, Glib::OWNERSHIP_SHALLOW)') + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > list_visuals(), gdk_screen_list_visuals) + +#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr >',`$2($3, Glib::OWNERSHIP_SHALLOW)') + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > get_toplevel_windows(), gdk_screen_get_toplevel_windows) + + _WRAP_METHOD(Glib::ustring make_display_name(), gdk_screen_make_display_name) + + _WRAP_METHOD(int get_n_monitors() const, gdk_screen_get_n_monitors) + _WRAP_METHOD(void get_monitor_geometry(int monitor_num, Rectangle& dest) const, gdk_screen_get_monitor_geometry) + _WRAP_METHOD(int get_monitor_at_point(int x, int y) const, gdk_screen_get_monitor_at_point) + _WRAP_METHOD(int get_monitor_at_window(const Glib::RefPtr& window) const, gdk_screen_get_monitor_at_window) + + _WRAP_METHOD(void broadcast_client_message(GdkEvent* event), gdk_screen_broadcast_client_message) + + _WRAP_METHOD(static Glib::RefPtr get_default(), gdk_screen_get_default, refreturn) + + template + bool get_setting(const Glib::ustring& name, ValueType& value) const; + _IGNORE(gdk_screen_get_setting) + + _WRAP_METHOD(void set_font_options(const Cairo::FontOptions& options), gdk_screen_set_font_options) + + // Note: This returns a const, so we assume that we must copy it: + #m4 _CONVERSION(`const cairo_font_options_t*', `Cairo::FontOptions', `Cairo::FontOptions(const_cast($3), true /* take_reference */)') + _WRAP_METHOD(Cairo::FontOptions get_font_options() const, gdk_screen_get_font_options) + + _WRAP_METHOD(void set_resolution(double dpi), gdk_screen_set_resolution) + _WRAP_METHOD(double get_resolution() const, gdk_screen_get_resolution) + + _WRAP_METHOD(Glib::RefPtr get_active_window(), gdk_screen_get_active_window, refreturn) + _WRAP_METHOD(Glib::RefPtr get_active_window() const, gdk_screen_get_active_window, refreturn, constversion) + +#m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr >',`$2($3, Glib::OWNERSHIP_DEEP)') + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > get_window_stack(), gdk_screen_get_window_stack) + + /** The size_changed signal is emitted when the pixel width or + * height of a screen changes. + */ + _WRAP_SIGNAL(void size_changed(), size-changed) +}; + +template +bool Screen::get_setting(const Glib::ustring& name, ValueType& value) const +{ + Glib::Value glibmmvalue; + glibmmvalue.init(Glib::Value::value_type()); + + gboolean result = gdk_screen_get_setting(const_cast(gobj()), name.c_str(), glibmmvalue.gobj()); + + value = glibmmvalue.get(); + return result; +} + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gdk/src/types.ccg b/libs/gtkmm2/gdk/src/types.ccg new file mode 100644 index 0000000000..012dc87919 --- /dev/null +++ b/libs/gtkmm2/gdk/src/types.ccg @@ -0,0 +1,73 @@ +// -*- c++ -*- +/* $Id: types.ccg,v 1.3 2004/02/10 17:29:54 mxpxpod Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +namespace Gdk +{ + +Point::Point() +{ + gobject_.x = 0; + gobject_.y = 0; +} + +Point::Point(int x, int y) +{ + gobject_.x = x; + gobject_.y = y; +} + +bool Point::equal(const Gdk::Point& rhs) const +{ + return (gobject_.x == rhs.gobject_.x) && (gobject_.y == rhs.gobject_.y); +} + +// static +GdkAtom AtomStringTraits::to_c_type(const std::string& atom_name) +{ + return gdk_atom_intern(atom_name.c_str(), 0); +} + +// static +std::string AtomStringTraits::to_cpp_type(GdkAtom atom) +{ + if(char *const atom_name = gdk_atom_name(atom)) + return std::string(Glib::ScopedPtr(atom_name).get()); + else + return std::string(); +} + +} // namespace Gdk + + +namespace Glib +{ + +Gdk::Point& wrap(GdkPoint* object) +{ + return *reinterpret_cast(object); +} + +const Gdk::Point& wrap(const GdkPoint* object) +{ + return *reinterpret_cast(object); +} + +} // namespace Glib + diff --git a/libs/gtkmm2/gdk/src/types.hg b/libs/gtkmm2/gdk/src/types.hg new file mode 100644 index 0000000000..b0f688fb94 --- /dev/null +++ b/libs/gtkmm2/gdk/src/types.hg @@ -0,0 +1,147 @@ +/* $Id: types.hg,v 1.6 2005/12/14 15:36:23 murrayc Exp $ */ + +/* Copyright (C) 2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +_DEFS(gdkmm,gdk) + +#include +#include + +/* Shadow ERROR macro (from wingdi.h). + */ +#if defined(ERROR) && !defined(GTKMM_MACRO_SHADOW_ERROR) +enum { GTKMM_MACRO_DEFINITION_ERROR = ERROR }; +#undef ERROR +enum { ERROR = GTKMM_MACRO_DEFINITION_ERROR }; +#define ERROR ERROR +#define GTKMM_MACRO_SHADOW_ERROR 1 +#endif + +/********************************************************************* +***** Version macros +*********************************************************************/ + +/* macro for controlling version numbers */ +#ifndef _GDK_VERSION + +#define GDK_VERSION_GT(major,minor) ((GTK_MAJOR_VERSION>major)||(GTK_MAJOR_VERSION==major)&&(GTK_MINOR_VERSION>minor)) +#define GDK_VERSION_GE(major,minor) ((GTK_MAJOR_VERSION>major)||(GTK_MAJOR_VERSION==major)&&(GTK_MINOR_VERSION>=minor)) +#define GDK_VERSION_EQ(major,minor) ((GTK_MAJOR_VERSION==major)&&(GTK_MINOR_VERSION==minor)) +#define GDK_VERSION_NE(major,minor) ((GTK_MAJOR_VERSION!=major)||(GTK_MINOR_VERSION!=minor)) +#define GDK_VERSION_LE(major,minor) ((GTK_MAJOR_VERSION ArrayHandle_AtomString; +typedef Glib::ListHandle ListHandle_AtomString; + +} // namespace Gdk + + +namespace Glib +{ + +/** @relates Gdk::Point */ +Gdk::Point& wrap(GdkPoint* object); + +/** @relates Gdk::Point */ +const Gdk::Point& wrap(const GdkPoint* object); + +} // namespace Glib + diff --git a/libs/libglademm/libglademm/init.h b/libs/gtkmm2/gdk/src/visual.ccg similarity index 76% rename from libs/libglademm/libglademm/init.h rename to libs/gtkmm2/gdk/src/visual.ccg index 8924769150..0d783ef5c1 100644 --- a/libs/libglademm/libglademm/init.h +++ b/libs/gtkmm2/gdk/src/visual.ccg @@ -1,11 +1,9 @@ // -*- c++ -*- -#ifndef _LIBGLADEMM_INIT_H -#define _LIBGLADEMM_INIT_H -/* $Id$ */ +/* $Id: visual.ccg,v 1.1 2003/01/21 13:38:39 murrayc Exp $ */ -/* init.h +/* * - * Copyright 2001 Free Software Foundation + * Copyright 1998-2002 The gtkmm Development Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -22,17 +20,12 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include -namespace Gnome -{ - -namespace Glade +namespace Gdk { -} /* namespace Glade */ -} //namespace Gnome - -#endif //_LIBGLADEMM_INIT_H +} //namespace diff --git a/libs/gtkmm2/gdk/src/visual.hg b/libs/gtkmm2/gdk/src/visual.hg new file mode 100644 index 0000000000..e4d8b07ac8 --- /dev/null +++ b/libs/gtkmm2/gdk/src/visual.hg @@ -0,0 +1,82 @@ +/* $Id: visual.hg,v 1.4 2006/04/12 11:11:24 murrayc Exp $ */ + +/* bitmap.h + * + * Copyright (C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(glibmm/private/object_p.h) + + +namespace Gdk +{ + +class Screen; + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(VisualType, GdkVisualType) + +/** A Gdk::Visual describes a particular video hardware display format. + * It includes information about the number of bits used for each color, the way the bits are translated into an RGB value + * for display, and the way the bits are stored in memory. For example, a piece of display hardware might support 24-bit + * color, 16-bit color, or 8-bit color; meaning 24/16/8-bit pixel sizes. For a given pixel size, pixels can be in different + * formats; for example the "red" element of an RGB pixel may be in the top 8 bits of the pixel, or may be in the lower 4 + * bits. + * + * Usually you can avoid thinking about visuals in GTK+. Visuals are useful to interpret the contents of a GdkImage, but + * you should avoid Gdk::Image precisely because its contents depend on the display hardware; use Gdk::Pixbuf instead, for + * all but the most low-level purposes. Also, anytime you provide a Gdk::Colormap, the visual is implied as part of the + * colormap (Gdk::Colormap::get_visual()), so you won't have to provide a visual in addition. + * + * There are several standard visuals. The visual returned by get_system() is the system's default visual. get_visual() + * returns the visual most suited to displaying full-color image data. If you use the calls in Gdk::RGB, you should create + * your windows using this visual (and the colormap returned by Gdk::Rgb::get_colormap()). + * + * A number of methods are provided for determining the "best" available visual. For the purposes of making this + * determination, higher bit depths are considered better, and for visuals of the same bit depth, GDK_VISUAL_PSEUDO_COLOR + * is preferred at 8bpp, otherwise, the visual types are ranked in the order of (highest to lowest) GDK_VISUAL_DIRECT_COLOR, + * GDK_VISUAL_TRUE_COLOR, GDK_VISUAL_PSEUDO_COLOR, GDK_VISUAL_STATIC_COLOR, GDK_VISUAL_GRAYSCALE, then + * GDK_VISUAL_STATIC_GRAY. + */ +class Visual : public Glib::Object +{ + _CLASS_GOBJECT(Visual,GdkVisual,GDK_VISUAL,Glib::Object,GObject) +protected: + + _CTOR_DEFAULT + +public: + _WRAP_METHOD(static Glib::RefPtr get_system(), gdk_visual_get_system, refreturn) + _WRAP_METHOD(static Glib::RefPtr get_best(), gdk_visual_get_best, refreturn) + _WRAP_METHOD(static Glib::RefPtr get_best(int depth), gdk_visual_get_best_with_depth, refreturn) + _WRAP_METHOD(static Glib::RefPtr get_best(VisualType visual_type), gdk_visual_get_best_with_type, refreturn) + _WRAP_METHOD(static Glib::RefPtr get_best(int depth, VisualType visual_type), gdk_visual_get_best_with_both, refreturn) + + _WRAP_METHOD(static int get_best_depth(), gdk_visual_get_best_depth) + _WRAP_METHOD(static VisualType get_best_type(), gdk_visual_get_best_type) + + _WRAP_METHOD(Glib::RefPtr get_screen(), gdk_visual_get_screen, refreturn) + _WRAP_METHOD(Glib::RefPtr get_screen() const, gdk_visual_get_screen, refreturn, constversion) +}; + +} //namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/window.ccg b/libs/gtkmm2/gdk/src/window.ccg new file mode 100644 index 0000000000..20bb2df623 --- /dev/null +++ b/libs/gtkmm2/gdk/src/window.ccg @@ -0,0 +1,81 @@ +// -*- c++ -*- +/* $Id: window.ccg,v 1.7 2004/03/09 17:36:25 murrayc Exp $ */ + +/* Copyright 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include + + +namespace Gdk +{ + +Window::Window(const Glib::RefPtr& parent, GdkWindowAttr* attributes, int attributes_mask) +: + Drawable((GdkDrawable*) gdk_window_new(parent->gobj(), attributes, attributes_mask)) +{ + //GdkWindow is X11/win32-specific, so we probably can't derived our own GType. +} + +void Window::set_cursor() +{ + gdk_window_set_cursor(gobj(), 0); +} + +GrabStatus Window::pointer_grab(bool owner_events, EventMask event_mask, const Cursor& cursor, guint32 timestamp) +{ + return ((GrabStatus)(gdk_pointer_grab(gobj(), static_cast(owner_events), ((GdkEventMask)(event_mask)), 0, (cursor).gobj_copy(), timestamp))); +} + +GrabStatus Window::pointer_grab(bool owner_events, EventMask event_mask, guint32 timestamp) +{ + return ((GrabStatus)(gdk_pointer_grab(gobj(), static_cast(owner_events), ((GdkEventMask)(event_mask)), 0, 0, timestamp))); +} + +//static +void Window::unset_sm_client_id() +{ + gdk_set_sm_client_id(0 /* see GDK docs */); +} + +void Window::set_icon(const Glib::RefPtr& icon_window, const Glib::RefPtr& pixmap) +{ + gdk_window_set_icon(gobj(), icon_window->gobj(), pixmap->gobj(), 0); /* See GDK docs */ +} + +void Window::unset_icon() +{ + gdk_window_set_icon(gobj(), 0, 0, 0); /* See GDK docs */ +} + +void Window::unset_shape_combine_mask() +{ + gdk_window_shape_combine_mask(gobj(), 0, 0, 0); //See GDK docs. +} + +void Window::get_internal_paint_info(Glib::RefPtr& real_drawable, int& x_offset, int& y_offset) const +{ + GdkDrawable* temp_drawable = 0; + gdk_window_get_internal_paint_info(const_cast(gobj()), &temp_drawable, &x_offset, &y_offset); + real_drawable = Glib::wrap(temp_drawable); +} + +} // namespace Gdk + diff --git a/libs/gtkmm2/gdk/src/window.hg b/libs/gtkmm2/gdk/src/window.hg new file mode 100644 index 0000000000..5a01169a6f --- /dev/null +++ b/libs/gtkmm2/gdk/src/window.hg @@ -0,0 +1,256 @@ +/* $Id: window.hg,v 1.23 2006/04/12 11:11:24 murrayc Exp $ */ + +/* Copyright(C) 1998-2002 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License or(at your option) any later version. + * + * This library is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not write to the Free + * Software Foundation Inc. 675 Mass Ave Cambridge MA 02139 USA. + */ + +#include +#include +//#include +#include +#include +#include + +_DEFS(gdkmm,gdk) +_PINCLUDE(gdkmm/private/drawable_p.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +extern "C" { +// Custom struct prototype, because this isn't what the code-generator expects: +typedef struct _GdkDrawable GdkWindow; +} // extern "C" +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gdk +{ + +_CC_INCLUDE(gdk/gdkenumtypes.h) +_WRAP_ENUM(EventMask, GdkEventMask) +_WRAP_ENUM(WindowState, GdkWindowState) +_WRAP_ENUM(WindowType, GdkWindowType) +_WRAP_ENUM(WindowAttributesType, GdkWindowAttributesType) +_WRAP_ENUM(WindowHints, GdkWindowHints) +_WRAP_ENUM(WindowTypeHint, GdkWindowTypeHint) +_WRAP_ENUM(WMDecoration, GdkWMDecoration) +_WRAP_ENUM(WMFunction, GdkWMFunction) +_WRAP_ENUM(WindowEdge, GdkWindowEdge) +_WRAP_ENUM(Gravity, GdkGravity) +_WRAP_ENUM(GrabStatus, GdkGrabStatus) + + +class Cursor; + +/** A Gdk::Window is a rectangular region on the screen. It's a low-level object, used to implement high-level objects such + * as Gtk::Widget and Gtk::Window on the GTK+ level. A Gtk::Window is a toplevel window, the thing a user might think of as + * a "window" with a titlebar and so on; a Gtk::Window may contain many Gdk::Windows. For example, each Gtk::Button has a + * Gdk::Window associated with it. + */ +class Window : public Gdk::Drawable +{ + // GdkWindow is a typedef to GdkDrawable, but it's actually a GdkWindowObject. + _CLASS_GOBJECT(Window, GdkWindow, GDK_WINDOW_OBJECT, Gdk::Drawable, GdkDrawable, GdkWindowObject) + _STRUCT_NOT_HIDDEN + _IGNORE(gdk_window_set_hints, gdk_window_destroy, gdk_window_new, gdk_window_get_deskrelative_origin, gdk_window_get_internal_paint_info) + _IGNORE(gdk_window_destroy_notify) + + +protected: + Window(const Glib::RefPtr& parent, GdkWindowAttr* attributes, int attributes_mask); + +public: + _WRAP_CREATE(const Glib::RefPtr& parent, GdkWindowAttr* attributes, int attributes_mask) + + _WRAP_METHOD(WindowType get_window_type() const, gdk_window_get_window_type) + _WRAP_METHOD(void show(), gdk_window_show) + _WRAP_METHOD(void hide(), gdk_window_hide) + _WRAP_METHOD(void withdraw(), gdk_window_withdraw) + _WRAP_METHOD(void show_unraised(), gdk_window_show_unraised) + _WRAP_METHOD(void move(int x, int y), gdk_window_move) + _WRAP_METHOD(void resize(int width, int height), gdk_window_resize) + _WRAP_METHOD(void move_resize(int x, int y, int width, int height), gdk_window_move_resize) + _WRAP_METHOD(void reparent(const Glib::RefPtr& new_parent, int x, int y), gdk_window_reparent) + _WRAP_METHOD(void clear(), gdk_window_clear) + _WRAP_METHOD(void clear_area(int x, int y, int width, int height), gdk_window_clear_area) + _WRAP_METHOD(void clear_area_e(int x, int y, int width, int height), gdk_window_clear_area_e) + _WRAP_METHOD(void raise(), gdk_window_raise) + _WRAP_METHOD(void lower(), gdk_window_lower) + _WRAP_METHOD(void focus(guint32 timestamp), gdk_window_focus) + _WRAP_METHOD(void set_user_data(gpointer user_data), gdk_window_set_user_data) + _WRAP_METHOD(void set_override_redirect(bool override_redirect = true), gdk_window_set_override_redirect) + + //We could wrap these with a Slot instead of a C callback, but these methods are very low-level anyway. + _WRAP_METHOD(void add_filter(GdkFilterFunc function, gpointer data), gdk_window_add_filter) + _WRAP_METHOD(void remove_filter(GdkFilterFunc function, gpointer data), gdk_window_remove_filter) + + _WRAP_METHOD(void scroll(int dx, int dy), gdk_window_scroll) + _WRAP_METHOD(void move_region(const Region& region, int dx, int dy), gdk_window_move_region) + + _WRAP_METHOD(void shape_combine_mask(const Glib::RefPtr& mask, int x, int y), gdk_window_shape_combine_mask) + void unset_shape_combine_mask(); + + _WRAP_METHOD(void shape_combine_region(const Region& shape_region, int offset_x, int offset_y), gdk_window_shape_combine_region) + _WRAP_METHOD(void set_child_shapes(), gdk_window_set_child_shapes) + _WRAP_METHOD(void set_composited(bool composited = TRUE), gdk_window_set_composited) + _WRAP_METHOD(void merge_child_shapes(), gdk_window_merge_child_shapes) + + _WRAP_METHOD(void input_shape_combine_mask(const Glib::RefPtr& mask, int x, int y), gdk_window_input_shape_combine_mask) + _WRAP_METHOD(void input_shape_combine_region (const Region& shape_region, int offset_x, int offset_y), gdk_window_input_shape_combine_region) + _WRAP_METHOD(void set_child_input_shapes(), gdk_window_set_child_input_shapes) + _WRAP_METHOD(void merge_child_input_shapes(), gdk_window_merge_child_input_shapes) + + + _WRAP_METHOD(bool is_visible() const, gdk_window_is_visible) + _WRAP_METHOD(bool is_viewable() const, gdk_window_is_viewable) + _WRAP_METHOD(WindowState get_state() const, gdk_window_get_state) + _WRAP_METHOD(bool set_static_gravities(bool use_static = true), gdk_window_set_static_gravities) + _WRAP_METHOD(void set_type_hint(WindowTypeHint hint), gdk_window_set_type_hint) + _WRAP_METHOD(WindowTypeHint get_type_hint(), gdk_window_get_type_hint) + _WRAP_METHOD(void set_modal_hint(bool modal = true), gdk_window_set_modal_hint) + _WRAP_METHOD(void set_geometry_hints(const Geometry& geometry, WindowHints geom_mask), gdk_window_set_geometry_hints) + _WRAP_METHOD(static void set_sm_client_id(const Glib::ustring& sm_client_id), gdk_set_sm_client_id) + static void unset_sm_client_id(); + + _WRAP_METHOD(void begin_paint_rect(Rectangle&rectangle), gdk_window_begin_paint_rect) + _WRAP_METHOD(void begin_paint_region(const Region& region), gdk_window_begin_paint_region) + _WRAP_METHOD(void end_paint(), gdk_window_end_paint) + _WRAP_METHOD(void set_title(const Glib::ustring& title), gdk_window_set_title) + _WRAP_METHOD(void set_role(const Glib::ustring& role), gdk_window_set_role) + _WRAP_METHOD(void set_startup_id(const Glib::ustring& startup_id), gdk_window_set_startup_id) + _WRAP_METHOD(void set_transient_for(const Glib::RefPtr& parent), gdk_window_set_transient_for) + _WRAP_METHOD(void set_background(const Color& color), gdk_window_set_background) + _WRAP_METHOD(void set_back_pixmap(const Glib::RefPtr&pixmap, bool parent_relative), gdk_window_set_back_pixmap) + +#m4 _CONVERSION(const Cursor&,GdkCursor*,const_cast(($3).gobj())) + _WRAP_METHOD(void set_cursor(const Cursor& cursor), gdk_window_set_cursor) + + /** Use the parent window's cursor. + * For top-level windows this means that it will use the default cursor for the ROOT window. + */ + void set_cursor(); + + _WRAP_METHOD(void get_user_data(gpointer* data), gdk_window_get_user_data) + _WRAP_METHOD(void get_geometry(int& x, int& y, int& width, int& height, int& depth) const, gdk_window_get_geometry) + _WRAP_METHOD(void get_position(int& x, int& y) const, gdk_window_get_position) + _WRAP_METHOD(int get_origin(int& x, int& y) const, gdk_window_get_origin) + _IGNORE(gdk_window_get_deskrelative_origin) + _WRAP_METHOD(void get_root_origin(int& x, int& y) const, gdk_window_get_root_origin) + _WRAP_METHOD(void get_frame_extents(Rectangle& rect), gdk_window_get_frame_extents) + _WRAP_METHOD(Glib::RefPtr get_pointer(int& x, int& y, ModifierType& mask), gdk_window_get_pointer, refreturn) + _WRAP_METHOD(Glib::RefPtr get_parent(), gdk_window_get_parent, refreturn) + _WRAP_METHOD(Glib::RefPtr get_parent() const, gdk_window_get_parent, refreturn, constversion) + _WRAP_METHOD(Glib::RefPtr get_toplevel(), gdk_window_get_toplevel, refreturn) + _WRAP_METHOD(Glib::RefPtr get_toplevel() const, gdk_window_get_toplevel, refreturn, constversion) + + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > get_children(), gdk_window_get_children) + _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr > get_children() const, gdk_window_get_children) + _IGNORE(gdk_window_peek_children) //gdk_window_peek_children() is the same as gdk_window_get_children() with different memory mangement of the list. + + _WRAP_METHOD(EventMask get_events() const, gdk_window_get_events) + _WRAP_METHOD(void set_events(EventMask event_mask), gdk_window_set_events) + + _WRAP_METHOD(void set_icon_list(const Glib::ListHandle< Glib::RefPtr >& pixbufs), gdk_window_set_icon_list) + _WRAP_METHOD(void set_icon(const Glib::RefPtr& icon_window, const Glib::RefPtr& pixmap, const Glib::RefPtr& mask), gdk_window_set_icon) + void set_icon(const Glib::RefPtr& icon_window, const Glib::RefPtr& pixmap); + void unset_icon(); + _WRAP_METHOD(void set_icon_name(const Glib::ustring& name), gdk_window_set_icon_name) + + _WRAP_METHOD(void set_group(const Glib::RefPtr& leader), gdk_window_set_group) + _WRAP_METHOD(Glib::RefPtr get_group(), gdk_window_get_group) + _WRAP_METHOD(Glib::RefPtr get_group() const, gdk_window_get_group, constversion) + + _WRAP_METHOD(void set_decorations(WMDecoration decorations), gdk_window_set_decorations) + _WRAP_METHOD(bool get_decorations(WMDecoration& decorations) const, gdk_window_get_decorations) + _WRAP_METHOD(void set_functions(WMFunction functions), gdk_window_set_functions) + + _WRAP_METHOD(static Glib::ListHandle< Glib::RefPtr > get_toplevels(), gdk_window_get_toplevels) + + _WRAP_METHOD(void beep(), gdk_window_beep) + + _WRAP_METHOD(void iconify(), gdk_window_iconify) + _WRAP_METHOD(void deiconify(), gdk_window_deiconify) + _WRAP_METHOD(void stick(), gdk_window_stick) + _WRAP_METHOD(void unstick(), gdk_window_unstick) + _WRAP_METHOD(void maximize(), gdk_window_maximize) + _WRAP_METHOD(void unmaximize(), gdk_window_unmaximize) + _WRAP_METHOD(void register_dnd(), gdk_window_register_dnd) + _WRAP_METHOD(void begin_resize_drag(WindowEdge edge, int button, int root_x, int root_y, guint32 timestamp), gdk_window_begin_resize_drag) + _WRAP_METHOD(void begin_move_drag(int button, int root_x, int root_y, guint32 timestamp), gdk_window_begin_move_drag) + _WRAP_METHOD(void invalidate_rect(const Rectangle& rect, bool invalidate_children), gdk_window_invalidate_rect) + + _WRAP_METHOD(void invalidate_region(const Region& region, bool invalidate_children = true), gdk_window_invalidate_region) + + _WRAP_METHOD(Region get_update_area(), gdk_window_get_update_area) + //This method should not have a const version - see the docs. + + _WRAP_METHOD(void freeze_updates(), gdk_window_freeze_updates) + _WRAP_METHOD(void thaw_updates(), gdk_window_thaw_updates) + _WRAP_METHOD(static void process_all_updates(), gdk_window_process_all_updates) + _WRAP_METHOD(void process_updates(bool update_children), gdk_window_process_updates) + _WRAP_METHOD(static void set_debug_updates(bool setting = true), gdk_window_set_debug_updates) + _WRAP_METHOD(static void constrain_size(const Geometry& geometry, guint flags, int width, int height, int& new_width, int& new_height), gdk_window_constrain_size) + void get_internal_paint_info(Glib::RefPtr& real_drawable, int& x_offset, int& y_offset) const; + + _WRAP_METHOD(void enable_synchronized_configure(), gdk_window_enable_synchronized_configure) + _WRAP_METHOD(void configure_finished(), gdk_window_configure_finished) + + _WRAP_METHOD(void set_skip_taskbar_hint(bool skips_taskbar = true), gdk_window_set_skip_taskbar_hint) + _WRAP_METHOD(void set_skip_pager_hint(bool skips_pager = true), gdk_window_set_skip_pager_hint) + + _WRAP_METHOD(void set_urgency_hint(bool urgent = true), gdk_window_set_urgency_hint) + + _WRAP_METHOD(void fullscreen(), gdk_window_fullscreen) + _WRAP_METHOD(void unfullscreen(), gdk_window_unfullscreen) + + _WRAP_METHOD(GrabStatus pointer_grab(bool owner_events, EventMask event_mask, const Glib::RefPtr& confine_to, const Cursor& cursor, guint32 time_), gdk_pointer_grab) + + /** Grabs the pointer to a specific window. + * Requires a corresponding call to pointer_ungrab(). + * + * Arguments: + * @param owner_events Specifies whether events will be reported as is, or relative to the window. + * @param event_mask Masks only interesting events. + * @param cursor Changes the cursor for the duration of the grab. + * @param timestamp Specifies the time. + */ + GrabStatus pointer_grab(bool owner_events, EventMask event_mask, const Cursor& cursor, guint32 timestamp); + + /** Grabs the pointer to a specific window. + * Requires a corresponding call to pointer_ungrab(). + * + * Arguments: + * @param owner_events Specifies whether events will be reported as is, or relative to the window. + * @param event_mask Masks only interesting events. + * @param timestamp Specifies the time. + */ + GrabStatus pointer_grab(bool owner_events, EventMask event_mask, guint32 timestamp); + + _WRAP_METHOD(static void pointer_ungrab(guint32 timestamp), gdk_pointer_ungrab) + _WRAP_METHOD(GrabStatus keyboard_grab(bool owner_events, guint32 timestamp), gdk_keyboard_grab) + _WRAP_METHOD(static void keyboard_ungrab(guint32 timestamp), gdk_keyboard_ungrab) + + _WRAP_METHOD(void set_keep_above(bool setting = true), gdk_window_set_keep_above) + _WRAP_METHOD(void set_keep_below(bool setting = true), gdk_window_set_keep_below) + + _WRAP_METHOD(void set_opacity(double opacity), gdk_window_set_opacity) + + _WRAP_METHOD(void set_accept_focus(bool accept_focus = true), gdk_window_set_accept_focus) + + _WRAP_METHOD(void set_focus_on_map(bool focus_on_map), gdk_window_set_focus_on_map) +}; + +} /* namespace Gdk */ + diff --git a/libs/gtkmm2/gtk/.cvsignore b/libs/gtkmm2/gtk/.cvsignore deleted file mode 100644 index e5d046710f..0000000000 --- a/libs/gtkmm2/gtk/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.dylib diff --git a/libs/gtkmm2/gtk/Makefile.am b/libs/gtkmm2/gtk/Makefile.am new file mode 100644 index 0000000000..a6f53acf1d --- /dev/null +++ b/libs/gtkmm2/gtk/Makefile.am @@ -0,0 +1,13 @@ +SUBDIRS = src gtkmm + +EXTRA_DIST = README gtkmmconfig.h.in gtkmm-2.4.pc.in + +gtkmm_includedir = $(includedir)/gtkmm-2.4 +gtkmm_include_HEADERS = gtkmm.h + +gtkmm_configdir = $(libdir)/gtkmm-2.4/include +gtkmm_config_DATA = gtkmmconfig.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gtkmm-2.4.pc + diff --git a/libs/glibmm2/tools/Makefile.in b/libs/gtkmm2/gtk/Makefile.in similarity index 59% rename from libs/glibmm2/tools/Makefile.in rename to libs/gtkmm2/gtk/Makefile.in index dc9a54dbae..b2729f32de 100644 --- a/libs/glibmm2/tools/Makefile.in +++ b/libs/gtkmm2/gtk/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,12 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,48 +33,54 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/generate_wrap_init.pl.in $(srcdir)/gmmproc.in \ - $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment \ - $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment \ - $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment \ - TODO -subdir = tools +subdir = gtk +DIST_COMMON = README $(gtkmm_include_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gtkmm-2.4.pc.in \ + $(srcdir)/gtkmmconfig.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/scripts/cxx.m4 \ - $(top_srcdir)/scripts/cxx_std.m4 \ - $(top_srcdir)/scripts/docgen.m4 \ - $(top_srcdir)/scripts/glibmm_check_perl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ $(top_srcdir)/scripts/macros.m4 \ - $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h \ - $(top_builddir)/glib/glibmmconfig.h -CONFIG_CLEAN_FILES = gmmproc generate_wrap_init.pl -am__installdirs = "$(DESTDIR)$(gmmproc_bindir)" -gmmproc_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(gmmproc_bin_SCRIPTS) + $(top_builddir)/gdk/gdkmmconfig.h gtkmmconfig.h +CONFIG_CLEAN_FILES = gtkmm-2.4.pc SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(gtkmm_configdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(gtkmm_includedir)" +gtkmm_configDATA_INSTALL = $(INSTALL_DATA) +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(gtkmm_config_DATA) $(pkgconfig_DATA) +gtkmm_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(gtkmm_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -93,37 +96,44 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ -GLIBMM_CFLAGS = @GLIBMM_CFLAGS@ -GLIBMM_LIBS = @GLIBMM_LIBS@ -GLIBMM_MAJOR_VERSION = @GLIBMM_MAJOR_VERSION@ -GLIBMM_MICRO_VERSION = @GLIBMM_MICRO_VERSION@ -GLIBMM_MINOR_VERSION = @GLIBMM_MINOR_VERSION@ -GLIBMM_RELEASE = @GLIBMM_RELEASE@ -GLIBMM_VERSION = @GLIBMM_VERSION@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ GTHREAD_LIBS = @GTHREAD_LIBS@ -GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ -GTKMM_FALSE_FALSE = @GTKMM_FALSE_FALSE@ -GTKMM_FALSE_TRUE = @GTKMM_FALSE_TRUE@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ -LIBGLIBMM_SO_VERSION = @LIBGLIBMM_SO_VERSION@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -131,43 +141,33 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ M4 = @M4@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL_PATH = @PERL_PATH@ PKG_CONFIG = @PKG_CONFIG@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_AS = @ac_ct_AS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DLLTOOL = @ac_ct_DLLTOOL@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_OBJDUMP = @ac_ct_OBJDUMP@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -179,47 +179,52 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -files_tools_m4 = base.m4 class_shared.m4 class_boxedtype.m4 class_boxedtype_static.m4 \ - class_generic.m4 class_gobject.m4 class_gtkobject.m4 \ - class_interface.m4 class_opaque_refcounted.m4 class_opaque_copyable.m4 \ - gerror.m4 \ - compare.m4 convert.m4 convert_base.m4 convert_gtkmm.m4 convert_atk.m4 convert_gdk.m4 \ - convert_glib.m4 convert_gtk.m4 convert_pango.m4 ctor.m4 doc.m4 enum.m4 list.m4 member.m4 \ - method.m4 property.m4 signal.m4 vfunc.m4 - -files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm -files_tools_genwrap = generate_wrap_init.pl -files_tools_perl = $(files_tools_genwrap) gmmproc.in -SUBDIRS = m4 pm extra_defs_gen -EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_perl) README TODO enum.pl -gmmproc_bin_SCRIPTS = gmmproc $(files_tools_genwrap) -gmmproc_bindir = $(libdir)/glibmm-2.4/proc -all: all-recursive +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = src gtkmm +EXTRA_DIST = README gtkmmconfig.h.in gtkmm-2.4.pc.in +gtkmm_includedir = $(includedir)/gtkmm-2.4 +gtkmm_include_HEADERS = gtkmm.h +gtkmm_configdir = $(libdir)/gtkmm-2.4/include +gtkmm_config_DATA = gtkmmconfig.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gtkmm-2.4.pc +all: gtkmmconfig.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment $(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -228,9 +233,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu tools/Makefile + $(AUTOMAKE) --gnu gtk/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -248,39 +253,82 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -gmmproc: $(top_builddir)/config.status $(srcdir)/gmmproc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -generate_wrap_init.pl: $(top_builddir)/config.status $(srcdir)/generate_wrap_init.pl.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-gmmproc_binSCRIPTS: $(gmmproc_bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(gmmproc_bindir)" || $(mkdir_p) "$(DESTDIR)$(gmmproc_bindir)" - @list='$(gmmproc_bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(gmmproc_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(gmmproc_bindir)/$$f'"; \ - $(gmmproc_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(gmmproc_bindir)/$$f"; \ - else :; fi; \ - done -uninstall-gmmproc_binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(gmmproc_bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(gmmproc_bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(gmmproc_bindir)/$$f"; \ - done +gtkmmconfig.h: stamp-h3 + @if test ! -f $@; then \ + rm -f stamp-h3; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h3; \ + else :; fi + +stamp-h3: $(srcdir)/gtkmmconfig.h.in $(top_builddir)/config.status + @rm -f stamp-h3 + cd $(top_builddir) && $(SHELL) ./config.status gtk/gtkmmconfig.h +$(srcdir)/gtkmmconfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h3 + touch $@ + +distclean-hdr: + -rm -f gtkmmconfig.h stamp-h3 +gtkmm-2.4.pc: $(top_builddir)/config.status $(srcdir)/gtkmm-2.4.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +install-gtkmm_configDATA: $(gtkmm_config_DATA) + @$(NORMAL_INSTALL) + test -z "$(gtkmm_configdir)" || $(MKDIR_P) "$(DESTDIR)$(gtkmm_configdir)" + @list='$(gtkmm_config_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(gtkmm_configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gtkmm_configdir)/$$f'"; \ + $(gtkmm_configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gtkmm_configdir)/$$f"; \ + done -distclean-libtool: - -rm -f libtool -uninstall-info-am: +uninstall-gtkmm_configDATA: + @$(NORMAL_UNINSTALL) + @list='$(gtkmm_config_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(gtkmm_configdir)/$$f'"; \ + rm -f "$(DESTDIR)$(gtkmm_configdir)/$$f"; \ + done +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +install-gtkmm_includeHEADERS: $(gtkmm_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(gtkmm_includedir)" || $(MKDIR_P) "$(DESTDIR)$(gtkmm_includedir)" + @list='$(gtkmm_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(gtkmm_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gtkmm_includedir)/$$f'"; \ + $(gtkmm_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gtkmm_includedir)/$$f"; \ + done + +uninstall-gtkmm_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(gtkmm_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(gtkmm_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(gtkmm_includedir)/$$f"; \ + done # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -313,8 +361,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -363,7 +410,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) gtkmmconfig.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ @@ -380,7 +427,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) gtkmmconfig.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -392,11 +439,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) gtkmmconfig.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) gtkmmconfig.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -415,23 +462,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../tools $(distdir)/../tools/m4 $(distdir)/../tools/pm - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -445,7 +490,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -453,17 +498,19 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ done check-am: all-am check: check-recursive -all-am: Makefile $(SCRIPTS) +all-am: Makefile $(DATA) $(HEADERS) gtkmmconfig.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(gmmproc_bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + for dir in "$(DESTDIR)$(gtkmm_configdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(gtkmm_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -495,8 +542,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags dvi: dvi-recursive @@ -508,14 +554,23 @@ info: info-recursive info-am: -install-data-am: install-gmmproc_binSCRIPTS +install-data-am: install-gtkmm_configDATA install-gtkmm_includeHEADERS \ + install-pkgconfigDATA + +install-dvi: install-dvi-recursive install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -534,24 +589,28 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-gmmproc_binSCRIPTS uninstall-info-am +uninstall-am: uninstall-gtkmm_configDATA \ + uninstall-gtkmm_includeHEADERS uninstall-pkgconfigDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-gmmproc_binSCRIPTS install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-gmmproc_binSCRIPTS \ - uninstall-info-am +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-gtkmm_configDATA \ + install-gtkmm_includeHEADERS install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-gtkmm_configDATA uninstall-gtkmm_includeHEADERS \ + uninstall-pkgconfigDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libs/gtkmm2/gtk/README b/libs/gtkmm2/gtk/README new file mode 100644 index 0000000000..511d747d80 --- /dev/null +++ b/libs/gtkmm2/gtk/README @@ -0,0 +1,6 @@ +Base directory for gtkmm - the widget set. + +Here is the layout + + src - actual sources used to build + gtkmm - built sources (do not edit) diff --git a/libs/gtkmm2/gtk/gtkmm-2.4.pc.in b/libs/gtkmm2/gtk/gtkmm-2.4.pc.in new file mode 100644 index 0000000000..bebe4064b3 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm-2.4.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gtkmm +Description: C++ wrapper for GTK+ +Requires: glibmm-2.4 gdkmm-2.4 pangomm-1.4 @GTKMM_PC_ATKMM_DEP@ gtk+-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lgtkmm-2.4 +Cflags: -I${includedir}/gtkmm-2.4 -I${libdir}/gtkmm-2.4/include diff --git a/libs/gtkmm2/gtk/gtkmm.h b/libs/gtkmm2/gtk/gtkmm.h index 91dc01ab0e..8dd38de45d 100644 --- a/libs/gtkmm2/gtk/gtkmm.h +++ b/libs/gtkmm2/gtk/gtkmm.h @@ -41,6 +41,7 @@ extern const int gtkmm_micro_version; #include #include #include +#include #include #include #include @@ -126,6 +127,7 @@ extern const int gtkmm_micro_version; #include #include #include +#include #include #include #include @@ -165,6 +167,7 @@ extern const int gtkmm_micro_version; #include #include #include +#include #include #include #include diff --git a/libs/gtkmm2/gtk/gtkmm/.cvsignore b/libs/gtkmm2/gtk/gtkmm/.cvsignore deleted file mode 100644 index 1edeb79fd1..0000000000 --- a/libs/gtkmm2/gtk/gtkmm/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.os diff --git a/libs/gtkmm2/gtk/gtkmm/Makefile.am b/libs/gtkmm2/gtk/gtkmm/Makefile.am new file mode 100644 index 0000000000..d60791b555 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/Makefile.am @@ -0,0 +1,42 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +SUBDIRS = private + +sublib_name = gtkmm +sublib_libname = gtkmm-2.4 +sublib_libversion = $(LIBGTKMM_SO_VERSION) +sublib_namespace = Gtk +sublib_cflags = $(GTKMM_CFLAGS) +sublib_topdir = gtk +sublib_win32_dlls_libs = + +sublib_files_extra_posix_cc = +sublib_files_extra_win32_cc = +sublib_files_extra_general_cc = accelkey.cc accelmap.cc cellrenderer_generation.cc comboboxtext.cc comboboxentrytext.cc \ + listviewtext.cc \ + menu_elems.cc radiobuttongroup.cc selectiondata_private.cc stock.cc stockid.cc targetentry.cc \ + treemodelcolumn.cc treeview_private.cc +sublib_files_extra_general_deprecated_cc = + +sublib_files_extra_posix_h = +sublib_files_extra_win32_h = +sublib_files_extra_general_h = accelkey.h accelmap.h base.h cellrenderer_generation.h comboboxtext.h comboboxentrytext.h\ + listviewtext.h \ + menu_elems.h radiobuttongroup.h selectiondata_private.h stock.h stockid.h targetentry.h \ + treemodelcolumn.h treeview_private.h +sublib_files_extra_general_deprecated_h = + +include $(top_srcdir)/build_shared/Makefile_build.am_fragment + +lib_LTLIBRARIES = libgtkmm-2.4.la +libgtkmm_2_4_la_SOURCES = $(files_built_cc) $(files_extra_cc) +libgtkmm_2_4_la_LDFLAGS = $(common_ldflags) +libgtkmm_2_4_la_LIBADD = $(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la \ + $(top_builddir)/pango/pangomm/libpangomm-1.4.la \ + $(LIBADD_ATK) \ + $(GTKMM_LIBS) + +if GTKMM_ATKMM_ENABLED +libgtkmm_2_4_la_LIBADD += $(top_builddir)/atk/atkmm/libatkmm-1.6.la +endif diff --git a/libs/gtkmm2/gtk/gtkmm/Makefile.in b/libs/gtkmm2/gtk/gtkmm/Makefile.in new file mode 100644 index 0000000000..8cccf62cd5 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/Makefile.in @@ -0,0 +1,1066 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(srcdir)/../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(sublib_include_HEADERS) \ + $(top_srcdir)/build_shared/Makefile_build.am_fragment \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment +@GTKMM_ATKMM_ENABLED_TRUE@am__append_1 = $(top_builddir)/atk/atkmm/libatkmm-1.6.la +subdir = gtk/gtkmm +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(sublib_includedir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +am__DEPENDENCIES_1 = +libgtkmm_2_4_la_DEPENDENCIES = \ + $(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la \ + $(top_builddir)/pango/pangomm/libpangomm-1.4.la \ + $(am__DEPENDENCIES_1) $(am__append_1) +am__libgtkmm_2_4_la_SOURCES_DIST = aboutdialog.cc accelgroup.cc \ + accellabel.cc action.cc actiongroup.cc adjustment.cc \ + alignment.cc arrow.cc aspectframe.cc assistant.cc bin.cc \ + box.cc builder.cc button.cc buttonbox.cc calendar.cc \ + celleditable.cc celllayout.cc cellview.cc cellrenderer.cc \ + cellrendereraccel.cc cellrenderercombo.cc \ + cellrendererpixbuf.cc cellrendererprogress.cc \ + cellrendererspin.cc cellrenderertext.cc cellrenderertoggle.cc \ + checkbutton.cc checkmenuitem.cc clipboard.cc colorselection.cc \ + colorbutton.cc combobox.cc comboboxentry.cc container.cc \ + curve.cc dialog.cc drawingarea.cc editable.cc entry.cc \ + entrycompletion.cc enums.cc eventbox.cc expander.cc \ + filechooser.cc filechooserbutton.cc filechooserwidget.cc \ + filechooserdialog.cc filefilter.cc fileselection.cc fixed.cc \ + fontbutton.cc fontselection.cc frame.cc handlebox.cc \ + iconfactory.cc iconset.cc iconsource.cc iconinfo.cc \ + icontheme.cc iconview.cc image.cc imagemenuitem.cc \ + inputdialog.cc invisible.cc item.cc label.cc layout.cc \ + linkbutton.cc liststore.cc main.cc menu.cc menubar.cc \ + menuitem.cc menushell.cc menutoolbutton.cc messagedialog.cc \ + misc.cc notebook.cc object.cc optionmenu.cc paned.cc plug.cc \ + progressbar.cc papersize.cc pagesetup.cc printsettings.cc \ + printcontext.cc printoperation.cc printoperationpreview.cc \ + radioaction.cc radiobutton.cc radiomenuitem.cc \ + radiotoolbutton.cc range.cc rc.cc recentaction.cc \ + recentchooser.cc recentchooserdialog.cc recentchoosermenu.cc \ + recentchooserwidget.cc recentfilter.cc recentinfo.cc \ + recentmanager.cc ruler.cc scale.cc scalebutton.cc scrollbar.cc \ + scrolledwindow.cc selectiondata.cc separator.cc \ + separatormenuitem.cc separatortoolitem.cc settings.cc \ + sizegroup.cc socket.cc spinbutton.cc statusbar.cc \ + statusicon.cc stockitem.cc style.cc table.cc targetlist.cc \ + tearoffmenuitem.cc textattributes.cc textbuffer.cc \ + textchildanchor.cc textiter.cc textmark.cc texttag.cc \ + texttagtable.cc textview.cc toggleaction.cc togglebutton.cc \ + toggletoolbutton.cc toolbar.cc toolitem.cc toolbutton.cc \ + tooltips.cc tooltip.cc treedragdest.cc treedragsource.cc \ + treepath.cc treerowreference.cc treeselection.cc \ + treesortable.cc treeiter.cc treemodel.cc treemodelfilter.cc \ + treemodelsort.cc treestore.cc treeview.cc treeviewcolumn.cc \ + viewport.cc volumebutton.cc uimanager.cc widget.cc window.cc \ + pagesetupunixdialog.cc printunixdialog.cc printer.cc \ + printjob.cc combo.cc wrap_init.cc accelkey.cc accelmap.cc \ + cellrenderer_generation.cc comboboxtext.cc \ + comboboxentrytext.cc listviewtext.cc menu_elems.cc \ + radiobuttongroup.cc selectiondata_private.cc stock.cc \ + stockid.cc targetentry.cc treemodelcolumn.cc \ + treeview_private.cc +am__objects_1 = aboutdialog.lo accelgroup.lo accellabel.lo action.lo \ + actiongroup.lo adjustment.lo alignment.lo arrow.lo \ + aspectframe.lo assistant.lo bin.lo box.lo builder.lo button.lo \ + buttonbox.lo calendar.lo celleditable.lo celllayout.lo \ + cellview.lo cellrenderer.lo cellrendereraccel.lo \ + cellrenderercombo.lo cellrendererpixbuf.lo \ + cellrendererprogress.lo cellrendererspin.lo \ + cellrenderertext.lo cellrenderertoggle.lo checkbutton.lo \ + checkmenuitem.lo clipboard.lo colorselection.lo colorbutton.lo \ + combobox.lo comboboxentry.lo container.lo curve.lo dialog.lo \ + drawingarea.lo editable.lo entry.lo entrycompletion.lo \ + enums.lo eventbox.lo expander.lo filechooser.lo \ + filechooserbutton.lo filechooserwidget.lo filechooserdialog.lo \ + filefilter.lo fileselection.lo fixed.lo fontbutton.lo \ + fontselection.lo frame.lo handlebox.lo iconfactory.lo \ + iconset.lo iconsource.lo iconinfo.lo icontheme.lo iconview.lo \ + image.lo imagemenuitem.lo inputdialog.lo invisible.lo item.lo \ + label.lo layout.lo linkbutton.lo liststore.lo main.lo menu.lo \ + menubar.lo menuitem.lo menushell.lo menutoolbutton.lo \ + messagedialog.lo misc.lo notebook.lo object.lo optionmenu.lo \ + paned.lo plug.lo progressbar.lo papersize.lo pagesetup.lo \ + printsettings.lo printcontext.lo printoperation.lo \ + printoperationpreview.lo radioaction.lo radiobutton.lo \ + radiomenuitem.lo radiotoolbutton.lo range.lo rc.lo \ + recentaction.lo recentchooser.lo recentchooserdialog.lo \ + recentchoosermenu.lo recentchooserwidget.lo recentfilter.lo \ + recentinfo.lo recentmanager.lo ruler.lo scale.lo \ + scalebutton.lo scrollbar.lo scrolledwindow.lo selectiondata.lo \ + separator.lo separatormenuitem.lo separatortoolitem.lo \ + settings.lo sizegroup.lo socket.lo spinbutton.lo statusbar.lo \ + statusicon.lo stockitem.lo style.lo table.lo targetlist.lo \ + tearoffmenuitem.lo textattributes.lo textbuffer.lo \ + textchildanchor.lo textiter.lo textmark.lo texttag.lo \ + texttagtable.lo textview.lo toggleaction.lo togglebutton.lo \ + toggletoolbutton.lo toolbar.lo toolitem.lo toolbutton.lo \ + tooltips.lo tooltip.lo treedragdest.lo treedragsource.lo \ + treepath.lo treerowreference.lo treeselection.lo \ + treesortable.lo treeiter.lo treemodel.lo treemodelfilter.lo \ + treemodelsort.lo treestore.lo treeview.lo treeviewcolumn.lo \ + viewport.lo volumebutton.lo uimanager.lo widget.lo window.lo +am__objects_2 = pagesetupunixdialog.lo printunixdialog.lo printer.lo \ + printjob.lo +am__objects_3 = combo.lo +am__objects_4 = +@OS_WIN32_FALSE@am__objects_5 = $(am__objects_1) $(am__objects_2) \ +@OS_WIN32_FALSE@ $(am__objects_3) +@OS_WIN32_TRUE@am__objects_5 = $(am__objects_1) $(am__objects_4) \ +@OS_WIN32_TRUE@ $(am__objects_3) +am__objects_6 = $(am__objects_5) wrap_init.lo +am__objects_7 = accelkey.lo accelmap.lo cellrenderer_generation.lo \ + comboboxtext.lo comboboxentrytext.lo listviewtext.lo \ + menu_elems.lo radiobuttongroup.lo selectiondata_private.lo \ + stock.lo stockid.lo targetentry.lo treemodelcolumn.lo \ + treeview_private.lo +@OS_WIN32_FALSE@am__objects_8 = $(am__objects_4) $(am__objects_7) +@OS_WIN32_TRUE@am__objects_8 = $(am__objects_4) $(am__objects_7) +am_libgtkmm_2_4_la_OBJECTS = $(am__objects_6) $(am__objects_8) +libgtkmm_2_4_la_OBJECTS = $(am_libgtkmm_2_4_la_OBJECTS) +libgtkmm_2_4_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(libgtkmm_2_4_la_LDFLAGS) $(LDFLAGS) -o $@ +depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(libgtkmm_2_4_la_SOURCES) +DIST_SOURCES = $(am__libgtkmm_2_4_la_SOURCES_DIST) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +sublib_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(sublib_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ -DG_LOG_DOMAIN=\"$(sublib_name)\" $(extra_win32_defines) +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = private +sublib_name = gtkmm +sublib_libname = gtkmm-2.4 +sublib_libversion = $(LIBGTKMM_SO_VERSION) +sublib_namespace = Gtk +sublib_cflags = $(GTKMM_CFLAGS) +sublib_topdir = gtk +sublib_win32_dlls_libs = +sublib_files_extra_posix_cc = +sublib_files_extra_win32_cc = +sublib_files_extra_general_cc = accelkey.cc accelmap.cc cellrenderer_generation.cc comboboxtext.cc comboboxentrytext.cc \ + listviewtext.cc \ + menu_elems.cc radiobuttongroup.cc selectiondata_private.cc stock.cc stockid.cc targetentry.cc \ + treemodelcolumn.cc treeview_private.cc + +sublib_files_extra_general_deprecated_cc = +sublib_files_extra_posix_h = +sublib_files_extra_win32_h = +sublib_files_extra_general_h = accelkey.h accelmap.h base.h cellrenderer_generation.h comboboxtext.h comboboxentrytext.h\ + listviewtext.h \ + menu_elems.h radiobuttongroup.h selectiondata_private.h stock.h stockid.h targetentry.h \ + treemodelcolumn.h treeview_private.h + +sublib_files_extra_general_deprecated_h = +files_posix_hg = pagesetupunixdialog.hg printunixdialog.hg \ + printer.hg printjob.hg + +files_win32_hg = +files_general_hg = aboutdialog.hg accelgroup.hg accellabel.hg action.hg actiongroup.hg adjustment.hg alignment.hg \ + arrow.hg aspectframe.hg assistant.hg \ + bin.hg box.hg builder.hg button.hg buttonbox.hg \ + calendar.hg celleditable.hg celllayout.hg cellview.hg \ + cellrenderer.hg cellrendereraccel.hg cellrenderercombo.hg cellrendererpixbuf.hg cellrendererprogress.hg cellrendererspin.hg cellrenderertext.hg cellrenderertoggle.hg \ + checkbutton.hg checkmenuitem.hg clipboard.hg colorselection.hg colorbutton.hg \ + combobox.hg comboboxentry.hg container.hg curve.hg \ + dialog.hg drawingarea.hg \ + editable.hg entry.hg entrycompletion.hg enums.hg eventbox.hg expander.hg \ + filechooser.hg filechooserbutton.hg filechooserwidget.hg filechooserdialog.hg filefilter.hg \ + fileselection.hg fixed.hg fontbutton.hg fontselection.hg frame.hg \ + handlebox.hg \ + iconfactory.hg iconset.hg iconsource.hg iconinfo.hg icontheme.hg iconview.hg image.hg imagemenuitem.hg inputdialog.hg invisible.hg item.hg \ + label.hg layout.hg linkbutton.hg liststore.hg \ + main.hg menu.hg menubar.hg menuitem.hg menushell.hg menutoolbutton.hg messagedialog.hg misc.hg \ + notebook.hg object.hg optionmenu.hg \ + paned.hg plug.hg progressbar.hg \ + papersize.hg pagesetup.hg printsettings.hg printcontext.hg printoperation.hg printoperationpreview.hg \ + radioaction.hg radiobutton.hg radiomenuitem.hg radiotoolbutton.hg range.hg rc.hg \ + recentaction.hg recentchooser.hg recentchooserdialog.hg recentchoosermenu.hg recentchooserwidget.hg \ + recentfilter.hg recentinfo.hg recentmanager.hg ruler.hg \ + scale.hg scalebutton.hg scrollbar.hg scrolledwindow.hg selectiondata.hg \ + separator.hg separatormenuitem.hg separatortoolitem.hg settings.hg sizegroup.hg socket.hg spinbutton.hg statusbar.hg statusicon.hg \ + stockitem.hg style.hg \ + table.hg targetlist.hg tearoffmenuitem.hg \ + textattributes.hg textbuffer.hg textchildanchor.hg textiter.hg textmark.hg texttag.hg texttagtable.hg textview.hg \ + toggleaction.hg \ + togglebutton.hg toggletoolbutton.hg toolbar.hg toolitem.hg toolbutton.hg tooltips.hg tooltip.hg \ + treedragdest.hg treedragsource.hg treepath.hg treerowreference.hg treeselection.hg treesortable.hg \ + treeiter.hg treemodel.hg treemodelfilter.hg treemodelsort.hg treestore.hg treeview.hg treeviewcolumn.hg \ + viewport.hg volumebutton.hg uimanager.hg \ + widget.hg window.hg + +files_general_deprecated_hg = combo.hg +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +@PLATFORM_WIN32_FALSE@extra_win32_defines = + +# Support for DLL on mingw using libtool > 1.4 +# When creating DLLs on win32, we need to explicitly add a few extra +# libraries at link time to resolve symbols (remember a dll is like an +# executable). +@PLATFORM_WIN32_TRUE@extra_win32_defines = \ +@PLATFORM_WIN32_TRUE@ -D$(shell echo $(sublib_name) | tr [:lower:] [:upper:])_BUILD + +@PLATFORM_WIN32_FALSE@no_undefined = +@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined -Wl,--export-all-symbols +@PLATFORM_WIN32_FALSE@win32_dlls_extra_libs = +@PLATFORM_WIN32_TRUE@win32_dlls_extra_libs = $(sublib_win32_dlls_libs) +common_ldflags = -version-info $(sublib_libversion) $(no_undefined) + +# All modules can include all other modules, +# for instance, so that gdkmm can use headers in pangomm. +all_includes = -I$(top_builddir)/$(sublib_topdir) -I$(top_srcdir)/$(sublib_topdir) \ + -I$(top_builddir)/pango -I$(top_srcdir)/pango \ + -I$(top_builddir)/atk -I$(top_srcdir)/atk \ + -I$(top_builddir)/gdk -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gtk -I$(top_srcdir)/gtk \ + $(sublib_cflags) $(GTHREAD_CFLAGS) + +dist_sources = $(files_all_built_cc) $(files_all_extra_cc) $(files_all_built_h) $(files_all_extra_h) +DISTFILES = $(DIST_COMMON) $(dist_sources) $(TEXINFOS) $(EXTRA_DIST) +DEFAULT_INCLUDES = + +# DISABLE_DEPRECATED_CFLAGS and DISABLE_DEPRECATED_API_CFLAGS are empty unless the appropriate --enable-*=no options are specified to configure: +INCLUDES = $(strip $(all_includes)) $(DISABLE_DEPRECATED_CFLAGS) $(DISABLE_DEPRECATED_API_CFLAGS) +sublib_includedir = $(includedir)/$(sublib_libname)/$(sublib_name) +sublib_include_HEADERS = $(files_all_built_h) $(files_all_extra_h) +lib_LTLIBRARIES = libgtkmm-2.4.la +libgtkmm_2_4_la_SOURCES = $(files_built_cc) $(files_extra_cc) +libgtkmm_2_4_la_LDFLAGS = $(common_ldflags) +libgtkmm_2_4_la_LIBADD = $(top_builddir)/gdk/gdkmm/libgdkmm-2.4.la \ + $(top_builddir)/pango/pangomm/libpangomm-1.4.la $(LIBADD_ATK) \ + $(GTKMM_LIBS) $(am__append_1) +all: all-recursive + +.SUFFIXES: +.SUFFIXES: .cc .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build_shared/Makefile_build.am_fragment $(srcdir)/../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/gtkmm/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/gtkmm/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libgtkmm-2.4.la: $(libgtkmm_2_4_la_OBJECTS) $(libgtkmm_2_4_la_DEPENDENCIES) + $(libgtkmm_2_4_la_LINK) -rpath $(libdir) $(libgtkmm_2_4_la_OBJECTS) $(libgtkmm_2_4_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutdialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accelgroup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accelkey.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accellabel.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accelmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actiongroup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adjustment.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alignment.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arrow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aspectframe.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assistant.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/button.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buttonbox.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calendar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/celleditable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/celllayout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrenderer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrenderer_generation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrendereraccel.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrenderercombo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrendererpixbuf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrendererprogress.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrendererspin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrenderertext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellrenderertoggle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cellview.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkmenuitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clipboard.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colorbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colorselection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combobox.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comboboxentry.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comboboxentrytext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comboboxtext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/container.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawingarea.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/entry.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/entrycompletion.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/enums.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventbox.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expander.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filechooser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filechooserbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filechooserdialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filechooserwidget.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filefilter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileselection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontselection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handlebox.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconfactory.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconset.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconsource.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icontheme.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconview.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagemenuitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inputdialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/invisible.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/item.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/label.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linkbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liststore.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listviewtext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu_elems.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menubar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menuitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menushell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menutoolbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/messagedialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notebook.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optionmenu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagesetup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pagesetupunixdialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paned.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/papersize.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printcontext.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printjob.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printoperation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printoperationpreview.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printsettings.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printunixdialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progressbar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radioaction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radiobutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radiobuttongroup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radiomenuitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radiotoolbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/range.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentaction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentchooser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentchooserdialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentchoosermenu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentchooserwidget.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentfilter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recentmanager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ruler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scalebutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollbar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrolledwindow.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selectiondata.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selectiondata_private.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separator.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separatormenuitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/separatortoolitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sizegroup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socket.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spinbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statusbar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statusicon.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stockid.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stockitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/style.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/targetentry.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/targetlist.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tearoffmenuitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textattributes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textbuffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textchildanchor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textiter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textmark.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texttag.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texttagtable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/textview.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toggleaction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/togglebutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toggletoolbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toolbar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toolbutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toolitem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tooltip.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tooltips.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treedragdest.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treedragsource.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeiter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treemodel.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treemodelcolumn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treemodelfilter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treemodelsort.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treepath.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treerowreference.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeselection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treesortable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treestore.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview_private.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeviewcolumn.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uimanager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/viewport.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/volumebutton.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widget.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrap_init.Plo@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-sublib_includeHEADERS: $(sublib_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(sublib_includedir)" || $(MKDIR_P) "$(DESTDIR)$(sublib_includedir)" + @list='$(sublib_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(sublib_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(sublib_includedir)/$$f'"; \ + $(sublib_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(sublib_includedir)/$$f"; \ + done + +uninstall-sublib_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(sublib_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(sublib_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(sublib_includedir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sublib_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-sublib_includeHEADERS + +install-dvi: install-dvi-recursive + +install-exec-am: install-libLTLIBRARIES + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-sublib_includeHEADERS installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-sublib_includeHEADERS + + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_all_built_cc) $(files_all_built_h)) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc b/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc index 2ef8776d88..f792566b8f 100644 --- a/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/aboutdialog.cc @@ -190,21 +190,40 @@ GType AboutDialog::get_base_type() AboutDialog::AboutDialog() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Dialog(Glib::ConstructParams(aboutdialog_class_.init())) { } +#ifndef GTKMM_DISABLE_DEPRECATED + Glib::ustring AboutDialog::get_name() const { return Glib::convert_const_gchar_ptr_to_ustring(gtk_about_dialog_get_name(const_cast(gobj()))); } +#endif // GTKMM_DISABLE_DEPRECATED + +#ifndef GTKMM_DISABLE_DEPRECATED + void AboutDialog::set_name(const Glib::ustring& name) { gtk_about_dialog_set_name(gobj(), name.c_str()); } +#endif // GTKMM_DISABLE_DEPRECATED + +Glib::ustring AboutDialog::get_program_name() const +{ + return Glib::convert_const_gchar_ptr_to_ustring(gtk_about_dialog_get_program_name(const_cast(gobj()))); +} + +void AboutDialog::set_program_name(const Glib::ustring& name) +{ +gtk_about_dialog_set_program_name(gobj(), name.c_str()); +} + Glib::ustring AboutDialog::get_version() const { return Glib::convert_const_gchar_ptr_to_ustring(gtk_about_dialog_get_version(const_cast(gobj()))); @@ -355,6 +374,20 @@ Glib::PropertyProxy_ReadOnly AboutDialog::property_name() const } #endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy AboutDialog::property_program_name() +{ + return Glib::PropertyProxy(this, "program-name"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly AboutDialog::property_program_name() const +{ + return Glib::PropertyProxy_ReadOnly(this, "program-name"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy AboutDialog::property_version() { diff --git a/libs/gtkmm2/gtk/gtkmm/aboutdialog.h b/libs/gtkmm2/gtk/gtkmm/aboutdialog.h index 7e7a22b2af..7b35881eaf 100644 --- a/libs/gtkmm2/gtk/gtkmm/aboutdialog.h +++ b/libs/gtkmm2/gtk/gtkmm/aboutdialog.h @@ -119,23 +119,51 @@ public: AboutDialog(); - /** Returns the program name displayed in the about dialog. +#ifndef GTKMM_DISABLE_DEPRECATED + + /** Return value: The program name. The string is owned by the about * @return The program name. The string is owned by the about * dialog and must not be modified. * - * @newin2p6. + * @newin2p6 + * + * @a Deprecated : 2.12: Use get_program_name() instead. */ Glib::ustring get_name() const; - +#endif // GTKMM_DISABLE_DEPRECATED + + +#ifndef GTKMM_DISABLE_DEPRECATED + /** Sets the name to display in the about dialog. * If this is not set, it defaults to Glib::get_application_name(). * * @newin2p6 + * + * @a Deprecated : 2.12: Use set_program_name() instead. * @param name The program name. */ void set_name(const Glib::ustring& name); +#endif // GTKMM_DISABLE_DEPRECATED + + + /** Return value: The program name. + * @return The program name. + * + * @newin2p12. + */ + Glib::ustring get_program_name() const; - /** Returns the version string. + /** Sets the name to display in the about dialog. + * If this is not set, it defaults to Glib::get_application_name(). + * + * @newin2p12 + * @param name The program name. + */ + void set_program_name(const Glib::ustring& name); + + + /** Return value: The version string. The string is owned by the about * @return The version string. The string is owned by the about * dialog and must not be modified. * @@ -150,7 +178,7 @@ public: */ void set_version(const Glib::ustring& version); - /** Returns the copyright string. + /** Return value: The copyright string. The string is owned by the about * @return The copyright string. The string is owned by the about * dialog and must not be modified. * @@ -166,7 +194,7 @@ public: */ void set_copyright(const Glib::ustring& copyright); - /** Returns the comments string. + /** Return value: The comments. The string is owned by the about * @return The comments. The string is owned by the about * dialog and must not be modified. * @@ -183,7 +211,7 @@ public: */ void set_comments(const Glib::ustring& comments); - /** Returns the license information. + /** Return value: The license information. The string is owned by the about * @return The license information. The string is owned by the about * dialog and must not be modified. * @@ -200,7 +228,7 @@ public: */ void set_license(const Glib::ustring& license); - /** Returns the website URL. + /** Return value: The website URL. The string is owned by the about * @return The website URL. The string is owned by the about * dialog and must not be modified. * @@ -215,9 +243,8 @@ public: */ void set_website(const Glib::ustring& website); - /** Returns the label used for the website link. - * @return The label used for the website link. The string is owned by the about - * dialog and must not be modified. + /** Return value: The label used for the website link. + * @return The label used for the website link. * * @newin2p6. */ @@ -232,8 +259,7 @@ public: void set_website_label(const Glib::ustring& website_label); - /** Returns the string which are displayed in the authors tab - * of the secondary credits dialog. + /** Return value: A 0-terminated string array containing * @return A 0-terminated string array containing * the authors. The array is owned by the about dialog * and must not be modified. @@ -252,8 +278,7 @@ public: void set_authors(const Glib::StringArrayHandle& authors) const; - /** Returns the string which are displayed in the documenters - * tab of the secondary credits dialog. + /** Return value: A 0-terminated string array containing * @return A 0-terminated string array containing * the documenters. The array is owned by the about dialog * and must not be modified. @@ -271,8 +296,7 @@ public: */ void set_documenters(const Glib::StringArrayHandle& documenters); - /** Returns the string which are displayed in the artists tab - * of the secondary credits dialog. + /** Return value: A 0-terminated string array containing * @return A 0-terminated string array containing * the artists. The array is owned by the about dialog * and must not be modified. @@ -289,8 +313,7 @@ public: */ void set_artists(const Glib::StringArrayHandle& artists); - /** Returns the translator credits string which is displayed - * in the translators tab of the secondary credits dialog. + /** Return value: The translator credits string. The string is * @return The translator credits string. The string is * owned by the about dialog and must not be modified. * @@ -319,7 +342,7 @@ public: void set_translator_credits(const Glib::ustring& translator_credits); - /** Returns the pixbuf displayed as logo in the about dialog. + /** Return value: the pixbuf displayed as logo. The pixbuf is * @return The pixbuf displayed as logo. The pixbuf is * owned by the about dialog. If you want to keep a reference * to it, you have to call Glib::object_ref() on it. @@ -328,7 +351,7 @@ public: */ Glib::RefPtr get_logo(); - /** Returns the pixbuf displayed as logo in the about dialog. + /** Return value: the pixbuf displayed as logo. The pixbuf is * @return The pixbuf displayed as logo. The pixbuf is * owned by the about dialog. If you want to keep a reference * to it, you have to call Glib::object_ref() on it. @@ -349,7 +372,7 @@ public: void set_logo(const Glib::RefPtr& logo); - /** Returns the icon name displayed as logo in the about dialog. + /** Return value: the icon name displayed as logo. The string is * @return The icon name displayed as logo. The string is * owned by the dialog. If you want to keep a reference * to it, you have to call Glib::strdup() on it. @@ -369,8 +392,7 @@ public: void set_logo_icon_name(const Glib::ustring& icon_name); - /** Returns whether the license text in @a about is - * automatically wrapped. + /** Returns: true if the license text is wrapped * @return true if the license text is wrapped * * @newin2p8. @@ -402,9 +424,10 @@ public: static void set_url_hook(const SlotActivateLink& slot); -//TODO: Deprecate this, because it conflicts with the property in GtkWidget, which will be deprecated in GTK+ 2.12. +//TODO: Deprecate this, because it conflicts with the property in GtkWidget, and has been removed in GTK+ 2.12. +//If this could not have been used without an error, then remove it: #ifdef GLIBMM_PROPERTIES_ENABLED -/** The name of the program. If this is not set +/** The name of the widget. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -414,7 +437,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The name of the program. If this is not set +/** The name of the widget. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -424,6 +447,27 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The name of the program. If this is not set + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_program_name() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The name of the program. If this is not set + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_program_name() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED /** The version of the program. * @@ -692,10 +736,13 @@ public: namespace Glib { - /** @relates Gtk::AboutDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::AboutDialog */ Gtk::AboutDialog* wrap(GtkAboutDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/accelgroup.cc b/libs/gtkmm2/gtk/gtkmm/accelgroup.cc index fcc972de58..b78b4b5262 100644 --- a/libs/gtkmm2/gtk/gtkmm/accelgroup.cc +++ b/libs/gtkmm2/gtk/gtkmm/accelgroup.cc @@ -226,7 +226,7 @@ void AccelGroup_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void AccelGroup_Class::accel_changed_callback(GtkAccelGroup* self, guint p0, GdkModifierType p1, GClosure* p2) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -234,33 +234,36 @@ void AccelGroup_Class::accel_changed_callback(GtkAccelGroup* self, guint p0, Gdk // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_accel_changed(p0, ((Gdk::ModifierType)(p1)) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_accel_changed(p0, ((Gdk::ModifierType)(p1)) , p2); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->accel_changed) - (*base->accel_changed)(self, p0, p1, p2); - } + // Call the original underlying C function: + if(base && base->accel_changed) + (*base->accel_changed)(self, p0, p1, p2); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -308,7 +311,8 @@ GType AccelGroup::get_base_type() AccelGroup::AccelGroup() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(accelgroup_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/accelgroup.h b/libs/gtkmm2/gtk/gtkmm/accelgroup.h index 62190dae65..6ee3ab351d 100644 --- a/libs/gtkmm2/gtk/gtkmm/accelgroup.h +++ b/libs/gtkmm2/gtk/gtkmm/accelgroup.h @@ -209,9 +209,9 @@ public: //TODO: Discover real parameter names: -/** + /** * @par Prototype: - * bool %accel_activate(const Glib::RefPtr& object, guint param2, Gdk::ModifierType param3) + * bool on_my_%accel_activate(const Glib::RefPtr& object, guint param2, Gdk::ModifierType param3) */ Glib::SignalProxy3< bool,const Glib::RefPtr&,guint,Gdk::ModifierType > signal_accel_activate(); @@ -219,9 +219,9 @@ public: //TODO: The C type is unpleasant: //This has C docs, but it isn't worth mentioning them for such a useless signal. murrayc. -/** + /** * @par Prototype: - * void %accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure) + * void on_my_%accel_changed(guint keyval, Gdk::ModifierType modifier, GClosure* accel_closure) */ Glib::SignalProxy3< void,guint,Gdk::ModifierType,GClosure* > signal_accel_changed(); @@ -252,10 +252,13 @@ protected: namespace Glib { - /** @relates Gtk::AccelGroup - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::AccelGroup */ Glib::RefPtr wrap(GtkAccelGroup* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/accellabel.cc b/libs/gtkmm2/gtk/gtkmm/accellabel.cc index f884b7d606..c80da7e423 100644 --- a/libs/gtkmm2/gtk/gtkmm/accellabel.cc +++ b/libs/gtkmm2/gtk/gtkmm/accellabel.cc @@ -34,8 +34,9 @@ namespace Gtk AccelLabel::AccelLabel(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Label(Glib::ConstructParams(accellabel_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Label(Glib::ConstructParams(accellabel_class_.init())) { if(mnemonic) set_text_with_mnemonic(label); @@ -153,7 +154,8 @@ GType AccelLabel::get_base_type() AccelLabel::AccelLabel() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Label(Glib::ConstructParams(accellabel_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/accellabel.h b/libs/gtkmm2/gtk/gtkmm/accellabel.h index 2c057671fa..d2f0f1b1d2 100644 --- a/libs/gtkmm2/gtk/gtkmm/accellabel.h +++ b/libs/gtkmm2/gtk/gtkmm/accellabel.h @@ -182,10 +182,13 @@ public: namespace Glib { - /** @relates Gtk::AccelLabel - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::AccelLabel */ Gtk::AccelLabel* wrap(GtkAccelLabel* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/action.cc b/libs/gtkmm2/gtk/gtkmm/action.cc index 9ddf165d8e..7f05ab5ad1 100644 --- a/libs/gtkmm2/gtk/gtkmm/action.cc +++ b/libs/gtkmm2/gtk/gtkmm/action.cc @@ -26,6 +26,7 @@ #include +#include #include #include #include @@ -38,8 +39,9 @@ namespace Gtk Action::Action(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(action_class_.init(), "name",name.c_str(),"stock_id",stock_id.get_c_str(),"label",(label.empty() ? 0 : label.c_str()),"tooltip",(tooltip.empty() ? 0 : tooltip.c_str()), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(action_class_.init(), "name",name.c_str(),"stock_id",stock_id.get_c_str(),"label",(label.empty() ? 0 : label.c_str()),"tooltip",(tooltip.empty() ? 0 : tooltip.c_str()), static_cast(0))) {} Glib::RefPtr Action::create(const Glib::ustring& name, const Glib::ustring& label, const Glib::ustring& tooltip) @@ -139,7 +141,7 @@ void Action_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED GtkWidget* Action_Class::create_menu_item_vfunc_callback(GtkAction* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -147,39 +149,42 @@ GtkWidget* Action_Class::create_menu_item_vfunc_callback(GtkAction* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return (GtkWidget*)Glib::unwrap(obj->create_menu_item_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return (GtkWidget*)Glib::unwrap(obj->create_menu_item_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->create_menu_item) + return (*base->create_menu_item)(self); - // Call the original underlying C function: - if(base && base->create_menu_item) - return (*base->create_menu_item)(self); - } typedef GtkWidget* RType; return RType(); } GtkWidget* Action_Class::create_tool_item_vfunc_callback(GtkAction* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -187,39 +192,42 @@ GtkWidget* Action_Class::create_tool_item_vfunc_callback(GtkAction* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return (GtkWidget*)Glib::unwrap(obj->create_tool_item_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return (GtkWidget*)Glib::unwrap(obj->create_tool_item_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->create_tool_item) + return (*base->create_tool_item)(self); - // Call the original underlying C function: - if(base && base->create_tool_item) - return (*base->create_tool_item)(self); - } typedef GtkWidget* RType; return RType(); } void Action_Class::connect_proxy_vfunc_callback(GtkAction* self, GtkWidget* proxy) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -227,37 +235,41 @@ void Action_Class::connect_proxy_vfunc_callback(GtkAction* self, GtkWidget* prox // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->connect_proxy_vfunc(Glib::wrap(proxy) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->connect_proxy_vfunc(Glib::wrap(proxy) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->connect_proxy) + (*base->connect_proxy)(self, proxy); - // Call the original underlying C function: - if(base && base->connect_proxy) - (*base->connect_proxy)(self, proxy); - } } void Action_Class::disconnect_proxy_vfunc_callback(GtkAction* self, GtkWidget* proxy) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -265,40 +277,44 @@ void Action_Class::disconnect_proxy_vfunc_callback(GtkAction* self, GtkWidget* p // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->disconnect_proxy_vfunc(Glib::wrap(proxy) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->disconnect_proxy_vfunc(Glib::wrap(proxy) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->disconnect_proxy) + (*base->disconnect_proxy)(self, proxy); - // Call the original underlying C function: - if(base && base->disconnect_proxy) - (*base->disconnect_proxy)(self, proxy); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Action_Class::activate_callback(GtkAction* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -306,32 +322,35 @@ void Action_Class::activate_callback(GtkAction* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_activate(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_activate(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->activate) - (*base->activate)(self); - } + // Call the original underlying C function: + if(base && base->activate) + (*base->activate)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -379,7 +398,8 @@ GType Action::get_base_type() Action::Action() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(action_class_.init())) { } @@ -443,6 +463,11 @@ ToolItem* Action::create_tool_item() return Glib::wrap((GtkToolItem*)(gtk_action_create_tool_item(gobj()))); } +Menu* Action::create_menu() +{ + return Glib::wrap((GtkMenu*)(gtk_action_create_menu(gobj()))); +} + void Action::connect_proxy(Widget& proxy) { gtk_action_connect_proxy(gobj(), (proxy).gobj()); diff --git a/libs/gtkmm2/gtk/gtkmm/action.h b/libs/gtkmm2/gtk/gtkmm/action.h index f1ba555efa..185162821a 100644 --- a/libs/gtkmm2/gtk/gtkmm/action.h +++ b/libs/gtkmm2/gtk/gtkmm/action.h @@ -41,10 +41,41 @@ namespace Gtk namespace Gtk { +class Menu; class MenuItem; class ToolItem; class Image; +/** An action which can be triggered by a menu or toolbar item. + * + * Actions represent operations that the user can perform, along with + * some information about how it should be presented in the user interface. + * Each action provides methods to create icons, menu items and toolbar + * items representing itself. + * + * As well as the callback that is called when the action is activated, + * the following is also associated with the action: + * + * - a name (not translated, for path lookup) + * - a label (translated, for display) + * - an accelerator + * - whether the label indicates a stock id + * - a tooltip (optional, translated) + * - a toolbar label (optional, shorter than label) + * + * The action will also have some state information: + * + * - visible (shown/hidden) + * - sensitive (enabled/disabled) + * + * Apart from regular actions, there are toggle actions, + * which can be toggled between two states and radio actions, + * of which only one in a group can be in the "active" state. + * Other actions can be implemented as Gtk::Action subclasses. + * + * Each action can have one or more proxy menu item, toolbar button or other proxy widgets. + * Proxies mirror the state of the action (text label, tooltip, icon, visible, sensitive, etc), and should change when the action's state changes. When the proxy is activated, it should activate its action. + */ class Action : public Glib::Object { @@ -93,17 +124,20 @@ private: protected: Action(); - explicit Action(const Glib::ustring& name, const StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + explicit Action(const Glib::ustring& name, const StockID& stock_id = StockID(), const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); public: + //Note that gtk_action_new() does not allow name to be NULL, which suggests that we should not have a default constructor, + //but it's OK to set the name later: static Glib::RefPtr create(); - static Glib::RefPtr create(const Glib::ustring& name, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); - static Glib::RefPtr create(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + + static Glib::RefPtr create(const Glib::ustring& name, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + static Glib::RefPtr create(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); - /** Returns the name of the action. + /** Return value: the name of the action. The string belongs to GTK+ and should not * @return The name of the action. The string belongs to GTK+ and should not * be freed. * @@ -112,7 +146,7 @@ public: Glib::ustring get_name() const; - /** Returns whether the action is effectively sensitive. + /** Return value: true if the action and its associated action group * @return true if the action and its associated action group * are both sensitive. * @@ -120,9 +154,7 @@ public: */ bool is_sensitive() const; - /** Returns whether the action itself is sensitive. Note that this doesn't - * necessarily mean effective sensitivity. See is_sensitive() - * for that. + /** Return value: true if the action itself is sensitive. * @return true if the action itself is sensitive. * * @newin2p4. @@ -143,7 +175,7 @@ public: void set_sensitive(bool sensitive = true); - /** Returns whether the action is effectively visible. + /** Return value: true if the action and its associated action group * @return true if the action and its associated action group * are both visible. * @@ -151,9 +183,7 @@ public: */ bool is_visible() const; - /** Returns whether the action itself is visible. Note that this doesn't - * necessarily mean effective visibility. See is_sensitive() - * for that. + /** Return value: true if the action itself is visible. * @return true if the action itself is visible. * * @newin2p4. @@ -204,6 +234,15 @@ public: */ ToolItem* create_tool_item(); + /** If @a action provides a Gtk::Menu widget as a submenu for the menu + * item or the toolbar item it creates, this function returns an + * instance of that menu. + * @return The menu item provided by the action, or 0. + * + * @newin2p12. + */ + Menu* create_menu(); + /** Connects a widget to an action object as a proxy. Synchronises * various properties of the action with the widget (such as label * text, icon, tooltip, etc), and attaches a callback so that the @@ -226,17 +265,17 @@ public: void disconnect_proxy(Widget& proxy); - /** Returns the proxy widgets for an action. - * @return A G::SList of proxy widgets. The list is owned by the action and - * must not be modified. + /** Return value: a G::SList of proxy widgets. The list is owned by GTK+ + * @return A G::SList of proxy widgets. The list is owned by GTK+ + * and must not be modified. * * @newin2p4. */ Glib::SListHandle get_proxies(); - /** Returns the proxy widgets for an action. - * @return A G::SList of proxy widgets. The list is owned by the action and - * must not be modified. + /** Return value: a G::SList of proxy widgets. The list is owned by GTK+ + * @return A G::SList of proxy widgets. The list is owned by GTK+ + * and must not be modified. * * @newin2p4. */ @@ -263,11 +302,9 @@ public: void disconnect_accelerator(); - /** Returns the accel path for this action. - * - * @newin2p6 + /** Returns: the accel path for this action, or 0 * @return The accel path for this action, or 0 - * if none is set. The returned string is owned by GTK+ + * if none is set. The returned string is owned by GTK+ * and must not be freed or modified. */ Glib::ustring get_accel_path() const; @@ -276,11 +313,9 @@ public: typedef sigc::slot SlotActivate; /** The "activate" signal is emitted when the action is activated. - */ - -/** + * * @par Prototype: - * void %activate() + * void on_my_%activate() */ Glib::SignalProxy0< void > signal_activate(); @@ -587,10 +622,13 @@ protected: namespace Glib { - /** @relates Gtk::Action - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Action */ Glib::RefPtr wrap(GtkAction* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/actiongroup.cc b/libs/gtkmm2/gtk/gtkmm/actiongroup.cc index 9512eecac1..e6634b7b4c 100644 --- a/libs/gtkmm2/gtk/gtkmm/actiongroup.cc +++ b/libs/gtkmm2/gtk/gtkmm/actiongroup.cc @@ -355,8 +355,9 @@ GType ActionGroup::get_base_type() ActionGroup::ActionGroup(const Glib::ustring& name) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(actiongroup_class_.init(), "name", name.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(actiongroup_class_.init(), "name", name.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/actiongroup.h b/libs/gtkmm2/gtk/gtkmm/actiongroup.h index 4416d6102e..ea495de90a 100644 --- a/libs/gtkmm2/gtk/gtkmm/actiongroup.h +++ b/libs/gtkmm2/gtk/gtkmm/actiongroup.h @@ -103,10 +103,7 @@ public: Glib::ustring get_name() const; - /** Returns true if the group is sensitive. The constituent actions - * can only be logically sensitive (see is_sensitive()) if - * they are sensitive (see get_sensitive()) and their group - * is sensitive. + /** Return value: true if the group is sensitive. * @return true if the group is sensitive. * * @newin2p4. @@ -120,10 +117,7 @@ public: */ void set_sensitive(bool sensitive = true); - /** Returns true if the group is visible. The constituent actions - * can only be logically visible (see is_visible()) if - * they are visible (see get_visible()) and their group - * is visible. + /** Return value: true if the group is visible. * @return true if the group is visible. * * @newin2p4. @@ -222,11 +216,9 @@ public: * * @param action the action * @param proxy the proxy - */ - -/** + * * @par Prototype: - * void %connect_proxy(const Glib::RefPtr& action, Widget* proxy) + * void on_my_%connect_proxy(const Glib::RefPtr& action, Widget* proxy) */ Glib::SignalProxy2< void,const Glib::RefPtr&,Widget* > signal_connect_proxy(); @@ -241,11 +233,9 @@ public: * * @param action the action * @param proxy the proxy - */ - -/** + * * @par Prototype: - * void %disconnect_proxy(const Glib::RefPtr& action, Widget* proxy) + * void on_my_%disconnect_proxy(const Glib::RefPtr& action, Widget* proxy) */ Glib::SignalProxy2< void,const Glib::RefPtr&,Widget* > signal_disconnect_proxy(); @@ -258,11 +248,9 @@ public: * notification just before any action is activated. * * @action the action - */ - -/** + * * @par Prototype: - * void %pre_activate(const Glib::RefPtr& action) + * void on_my_%pre_activate(const Glib::RefPtr& action) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_pre_activate(); @@ -275,11 +263,9 @@ public: * notification just after any action is activated. * * @param action the action - */ - -/** + * * @par Prototype: - * void %post_activate(const Glib::RefPtr& action) + * void on_my_%post_activate(const Glib::RefPtr& action) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_post_activate(); @@ -309,10 +295,13 @@ protected: namespace Glib { - /** @relates Gtk::ActionGroup - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ActionGroup */ Glib::RefPtr wrap(GtkActionGroup* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/adjustment.cc b/libs/gtkmm2/gtk/gtkmm/adjustment.cc index 8be2188291..f250b22c3b 100644 --- a/libs/gtkmm2/gtk/gtkmm/adjustment.cc +++ b/libs/gtkmm2/gtk/gtkmm/adjustment.cc @@ -34,8 +34,9 @@ namespace Gtk //If we don't do this then the value is restricted to the initial values, ignoring the specified boundaries: Adjustment::Adjustment(double value, double lower, double upper, double step_increment, double page_increment, double page_size) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Object(Glib::ConstructParams(adjustment_class_.init(), "lower",lower,"upper",upper,"step_increment",step_increment,"page_increment",page_increment,"page_size",page_size,"value",value, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Object(Glib::ConstructParams(adjustment_class_.init(), "lower",lower,"upper",upper,"step_increment",step_increment,"page_increment",page_increment,"page_size",page_size,"value",value, static_cast(0))) { } @@ -151,7 +152,7 @@ void Adjustment_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Adjustment_Class::changed_callback(GtkAdjustment* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -159,36 +160,39 @@ void Adjustment_Class::changed_callback(GtkAdjustment* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self); } void Adjustment_Class::value_changed_callback(GtkAdjustment* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -196,32 +200,35 @@ void Adjustment_Class::value_changed_callback(GtkAdjustment* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_value_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_value_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->value_changed) - (*base->value_changed)(self); - } + // Call the original underlying C function: + if(base && base->value_changed) + (*base->value_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/adjustment.h b/libs/gtkmm2/gtk/gtkmm/adjustment.h index 6a5a347552..590bb809a6 100644 --- a/libs/gtkmm2/gtk/gtkmm/adjustment.h +++ b/libs/gtkmm2/gtk/gtkmm/adjustment.h @@ -216,17 +216,17 @@ public: void set_page_size(double size); -/** + /** * @par Prototype: - * void %changed() + * void on_my_%changed() */ Glib::SignalProxy0< void > signal_changed(); -/** + /** * @par Prototype: - * void %value_changed() + * void on_my_%value_changed() */ Glib::SignalProxy0< void > signal_value_changed(); @@ -239,10 +239,13 @@ public: namespace Glib { - /** @relates Gtk::Adjustment - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Adjustment */ Gtk::Adjustment* wrap(GtkAdjustment* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/alignment.cc b/libs/gtkmm2/gtk/gtkmm/alignment.cc index 59555cc32a..1c1aa3ec83 100644 --- a/libs/gtkmm2/gtk/gtkmm/alignment.cc +++ b/libs/gtkmm2/gtk/gtkmm/alignment.cc @@ -136,15 +136,17 @@ GType Alignment::get_base_type() Alignment::Alignment(float xalign, float yalign, float xscale, float yscale) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(alignment_class_.init(), "xalign", xalign, "yalign", yalign, "xscale", xscale, "yscale", yscale, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(alignment_class_.init(), "xalign", xalign, "yalign", yalign, "xscale", xscale, "yscale", yscale, static_cast(0))) { } Alignment::Alignment(AlignmentEnum xalign, AlignmentEnum yalign, float xscale, float yscale) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(alignment_class_.init(), "xalign", _gtkmm_align_float_from_enum(xalign), "yalign", _gtkmm_align_float_from_enum(yalign), "xscale", xscale, "yscale", yscale, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(alignment_class_.init(), "xalign", _gtkmm_align_float_from_enum(xalign), "yalign", _gtkmm_align_float_from_enum(yalign), "xscale", xscale, "yscale", yscale, static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/alignment.h b/libs/gtkmm2/gtk/gtkmm/alignment.h index 265d34709f..845847692c 100644 --- a/libs/gtkmm2/gtk/gtkmm/alignment.h +++ b/libs/gtkmm2/gtk/gtkmm/alignment.h @@ -346,10 +346,13 @@ public: namespace Glib { - /** @relates Gtk::Alignment - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Alignment */ Gtk::Alignment* wrap(GtkAlignment* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/arrow.cc b/libs/gtkmm2/gtk/gtkmm/arrow.cc index a4a4f5b24f..b31c497f6d 100644 --- a/libs/gtkmm2/gtk/gtkmm/arrow.cc +++ b/libs/gtkmm2/gtk/gtkmm/arrow.cc @@ -152,8 +152,9 @@ GType Arrow::get_base_type() Arrow::Arrow(ArrowType arrow_type, ShadowType shadow_type) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(arrow_class_.init(), "arrow_type", ((GtkArrowType)(arrow_type)), "shadow_type", ((GtkShadowType)(shadow_type)), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(arrow_class_.init(), "arrow_type", ((GtkArrowType)(arrow_type)), "shadow_type", ((GtkShadowType)(shadow_type)), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/arrow.h b/libs/gtkmm2/gtk/gtkmm/arrow.h index 8a6e3e15c1..22490041cc 100644 --- a/libs/gtkmm2/gtk/gtkmm/arrow.h +++ b/libs/gtkmm2/gtk/gtkmm/arrow.h @@ -181,10 +181,13 @@ public: namespace Glib { - /** @relates Gtk::Arrow - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Arrow */ Gtk::Arrow* wrap(GtkArrow* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/aspectframe.cc b/libs/gtkmm2/gtk/gtkmm/aspectframe.cc index 84d97d7df3..e5d33a3cf1 100644 --- a/libs/gtkmm2/gtk/gtkmm/aspectframe.cc +++ b/libs/gtkmm2/gtk/gtkmm/aspectframe.cc @@ -129,15 +129,17 @@ GType AspectFrame::get_base_type() AspectFrame::AspectFrame(const Glib::ustring& label, AlignmentEnum xalign, AlignmentEnum yalign, float ratio, bool obey_child) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Frame(Glib::ConstructParams(aspectframe_class_.init(), "label", label.c_str(), "xalign", _gtkmm_align_float_from_enum(xalign), "yalign", _gtkmm_align_float_from_enum(yalign), "ratio", ratio, "obey_child", static_cast(obey_child), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Frame(Glib::ConstructParams(aspectframe_class_.init(), "label", label.c_str(), "xalign", _gtkmm_align_float_from_enum(xalign), "yalign", _gtkmm_align_float_from_enum(yalign), "ratio", ratio, "obey_child", static_cast(obey_child), static_cast(0))) { } AspectFrame::AspectFrame(const Glib::ustring& label, float xalign, float yalign, float ratio, bool obey_child) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Frame(Glib::ConstructParams(aspectframe_class_.init(), "label", label.c_str(), "xalign", xalign, "yalign", yalign, "ratio", ratio, "obey_child", static_cast(obey_child), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Frame(Glib::ConstructParams(aspectframe_class_.init(), "label", label.c_str(), "xalign", xalign, "yalign", yalign, "ratio", ratio, "obey_child", static_cast(obey_child), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/aspectframe.h b/libs/gtkmm2/gtk/gtkmm/aspectframe.h index 3ec9dffed9..a96347f8da 100644 --- a/libs/gtkmm2/gtk/gtkmm/aspectframe.h +++ b/libs/gtkmm2/gtk/gtkmm/aspectframe.h @@ -154,6 +154,7 @@ public: */ void set(float xalign, float yalign, float ratio, bool obey_child = true); + /** Set the properties of this AspectFrame. * @param xalign Horizontal alignment of the child within the allocation of this * AspectFrame. For possible values, see Gtk::AlignmentEnum. @@ -254,10 +255,13 @@ public: namespace Glib { - /** @relates Gtk::AspectFrame - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::AspectFrame */ Gtk::AspectFrame* wrap(GtkAspectFrame* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/assistant.cc b/libs/gtkmm2/gtk/gtkmm/assistant.cc index c608e7a8c8..6a5b5d5a5c 100644 --- a/libs/gtkmm2/gtk/gtkmm/assistant.cc +++ b/libs/gtkmm2/gtk/gtkmm/assistant.cc @@ -202,7 +202,7 @@ void Assistant_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Assistant_Class::prepare_callback(GtkAssistant* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -210,37 +210,40 @@ void Assistant_Class::prepare_callback(GtkAssistant* self, GtkWidget* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_prepare(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_prepare(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->prepare) - (*base->prepare)(self, p0); - } + // Call the original underlying C function: + if(base && base->prepare) + (*base->prepare)(self, p0); } void Assistant_Class::apply_callback(GtkAssistant* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -248,36 +251,39 @@ void Assistant_Class::apply_callback(GtkAssistant* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_apply(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_apply(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->apply) - (*base->apply)(self); - } + // Call the original underlying C function: + if(base && base->apply) + (*base->apply)(self); } void Assistant_Class::close_callback(GtkAssistant* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -285,36 +291,39 @@ void Assistant_Class::close_callback(GtkAssistant* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_close(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_close(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->close) - (*base->close)(self); - } + // Call the original underlying C function: + if(base && base->close) + (*base->close)(self); } void Assistant_Class::cancel_callback(GtkAssistant* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -322,32 +331,35 @@ void Assistant_Class::cancel_callback(GtkAssistant* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_cancel(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_cancel(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->cancel) - (*base->cancel)(self); - } + // Call the original underlying C function: + if(base && base->cancel) + (*base->cancel)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -393,7 +405,8 @@ GType Assistant::get_base_type() Assistant::Assistant() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Window(Glib::ConstructParams(assistant_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/assistant.h b/libs/gtkmm2/gtk/gtkmm/assistant.h index f932943df4..4de9bd64c8 100644 --- a/libs/gtkmm2/gtk/gtkmm/assistant.h +++ b/libs/gtkmm2/gtk/gtkmm/assistant.h @@ -78,7 +78,11 @@ namespace Gtk { -/** TODO +/** A widget used to guide users through multi-step operations. + * + * A Gtk::Assistant is a widget used to represent a generally complex + * operation split into several steps, guiding the user through its + * pages and controlling the page flow to collect the necessary data. * * @newin2p10 * @ingroup Dialogs @@ -151,20 +155,73 @@ public: Assistant(); + /** Return value: The index (starting from 0) of the current page in + * @return The index (starting from 0) of the current page in + * the @a assistant , if the @a assistant has no pages, -1 will be returned + * + * @newin2p10. + */ int get_current_page() const; + /** Switches the page to @a page_num . Note that this will only be necessary + * in custom buttons, as the @a assistant flow can be set with + * set_forward_page_func(). + * + * @newin2p10 + * @param page_num Index of the page to switch to, starting from 0. + * If negative, the last page will be used. If greater + * than the number of pages in the @a assistant , nothing + * will be done. + */ void set_current_page(int page_num); + /** Return value: The number of pages in the @a assistant . + * @return The number of pages in the @a assistant . + * + * @newin2p10. + */ int get_n_pages() const; + /** Return value: The child widget, or 0 if @a page_num is out of bounds. + * @param page_num The index of a page in the @a assistant , or -1 to get the last page;. + * @return The child widget, or 0 if @a page_num is out of bounds. + * + * @newin2p10. + */ Widget* get_nth_page(int page_num); + /** Return value: The child widget, or 0 if @a page_num is out of bounds. + * @param page_num The index of a page in the @a assistant , or -1 to get the last page;. + * @return The child widget, or 0 if @a page_num is out of bounds. + * + * @newin2p10. + */ const Widget* get_nth_page(int page_num) const; + /** Prepends a page to the @a assistant . + * @param page A Gtk::Widget. + * @return The index (starting at 0) of the inserted page + * + * @newin2p10. + */ int prepend_page(Widget& page); + /** Appends a page to the @a assistant . + * @param page A Gtk::Widget. + * @return The index (starting at 0) of the inserted page + * + * @newin2p10. + */ int append_page(Widget& page); + /** Inserts a page in the @a assistant at a given position. + * @param page A Gtk::Widget. + * @param position The index (starting at 0) at which to insert the page, + * or -1 to append the page to the @a assistant . + * @return The index (starting from 0) of the inserted page + * + * @newin2p10. + */ int insert_page(Widget& page, int position); typedef sigc::slot SlotForwardPage; @@ -172,64 +229,167 @@ public: void set_forward_page_func(const SlotForwardPage& slot); + /** Sets the page type for @a page . The page type determines the page + * behavior in the @a assistant . + * + * @newin2p10 + * @param page A page of @a assistant . + * @param type The new type for @a page . + */ void set_page_type(const Widget& page, AssistantPageType type); + /** Gets the page type of @a page . + * @param page A page of @a assistant . + * @return The page type of @a page . + * + * @newin2p10. + */ AssistantPageType get_page_type(const Widget& page) const; + /** Sets a title for @a page . The title is displayed in the header + * area of the assistant when @a page is the current page. + * + * @newin2p10 + * @param page A page of @a assistant . + * @param title The new title for @a page . + */ void set_page_title(const Widget& page, const Glib::ustring& title); + /** Gets the title for @a page . + * @param page A page of @a assistant . + * @return The title for @a page . + * + * @newin2p10. + */ Glib::ustring get_page_title(const Widget& page) const; + /** Sets a header image for @a page . This image is displayed in the header + * area of the assistant when @a page is the current page. + * + * @newin2p10 + * @param page A page of @a assistant . + * @param pixbuf The new header image @a page . + */ void set_page_header_image(const Widget& page, const Glib::RefPtr& pixbuf); + /** Gets the header image for @a page . + * @param page A page of @a assistant . + * @return The header image for @a page , or 0 + * if there's no header image for the page. + * + * @newin2p10. + */ Glib::RefPtr get_page_header_image(const Widget& page); + /** Gets the header image for @a page . + * @param page A page of @a assistant . + * @return The header image for @a page , or 0 + * if there's no header image for the page. + * + * @newin2p10. + */ Glib::RefPtr get_page_header_image(const Widget& page) const; + /** Sets a header image for @a page . This image is displayed in the side + * area of the assistant when @a page is the current page. + * + * @newin2p10 + * @param page A page of @a assistant . + * @param pixbuf The new header image @a page . + */ void set_page_side_image(const Widget& page, const Glib::RefPtr& pixbuf); + /** Gets the header image for @a page . + * @param page A page of @a assistant . + * @return The side image for @a page , or 0 + * if there's no side image for the page. + * + * @newin2p10. + */ Glib::RefPtr get_page_side_image(const Widget& page); + /** Gets the header image for @a page . + * @param page A page of @a assistant . + * @return The side image for @a page , or 0 + * if there's no side image for the page. + * + * @newin2p10. + */ Glib::RefPtr get_page_side_image(const Widget& page) const; + /** Sets whether @a page contents are complete. This will make + * @a assistant update the buttons state to be able to continue the task. + * + * @newin2p10 + * @param page A page of @a assistant . + * @param complete The completeness status of the page. + */ void set_page_complete(const Widget& page, bool complete = true); + /** Gets whether @a page is complete.. + * @param page A page of @a assistant . + * @return true if @a page is complete. + * + * @newin2p10. + */ bool get_page_complete(const Widget& page) const; + /** Adds a widget to the action area of a Gtk::Assistant. + * + * @newin2p10 + * @param child A Gtk::Widget. + */ void add_action_widget(Widget& child); + /** Removes a widget from the action area of a Gtk::Assistant. + * + * @newin2p10 + * @param child A Gtk::Widget. + */ void remove_action_widget(Widget& child); + /** Forces @a assistant to recompute the buttons state. + * + * GTK+ automatically takes care of this in most situations, + * e.g. when the user goes to a different page, or when the + * visibility or completeness of a page changes. + * + * One situation where it can be necessary to call this + * function is when changing a value on the current page + * affects the future page flow of the assistant. + * + * @newin2p10 + */ void update_buttons_state(); -/** + /** * @par Prototype: - * void %prepare(Gtk::Widget* page) + * void on_my_%prepare(Gtk::Widget* page) */ Glib::SignalProxy1< void,Gtk::Widget* > signal_prepare(); -/** + /** * @par Prototype: - * void %apply() + * void on_my_%apply() */ Glib::SignalProxy0< void > signal_apply(); -/** + /** * @par Prototype: - * void %close() + * void on_my_%close() */ Glib::SignalProxy0< void > signal_close(); -/** + /** * @par Prototype: - * void %cancel() + * void on_my_%cancel() */ Glib::SignalProxy0< void > signal_cancel(); @@ -245,10 +405,13 @@ public: namespace Glib { - /** @relates Gtk::Assistant - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Assistant */ Gtk::Assistant* wrap(GtkAssistant* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/bin.cc b/libs/gtkmm2/gtk/gtkmm/bin.cc index e25a25c7fe..ea15dd2ffa 100644 --- a/libs/gtkmm2/gtk/gtkmm/bin.cc +++ b/libs/gtkmm2/gtk/gtkmm/bin.cc @@ -233,7 +233,8 @@ GType Bin::get_base_type() Bin::Bin() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(bin_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/bin.h b/libs/gtkmm2/gtk/gtkmm/bin.h index abeab46269..9bd24c9194 100644 --- a/libs/gtkmm2/gtk/gtkmm/bin.h +++ b/libs/gtkmm2/gtk/gtkmm/bin.h @@ -207,10 +207,13 @@ public: namespace Glib { - /** @relates Gtk::Bin - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Bin */ Gtk::Bin* wrap(GtkBin* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/box.cc b/libs/gtkmm2/gtk/gtkmm/box.cc index 2f6a0ba157..dc73a7ba3c 100644 --- a/libs/gtkmm2/gtk/gtkmm/box.cc +++ b/libs/gtkmm2/gtk/gtkmm/box.cc @@ -331,7 +331,8 @@ BoxList::reference BoxList::operator[](size_type l) const Box::Box() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(box_class_.init())) { } @@ -506,8 +507,9 @@ GType VBox::get_base_type() VBox::VBox(bool homogeneous, int spacing) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Box(Glib::ConstructParams(vbox_class_.init(), "homogeneous", static_cast(homogeneous), "spacing", spacing, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Box(Glib::ConstructParams(vbox_class_.init(), "homogeneous", static_cast(homogeneous), "spacing", spacing, static_cast(0))) { } @@ -617,8 +619,9 @@ GType HBox::get_base_type() HBox::HBox(bool homogeneous, int spacing) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Box(Glib::ConstructParams(hbox_class_.init(), "homogeneous", static_cast(homogeneous), "spacing", spacing, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Box(Glib::ConstructParams(hbox_class_.init(), "homogeneous", static_cast(homogeneous), "spacing", spacing, static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/box.h b/libs/gtkmm2/gtk/gtkmm/box.h index a3a0e69cdd..8eccb6b8e2 100644 --- a/libs/gtkmm2/gtk/gtkmm/box.h +++ b/libs/gtkmm2/gtk/gtkmm/box.h @@ -312,6 +312,20 @@ public: * The difference between spacing (set when the box is created) * and padding (set when elements are packed) is, that spacing is added between * objects, and padding is added on either side of an object. + * @param child The Gtk::Widget to be added to @a box . + * @param expand true if the new child is to be given extra space allocated to + * @a box . The extra space will be divided evenly between all children of + * @a box that use this option. + * @param fill true if space given to @a child by the @a expand option is + * actually allocated to @a child , rather than just padding it. This + * parameter has no effect if @a expand is set to false. A child is + * always allocated the full height of a Gtk::HBox and the full width + * of a Gtk::VBox. This option affects the other dimension. + * @param padding Extra space in pixels to put between this child and its + * neighbors, over and above the global amount specified by + * Gtk::Box:spacing property. If @a child is a widget at one of the + * reference ends of @a box , then @a padding pixels are also put between + * @a child and the reference edge of @a box . */ void pack_start(Widget& child, bool expand, bool fill, guint padding = 0); @@ -323,6 +337,24 @@ public: void pack_start(Widget& child, PackOptions options = PACK_EXPAND_WIDGET, guint padding = 0); + /** Adds @a child to @a box , packed with reference to the end of @a box . + * The @a child is packed after (away from end of) any other child + * packed with reference to the end of @a box . + * @param child The Gtk::Widget to be added to @a box . + * @param expand true if the new child is to be given extra space allocated + * to @a box . The extra space will be divided evenly between all children + * of @a box that use this option. + * @param fill true if space given to @a child by the @a expand option is + * actually allocated to @a child , rather than just padding it. This + * parameter has no effect if @a expand is set to false. A child is + * always allocated the full height of a Gtk::HBox and the full width + * of a Gtk::VBox. This option affects the other dimension. + * @param padding Extra space in pixels to put between this child and its + * neighbors, over and above the global amount specified by + * Gtk::Box:spacing property. If @a child is a widget at one of the + * reference ends of @a box , then @a padding pixels are also put between + * @a child and the reference edge of @a box . + */ void pack_end(Widget& child, bool expand, bool fill, guint padding = 0); /** Right side insert a widget to a box. @@ -333,15 +365,24 @@ public: void pack_end(Widget& child, PackOptions options = PACK_EXPAND_WIDGET, guint padding = 0); + /** Sets the Gtk::Box:homogeneous property of @a box , controlling + * whether or not all children of @a box are given equal space + * in the box. + * @param homogeneous A boolean value, true to create equal allotments, + * false for variable allotments. + */ void set_homogeneous(bool homogeneous = true); - /** Returns whether the box is homogeneous (all children are the - * same size). See set_homogeneous(). + /** Return value: true if the box is homogeneous. * @return true if the box is homogeneous. */ bool get_homogeneous() const; + /** Sets the Gtk::Box:spacing property of @a box , which is the + * number of pixels to place between children of @a box . + * @param spacing The number of pixels to put between children. + */ void set_spacing(int spacing); /** Gets the value set by set_spacing(). @@ -350,6 +391,21 @@ public: int get_spacing() const; + /** Moves @a child to a new @a position in the list of @a box children. + * The list is the <structfield>children</structfield> field of + * Gtk::Box-struct, and contains both widgets packed Gtk::PACK_START + * as well as widgets packed Gtk::PACK_END, in the order that these + * widgets were added to @a box . + * + * A widget's position in the @a box children list determines where + * the widget is packed into @a box . A child widget at some position + * in the list will be packed just after all other widgets of the + * same packing type that appear earlier in the list. + * @param child The Gtk::Widget to move. + * @param position The new position for @a child in the list of children + * of @a box , starting from 0. If negative, indicates the end of + * the list. + */ void reorder_child(Widget& child, int pos); /* Get the child widgets. @@ -586,10 +642,13 @@ public: namespace Glib { - /** @relates Gtk::Box - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Box */ Gtk::Box* wrap(GtkBox* object, bool take_copy = false); } //namespace Glib @@ -597,10 +656,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VBox */ Gtk::VBox* wrap(GtkVBox* object, bool take_copy = false); } //namespace Glib @@ -608,10 +670,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HBox */ Gtk::HBox* wrap(GtkHBox* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/builder.cc b/libs/gtkmm2/gtk/gtkmm/builder.cc new file mode 100644 index 0000000000..37e9338296 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/builder.cc @@ -0,0 +1,356 @@ +// Generated by gtkmmproc -- DO NOT MODIFY! + + +#include +#include + +// -*- c++ -*- +/* $Id: builder.ccg,v 1.11 2006/05/10 20:59:27 murrayc Exp $ */ + +/* Copyright 2007 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +// Allow GtkBuilder to instantiate a gtkmm derived GType instead of the regular +// GTK+ GType, so we can, for instance, use our vfuncs and default signal handlers. +static GType +get_type_from_name_vfunc_callback(GtkBuilder*, const char* type_name) +{ + if (!type_name) + return G_TYPE_INVALID; + + // See if there is a gtkmm version of the gclass: + Glib::ustring classname_prefixed ("gtkmm__"); // gtkmm uses a prefix + classname_prefixed += type_name; + + GType gtype = g_type_from_name(classname_prefixed.c_str()); + + if(gtype == G_TYPE_INVALID) // if it's not a registered typename + { + // There's no gtkmm derived type, so just use the normal one. + gtype = g_type_from_name(type_name); + } + + return gtype; +} + +namespace Gtk +{ + +//static +Glib::RefPtr Builder::create_from_file(const std::string& filename) +{ + Glib::RefPtr builder = Builder::create(); + if(builder->add_from_file(filename)) + return builder; + else + return Glib::RefPtr(); +} + +//static +Glib::RefPtr Builder::create_from_string(const Glib::ustring& buffer) +{ + Glib::RefPtr builder = Builder::create(); + if(builder->add_from_string(buffer)) + return builder; + else + return Glib::RefPtr(); +} + + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Builder::add_from_string(const Glib::ustring& buffer) +#else +bool Builder::add_from_string(const Glib::ustring& buffer, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = gtk_builder_add_from_string(gobj(), buffer.c_str(), -1 /* means null-terminated */, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; +} + +GtkWidget* Builder::get_cwidget(const Glib::ustring& name) +{ + GObject *cobject = gtk_builder_get_object (gobj(), name.c_str()); + if(!cobject) + { + g_critical("gtkmm: object `%s' not found in GtkBuilder file.", name.c_str()); + return 0; + } + + if (!GTK_IS_WIDGET (cobject)) + { + g_critical("gtkmm: object `%s' (type=`%s') (in GtkBuilder file) is not a widget type.", + name.c_str(), G_OBJECT_TYPE_NAME(cobject)); + /* TODO: Unref/sink it? */ + return 0; + } + + return GTK_WIDGET (cobject); +} + +Gtk::Widget* Builder::get_widget_checked(const Glib::ustring& name, GType type) +{ + // Get the widget from the GtkBuilder file. + GtkWidget *cobject = get_cwidget(name); + + // Check if it has the correct type. + if(!g_type_is_a(G_OBJECT_TYPE(cobject), type)) + { + g_critical("gtkmm: widget `%s' (in GtkBuilder file) is of type `%s' but `%s' was expected", + name.c_str(), G_OBJECT_TYPE_NAME(cobject), g_type_name(type)); + return 0; + } + + return Glib::wrap (GTK_WIDGET (cobject)); +} + + +} // namespace Gtk + + +namespace +{ +} // anonymous namespace + + +Gtk::BuilderError::BuilderError(Gtk::BuilderError::Code error_code, const Glib::ustring& error_message) +: + Glib::Error (GTK_BUILDER_ERROR, error_code, error_message) +{} + +Gtk::BuilderError::BuilderError(GError* gobject) +: + Glib::Error (gobject) +{} + +Gtk::BuilderError::Code Gtk::BuilderError::code() const +{ + return static_cast(Glib::Error::code()); +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +void Gtk::BuilderError::throw_func(GError* gobject) +{ + throw Gtk::BuilderError(gobject); +} +#else +//When not using exceptions, we just pass the Exception object around without throwing it: +std::auto_ptr Gtk::BuilderError::throw_func(GError* gobject) +{ + return std::auto_ptr(new Gtk::BuilderError(gobject)); +} +#endif //GLIBMM_EXCEPTIONS_ENABLED + +// static +GType Glib::Value::value_type() +{ + return gtk_builder_error_get_type(); +} + + +namespace Glib +{ + +Glib::RefPtr wrap(GtkBuilder* object, bool take_copy) +{ + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + //We use dynamic_cast<> in case of multiple inheritance. +} + +} /* namespace Glib */ + + +namespace Gtk +{ + + +/* The *_Class implementation: */ + +const Glib::Class& Builder_Class::init() +{ + if(!gtype_) // create the GType if necessary + { + // Glib::Class has to know the class init function to clone custom types. + class_init_func_ = &Builder_Class::class_init_function; + + // This is actually just optimized away, apparently with no harm. + // Make sure that the parent type has been created. + //CppClassParent::CppObjectType::get_type(); + + // Create the wrapper type, with the same class/instance size as the base type. + register_derived_type(gtk_builder_get_type()); + + // Add derived versions of interfaces, if the C type implements any interfaces: + } + + return *this; +} + +void Builder_Class::class_init_function(void* g_class, void* class_data) +{ + BaseClassType *const klass = static_cast(g_class); + CppClassParent::class_init_function(klass, class_data); + +#ifdef GLIBMM_VFUNCS_ENABLED + klass->get_type_from_name = &get_type_from_name_vfunc_callback; + #endif //GLIBMM_VFUNCS_ENABLED + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +} + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + +Glib::ObjectBase* Builder_Class::wrap_new(GObject* object) +{ + return new Builder((GtkBuilder*)object); +} + + +/* The implementation: */ + +GtkBuilder* Builder::gobj_copy() +{ + reference(); + return gobj(); +} + +Builder::Builder(const Glib::ConstructParams& construct_params) +: + Glib::Object(construct_params) +{} + +Builder::Builder(GtkBuilder* castitem) +: + Glib::Object((GObject*)(castitem)) +{} + +Builder::~Builder() +{} + + +Builder::CppClassType Builder::builder_class_; // initialize static member + +GType Builder::get_type() +{ + return builder_class_.init().get_type(); +} + +GType Builder::get_base_type() +{ + return gtk_builder_get_type(); +} + + +Builder::Builder() +: + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(builder_class_.init())) +{ + } + +Glib::RefPtr Builder::create() +{ + return Glib::RefPtr( new Builder() ); +} +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Builder::add_from_file(const std::string& filename) +#else +bool Builder::add_from_file(const std::string& filename, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = gtk_builder_add_from_file(gobj(), filename.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool Builder::add_from_string(const char* buffer, gsize length) +#else +bool Builder::add_from_string(const char* buffer, gsize length, std::auto_ptr& error) +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = gtk_builder_add_from_string(gobj(), buffer, length, &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +Glib::RefPtr Builder::get_object(const Glib::ustring& name) +{ + + Glib::RefPtr retvalue = Glib::wrap(gtk_builder_get_object(gobj(), name.c_str())); + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; + +} + +void Builder::set_translation_domain(const Glib::ustring& domain) +{ +gtk_builder_set_translation_domain(gobj(), domain.c_str()); +} + +Glib::ustring Builder::get_translation_domain() const +{ + return Glib::convert_const_gchar_ptr_to_ustring(gtk_builder_get_translation_domain(const_cast(gobj()))); +} + + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + +} // namespace Gtk + + diff --git a/libs/gtkmm2/gtk/gtkmm/builder.h b/libs/gtkmm2/gtk/gtkmm/builder.h new file mode 100644 index 0000000000..aac354ac99 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/builder.h @@ -0,0 +1,401 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_BUILDER_H +#define _GTKMM_BUILDER_H + + +#include + +/* $Id: builder.hg,v 1.19 2006/05/10 20:59:27 murrayc Exp $ */ + +/* Copyright (C) 2007 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +typedef struct _GtkBuilder GtkBuilder; +typedef struct _GtkBuilderClass GtkBuilderClass; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gtk +{ class Builder_Class; } // namespace Gtk +namespace Gtk +{ + +/** Exception class for Gdk::Builder errors. + */ +class BuilderError : public Glib::Error +{ +public: + enum Code + { + INVALID_TYPE_FUNCTION, + UNHANDLED_TAG, + MISSING_ATTRIBUTE, + INVALID_ATTRIBUTE, + INVALID_TAG, + MISSING_PROPERTY_VALUE, + INVALID_VALUE + }; + + BuilderError(Code error_code, const Glib::ustring& error_message); + explicit BuilderError(GError* gobject); + Code code() const; + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +private: + +#ifdef GLIBMM_EXCEPTIONS_ENABLED + static void throw_func(GError* gobject); +#else + //When not using exceptions, we just pass the Exception object around without throwing it: + static std::auto_ptr throw_func(GError* gobject); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + friend void wrap_init(); // uses throw_func() +#endif +}; + +} // namespace Gtk + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +namespace Glib +{ + +template <> +class Value : public Glib::Value_Enum +{ +public: + static GType value_type() G_GNUC_CONST; +}; + +} // namespace Glib +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gtk +{ + + +/** Build an interface from a UI definition description. + * + * This object represents an `instantiation' of an UI definition description. + * When one of these objects is created, the XML file is read, and the interface + * is created. The Gtk::Builder object then provides an interface for accessing the + * widgets in the interface by the names assigned to them inside the UI description. + * + * @newin2p12 + */ + +class Builder : public Glib::Object +{ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS + +public: + typedef Builder CppObjectType; + typedef Builder_Class CppClassType; + typedef GtkBuilder BaseObjectType; + typedef GtkBuilderClass BaseClassType; + +private: friend class Builder_Class; + static CppClassType builder_class_; + +private: + // noncopyable + Builder(const Builder&); + Builder& operator=(const Builder&); + +protected: + explicit Builder(const Glib::ConstructParams& construct_params); + explicit Builder(GtkBuilder* castitem); + +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +public: + virtual ~Builder(); + +#ifndef DOXYGEN_SHOULD_SKIP_THIS + static GType get_type() G_GNUC_CONST; + static GType get_base_type() G_GNUC_CONST; +#endif + + ///Provides access to the underlying C GObject. + GtkBuilder* gobj() { return reinterpret_cast(gobject_); } + + ///Provides access to the underlying C GObject. + const GtkBuilder* gobj() const { return reinterpret_cast(gobject_); } + + ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. + GtkBuilder* gobj_copy(); + +private: + + +protected: + Builder(); + + +public: + /** Creates a new builder object. + */ + + static Glib::RefPtr create(); + + + /** Parses a file containing a GtkBuilder UI definition. + * + * @param filename the name of the file to parse. + * @result A new Builder object, or a null pointer if an error occurred. + * @throws Glib::FileError, Glib::MarkupError + * + * @newin2p12 + **/ + static Glib::RefPtr create_from_file(const std::string& filename); + + + /** Parses a string containing a GtkBuilder UI definition. + * + * @buffer: the string to parse + * @result A new Builder object, or a null pointer if an error occurred. + * @throws Glib::MarkupError + * + * @newin2p12 + **/ + static Glib::RefPtr create_from_string(const Glib::ustring& buffer); + + + /** Parses a file containing a GtkBuilder + * UI definition and merges it with the current contents of @a builder . + * @param filename The name of the file to parse. + * @param error Return location for an error, or 0. + * @return A positive value on success, 0 if an error occurred + * + * @newin2p12. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool add_from_file(const std::string& filename); +#else + bool add_from_file(const std::string& filename, std::auto_ptr& error); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** Parses a string containing a GtkBuilder UI definition + * and merges it with the current contents of the builder. + * + * @buffer: the string to parse + * @result true on success or false if an error occurred. + * @throws Glib::MarkupError + * + * @newin2p12 + **/ + #ifdef GLIBMM_EXCEPTIONS_ENABLED + bool add_from_string(const Glib::ustring& buffer); + #else + bool add_from_string(const Glib::ustring& buffer, std::auto_ptr& error); + #endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** Parses a string containing a GtkBuilder + * UI definition and merges it with the current contents of @a builder . + * @param buffer The string to parse. + * @param length The length of @a buffer (may be -1 if @a buffer is nul-terminated). + * @param error Return location for an error, or 0. + * @return A positive value on success, 0 if an error occurred + * + * @newin2p12. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool add_from_string(const char* buffer, gsize length); +#else + bool add_from_string(const char* buffer, gsize length, std::auto_ptr& error); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + //TODO: Custom-implement this and prevent it from being used with GTK_WIDGET-derived types? + + /** Gets the object named @a name . Note that this function does not + * increment the reference count of the returned object. + * @param name Name of object to get. + * @return The object named @a name or 0 if it could not be + * found in the object tree. + * + * @newin2p12. + */ + Glib::RefPtr get_object(const Glib::ustring& name); + + /** Get a widget from the Builder file. + * For instance: + * @code + * Gtk::Table* pTable = 0; + * refXml->get_widget("mytable", pTable); + * @endcode + * This method prints a warning message to the console if the widget + * doesn't exist or has the wrong type, so you don't need to check that + * manually. + * + * Note that you are responsible for deleting top-level widgets (windows and + * dialogs) instantiated by the Builder object. Other widgets are instantiated as + * managed so they will be deleted automatically if you add them to a + * container widget. + * + * @param name The name of the widget. + * @retval widget A pointer to the widget, or 0 on failure. + */ + template inline + void get_widget(const Glib::ustring& name, T_Widget*& widget) + { + // Initialize output parameter: + widget = 0; + + // The dynamic_cast<> should never fail if get_widget_checked() succeeded. + widget = dynamic_cast(this->get_widget_checked(name, T_Widget::get_base_type())); + + if(!widget) + g_critical("Gtk::Builder::get_widget(): dynamic_cast<> failed."); + } + + /** This provides a pointer to a widget whose details are specified in the GtkBuilder file, but which is implemented + * by your own derived class. Your class must have a constructor like so: + * @code + * DerivedDialog::DerivedDialog(BaseObjectType* cobject, const Glib::RefPtr& refBuilder) + * : Gtk::Dialog(cobject) //Calls the base class constructor + * @endcode + * + * For instance: + * @code + * Gtk::DerivedBox* pBox = 0; + * refXml->get_widget_derived("mybox", pBox); + * @endcode + * + * @param name The name of the widget. + * @retval widget A pointer to the widget, or 0 on failure. + */ + template inline + void get_widget_derived(const Glib::ustring& name, T_Widget*& widget) + { + // Initialize output parameter: + widget = 0; + + // Get the widget from the glade file. + typedef typename T_Widget::BaseObjectType cwidget_type; + cwidget_type* pCWidget = (cwidget_type*)get_cwidget(name); + + //The error was already reported by get_cwidget(). + if(!pCWidget) + return; + + //Check whether there is already a C++ wrapper instance associated with this C instance: + Glib::ObjectBase* pObjectBase = ObjectBase::_get_current_wrapper((GObject*)pCWidget); + + //If there is already a C++ instance, then return it again: + if(pObjectBase) + { + widget = dynamic_cast( Glib::wrap((GtkWidget*)pCWidget) ); + //Newer, more spec-complaint, versions of g++ cannot resolve a specific wrap() function in a template. + + //The dynamic cast checks that it is of the correct type. + //Somebody might be trying to call get_widget_derived() after already calling get_widget(), + //or after already calling get_widget_derived() with a different derived C++ type. + if(!widget) + g_critical("Gtk::Builder::get_widget_derived(): dynamic_cast<> failed. An existing C++ instance, of a different type, seems to exist."); + } + else + { + //Create a new C++ instance to wrap the existing C instance: + + //Set the output variable. We needed to do this because we can not template the return type. + Glib::RefPtr refThis(this); + refThis->reference(); //take a copy. + widget = new T_Widget(pCWidget, refThis); + } + } + + + //TODO:_WRAP_METHOD(GSList* get_objects(), gtk_builder_get_objects) + //_WRAP_METHOD(void connect_signals(gpointer user_data), gtk_builder_connect_signals) + //_WRAP_METHOD(void connect_signals_full(GtkBuilderConnectFunc func, gpointer user_data), gtk_builder_connect_signals_full) + + /** Sets the translation domain of @a builder . + * See Gtk::Builder:translation-domain. + * + * @newin2p12 + * @param domain The translation domain or 0. + */ + void set_translation_domain(const Glib::ustring& domain); + + /** Gets the translation domain of @a builder . + * @return The translation domain. This string is owned + * by the builder object and must not be modified or freed. + * + * @newin2p12. + */ + Glib::ustring get_translation_domain() const; + + //We ignore gtk_builder_get_type_from_name() because it only seems useful when implementing GtkBuildable for widgets. + + +protected: + Gtk::Widget* get_widget_checked(const Glib::ustring& name, GType type); + GtkWidget* get_cwidget(const Glib::ustring& name); + + + // TODO: Make sure this is actually invoked even with disabled vfuncs so + // that glade creates gtkmm's GObjects. + + +public: + +public: + //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +protected: + //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + //Default Signal Handlers:: +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + +}; + +} // namespace Gtk + + +namespace Glib +{ + /** A Glib::wrap() method for this object. + * + * @param object The C instance. + * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. + * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Builder + */ + Glib::RefPtr wrap(GtkBuilder* object, bool take_copy = false); +} + + +#endif /* _GTKMM_BUILDER_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/button.cc b/libs/gtkmm2/gtk/gtkmm/button.cc index 4c4bbd8230..7de6c51f6f 100644 --- a/libs/gtkmm2/gtk/gtkmm/button.cc +++ b/libs/gtkmm2/gtk/gtkmm/button.cc @@ -37,14 +37,16 @@ namespace Gtk Button::Button(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(button_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(button_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) {} Button::Button(const StockID& stock_id) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(button_class_.init(), "use_stock",1,"label",stock_id.get_c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(button_class_.init(), "use_stock",1,"label",stock_id.get_c_str(), static_cast(0))) {} } // namespace Gtk @@ -165,7 +167,7 @@ void Button_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Button_Class::pressed_callback(GtkButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -173,36 +175,39 @@ void Button_Class::pressed_callback(GtkButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_pressed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_pressed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->pressed) - (*base->pressed)(self); - } + // Call the original underlying C function: + if(base && base->pressed) + (*base->pressed)(self); } void Button_Class::released_callback(GtkButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -210,36 +215,39 @@ void Button_Class::released_callback(GtkButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_released(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_released(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->released) - (*base->released)(self); - } + // Call the original underlying C function: + if(base && base->released) + (*base->released)(self); } void Button_Class::clicked_callback(GtkButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -247,36 +255,39 @@ void Button_Class::clicked_callback(GtkButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_clicked(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_clicked(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->clicked) - (*base->clicked)(self); - } + // Call the original underlying C function: + if(base && base->clicked) + (*base->clicked)(self); } void Button_Class::enter_callback(GtkButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -284,36 +295,39 @@ void Button_Class::enter_callback(GtkButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_enter(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_enter(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->enter) - (*base->enter)(self); - } + // Call the original underlying C function: + if(base && base->enter) + (*base->enter)(self); } void Button_Class::leave_callback(GtkButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -321,36 +335,39 @@ void Button_Class::leave_callback(GtkButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_leave(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_leave(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->leave) - (*base->leave)(self); - } + // Call the original underlying C function: + if(base && base->leave) + (*base->leave)(self); } void Button_Class::activate_callback(GtkButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -358,32 +375,35 @@ void Button_Class::activate_callback(GtkButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_activate(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_activate(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->activate) - (*base->activate)(self); - } + // Call the original underlying C function: + if(base && base->activate) + (*base->activate)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -429,7 +449,8 @@ GType Button::get_base_type() Button::Button() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(button_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/button.h b/libs/gtkmm2/gtk/gtkmm/button.h index 990ede4163..246718baeb 100644 --- a/libs/gtkmm2/gtk/gtkmm/button.h +++ b/libs/gtkmm2/gtk/gtkmm/button.h @@ -186,20 +186,19 @@ public: */ void set_use_underline(bool use_underline = true); - /** Returns whether an embedded underline in the button label indicates a - * mnemonic. See set_use_underline(). + /** Return value: true if an embedded underline in the button label * @return true if an embedded underline in the button label * indicates the mnemonic accelerator keys. */ bool get_use_underline() const; - /** If true, the label set on the button is used as a + /** If true, the label set on the button is used as a * stock id to select the stock item for the button. * @param use_stock true if the button should use a stock item. */ void set_use_stock(bool use_stock = true); - /** Returns whether the button label is a stock item. + /** Return value: true if the button label is used to * @return true if the button label is used to * select a stock item instead of being * used directly as the label text. @@ -217,8 +216,7 @@ public: */ void set_focus_on_click(bool focus_on_click = true); - /** Returns whether the button grabs focus when it is clicked with the mouse. - * See set_focus_on_click(). + /** Return value: true if the button grabs focus when it is clicked with * @return true if the button grabs focus when it is clicked with * the mouse. * @@ -248,7 +246,7 @@ public: /** Set the image of @a button to the given widget. Note that - * it depends on the gtk-button-images setting whether the + * it depends on the Gtk::Settings:gtk-button-images setting whether the * image will be displayed or not, you don't have to call * Gtk::Widget::show() on @a image yourself. * @@ -274,54 +272,66 @@ public: const Widget* get_image() const; + /** Sets the position of the image relative to the text + * inside the button. + * + * @newin2p10 + * @param position The position. + */ void set_image_position(PositionType position); + /** Gets the position of the image relative to the text + * inside the button. + * @return The position + * + * @newin2p10. + */ PositionType get_image_position() const; -/** + /** * @par Prototype: - * void %pressed() + * void on_my_%pressed() */ Glib::SignalProxy0< void > signal_pressed(); -/** + /** * @par Prototype: - * void %released() + * void on_my_%released() */ Glib::SignalProxy0< void > signal_released(); -/** + /** * @par Prototype: - * void %clicked() + * void on_my_%clicked() */ Glib::SignalProxy0< void > signal_clicked(); -/** + /** * @par Prototype: - * void %enter() + * void on_my_%enter() */ Glib::SignalProxy0< void > signal_enter(); -/** + /** * @par Prototype: - * void %leave() + * void on_my_%leave() */ Glib::SignalProxy0< void > signal_leave(); -/** + /** * @par Prototype: - * void %activate() + * void on_my_%activate() */ Glib::SignalProxy0< void > signal_activate(); @@ -521,10 +531,13 @@ public: namespace Glib { - /** @relates Gtk::Button - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Button */ Gtk::Button* wrap(GtkButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/buttonbox.cc b/libs/gtkmm2/gtk/gtkmm/buttonbox.cc index 72f0ad3f73..0c5a2e1f65 100644 --- a/libs/gtkmm2/gtk/gtkmm/buttonbox.cc +++ b/libs/gtkmm2/gtk/gtkmm/buttonbox.cc @@ -34,8 +34,9 @@ namespace Gtk VButtonBox::VButtonBox(ButtonBoxStyle layout, int spacing) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - ButtonBox(Glib::ConstructParams(vbuttonbox_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + ButtonBox(Glib::ConstructParams(vbuttonbox_class_.init())) { set_layout(layout); set_spacing(spacing); @@ -43,8 +44,9 @@ VButtonBox::VButtonBox(ButtonBoxStyle layout, int spacing) HButtonBox::HButtonBox(ButtonBoxStyle layout, int spacing) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - ButtonBox(Glib::ConstructParams(hbuttonbox_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + ButtonBox(Glib::ConstructParams(hbuttonbox_class_.init())) { set_layout(layout); set_spacing(spacing); diff --git a/libs/gtkmm2/gtk/gtkmm/buttonbox.h b/libs/gtkmm2/gtk/gtkmm/buttonbox.h index 7d0665f92b..9382184e49 100644 --- a/libs/gtkmm2/gtk/gtkmm/buttonbox.h +++ b/libs/gtkmm2/gtk/gtkmm/buttonbox.h @@ -153,7 +153,7 @@ public: */ void set_child_secondary(Widget& child, bool is_secondary = true); - /** Returns whether @a child should appear in a secondary group of children. + /** Return value: whether @a child should appear in a secondary group of children. * @param child A child of @a widget . * @return Whether @a child should appear in a secondary group of children. * @@ -355,10 +355,13 @@ public: namespace Glib { - /** @relates Gtk::ButtonBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ButtonBox */ Gtk::ButtonBox* wrap(GtkButtonBox* object, bool take_copy = false); } //namespace Glib @@ -366,10 +369,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VButtonBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VButtonBox */ Gtk::VButtonBox* wrap(GtkVButtonBox* object, bool take_copy = false); } //namespace Glib @@ -377,10 +383,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HButtonBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HButtonBox */ Gtk::HButtonBox* wrap(GtkHButtonBox* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/calendar.cc b/libs/gtkmm2/gtk/gtkmm/calendar.cc index 819d4229b9..c2ce8de687 100644 --- a/libs/gtkmm2/gtk/gtkmm/calendar.cc +++ b/libs/gtkmm2/gtk/gtkmm/calendar.cc @@ -32,8 +32,21 @@ namespace Gtk { +void Calendar::get_date(Glib::Date& date) const +{ + guint year = 0; + guint month = 0; + guint day = 0; + + get_date(year, month, day); + + date.set_year(year); + date.set_month(static_cast(Glib::Date::JANUARY + month)); // Month from 1 to 12 instead from 0 to 11 + date.set_day(day); } +} //namespace Gtk + namespace { @@ -165,7 +178,7 @@ void Calendar_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Calendar_Class::month_changed_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -173,36 +186,39 @@ void Calendar_Class::month_changed_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_month_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_month_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->month_changed) - (*base->month_changed)(self); - } + // Call the original underlying C function: + if(base && base->month_changed) + (*base->month_changed)(self); } void Calendar_Class::day_selected_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -210,36 +226,39 @@ void Calendar_Class::day_selected_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_day_selected(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_day_selected(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->day_selected) - (*base->day_selected)(self); - } + // Call the original underlying C function: + if(base && base->day_selected) + (*base->day_selected)(self); } void Calendar_Class::day_selected_double_click_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -247,36 +266,39 @@ void Calendar_Class::day_selected_double_click_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_day_selected_double_click(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_day_selected_double_click(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->day_selected_double_click) - (*base->day_selected_double_click)(self); - } + // Call the original underlying C function: + if(base && base->day_selected_double_click) + (*base->day_selected_double_click)(self); } void Calendar_Class::prev_month_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -284,36 +306,39 @@ void Calendar_Class::prev_month_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_prev_month(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_prev_month(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->prev_month) - (*base->prev_month)(self); - } + // Call the original underlying C function: + if(base && base->prev_month) + (*base->prev_month)(self); } void Calendar_Class::next_month_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -321,36 +346,39 @@ void Calendar_Class::next_month_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_next_month(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_next_month(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->next_month) - (*base->next_month)(self); - } + // Call the original underlying C function: + if(base && base->next_month) + (*base->next_month)(self); } void Calendar_Class::prev_year_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -358,36 +386,39 @@ void Calendar_Class::prev_year_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_prev_year(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_prev_year(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->prev_year) - (*base->prev_year)(self); - } + // Call the original underlying C function: + if(base && base->prev_year) + (*base->prev_year)(self); } void Calendar_Class::next_year_callback(GtkCalendar* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -395,32 +426,35 @@ void Calendar_Class::next_year_callback(GtkCalendar* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_next_year(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_next_year(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->next_year) - (*base->next_year)(self); - } + // Call the original underlying C function: + if(base && base->next_year) + (*base->next_year)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -466,7 +500,8 @@ GType Calendar::get_base_type() Calendar::Calendar() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(calendar_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/calendar.h b/libs/gtkmm2/gtk/gtkmm/calendar.h index 915ba1af21..4e5c466d4b 100644 --- a/libs/gtkmm2/gtk/gtkmm/calendar.h +++ b/libs/gtkmm2/gtk/gtkmm/calendar.h @@ -28,6 +28,7 @@ */ #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -236,7 +237,7 @@ public: /** Sets display options (whether to display the heading and the month headings). * - * Deprecated: Use set_display_options() instead + * Deprecated: 2.4: Use set_display_options() instead * @param flags The display options to set. */ void display_options(CalendarDisplayOptions flags); @@ -251,7 +252,7 @@ public: */ void set_display_options(CalendarDisplayOptions flags); - /** Returns the current display options of @a calendar . + /** Return value: the display options. * @return The display options. * * @newin2p4. @@ -265,69 +266,80 @@ public: * @param day Location to store the day number (between 1 and 31), or 0. */ void get_date(guint& year, guint& month, guint& day) const; + // Additional method not in GTK (#350584) + /** Get the date as Glib::Date + * + * @param date Referenz to set the date + */ + void get_date(Glib::Date& date) const; + /** Does nothing. Previously locked the display of the calendar until * it was thawed with thaw(). + * + * Deprecated: 2.8: */ void freeze(); /** Does nothing. Previously defrosted a calendar; all the changes made * since the last freeze() were displayed. + * + * Deprecated: 2.8: */ void thaw(); -/** + /** * @par Prototype: - * void %month_changed() + * void on_my_%month_changed() */ Glib::SignalProxy0< void > signal_month_changed(); -/** + /** * @par Prototype: - * void %day_selected() + * void on_my_%day_selected() */ Glib::SignalProxy0< void > signal_day_selected(); -/** + /** * @par Prototype: - * void %day_selected_double_click() + * void on_my_%day_selected_double_click() */ Glib::SignalProxy0< void > signal_day_selected_double_click(); -/** + /** * @par Prototype: - * void %prev_month() + * void on_my_%prev_month() */ Glib::SignalProxy0< void > signal_prev_month(); -/** + /** * @par Prototype: - * void %next_month() + * void on_my_%next_month() */ Glib::SignalProxy0< void > signal_next_month(); -/** + /** * @par Prototype: - * void %prev_year() + * void on_my_%prev_year() */ Glib::SignalProxy0< void > signal_prev_year(); -/** + /** * @par Prototype: - * void %next_year() + * void on_my_%next_year() */ Glib::SignalProxy0< void > signal_next_year(); @@ -340,10 +352,13 @@ public: namespace Glib { - /** @relates Gtk::Calendar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Calendar */ Gtk::Calendar* wrap(GtkCalendar* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/celleditable.cc b/libs/gtkmm2/gtk/gtkmm/celleditable.cc index a2013f9d5e..53908b7377 100644 --- a/libs/gtkmm2/gtk/gtkmm/celleditable.cc +++ b/libs/gtkmm2/gtk/gtkmm/celleditable.cc @@ -55,7 +55,7 @@ namespace Glib Glib::RefPtr wrap(GtkCellEditable* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -104,7 +104,7 @@ void CellEditable_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED void CellEditable_Class::start_editing_vfunc_callback(GtkCellEditable* self, GdkEvent* event) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -112,40 +112,44 @@ void CellEditable_Class::start_editing_vfunc_callback(GtkCellEditable* self, Gdk // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->start_editing_vfunc(event); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->start_editing_vfunc(event); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->start_editing) + (*base->start_editing)(self, event); - // Call the original underlying C function: - if(base && base->start_editing) - (*base->start_editing)(self, event); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void CellEditable_Class::editing_done_callback(GtkCellEditable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -153,37 +157,40 @@ void CellEditable_Class::editing_done_callback(GtkCellEditable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_editing_done(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_editing_done(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->editing_done) - (*base->editing_done)(self); - } + // Call the original underlying C function: + if(base && base->editing_done) + (*base->editing_done)(self); } void CellEditable_Class::remove_widget_callback(GtkCellEditable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -191,33 +198,36 @@ void CellEditable_Class::remove_widget_callback(GtkCellEditable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_remove_widget(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_remove_widget(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->remove_widget) - (*base->remove_widget)(self); - } + // Call the original underlying C function: + if(base && base->remove_widget) + (*base->remove_widget)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/celleditable.h b/libs/gtkmm2/gtk/gtkmm/celleditable.h index 065f9101da..52425c2324 100644 --- a/libs/gtkmm2/gtk/gtkmm/celleditable.h +++ b/libs/gtkmm2/gtk/gtkmm/celleditable.h @@ -73,8 +73,14 @@ private: protected: CellEditable(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit CellEditable(GtkCellEditable* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -98,35 +104,33 @@ private: public: - /** Begins editing on a @a cell_editable . @a event is the Gdk::Event that began the - * editing process. It may be 0, in the instance that editing was initiated - * through programatic means. + /** Begins editing on a @a cell_editable . @a event is the Gdk::Event that began + * the editing process. It may be 0, in the instance that editing was + * initiated through programatic means. * @param event A Gdk::Event, or 0. */ void start_editing(GdkEvent* event); - /** Emits the "editing_done" signal. This signal is a sign for the cell renderer - * to update its value from the cell. + /** Emits the Gtk::CellEditable::editing-done signal. */ void editing_done(); - /** Emits the "remove_widget" signal. This signal is meant to indicate that the - * cell is finished editing, and the widget may now be destroyed. + /** Emits the Gtk::CellEditable::remove-widget signal. */ void remove_widget(); -/** + /** * @par Prototype: - * void %editing_done() + * void on_my_%editing_done() */ Glib::SignalProxy0< void > signal_editing_done(); -/** + /** * @par Prototype: - * void %remove_widget() + * void on_my_%remove_widget() */ Glib::SignalProxy0< void > signal_remove_widget(); @@ -164,10 +168,13 @@ protected: namespace Glib { - /** @relates Gtk::CellEditable - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellEditable */ Glib::RefPtr wrap(GtkCellEditable* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/celllayout.cc b/libs/gtkmm2/gtk/gtkmm/celllayout.cc index 15f10eb85a..5e6635be57 100644 --- a/libs/gtkmm2/gtk/gtkmm/celllayout.cc +++ b/libs/gtkmm2/gtk/gtkmm/celllayout.cc @@ -95,7 +95,7 @@ namespace Glib Glib::RefPtr wrap(GtkCellLayout* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -147,7 +147,7 @@ void CellLayout_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED void CellLayout_Class::pack_start_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gboolean expand) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -155,39 +155,43 @@ void CellLayout_Class::pack_start_vfunc_callback(GtkCellLayout* self, GtkCellRen // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->pack_start_vfunc(Glib::wrap(cell) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->pack_start_vfunc(Glib::wrap(cell) , expand ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->pack_start) + (*base->pack_start)(self, cell, expand); - // Call the original underlying C function: - if(base && base->pack_start) - (*base->pack_start)(self, cell, expand); - } } void CellLayout_Class::pack_end_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gboolean expand) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -195,39 +199,43 @@ void CellLayout_Class::pack_end_vfunc_callback(GtkCellLayout* self, GtkCellRende // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->pack_end_vfunc(Glib::wrap(cell) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->pack_end_vfunc(Glib::wrap(cell) , expand ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->pack_end) + (*base->pack_end)(self, cell, expand); - // Call the original underlying C function: - if(base && base->pack_end) - (*base->pack_end)(self, cell, expand); - } } void CellLayout_Class::clear_vfunc_callback(GtkCellLayout* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -235,37 +243,41 @@ void CellLayout_Class::clear_vfunc_callback(GtkCellLayout* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->clear_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->clear_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->clear) + (*base->clear)(self); - // Call the original underlying C function: - if(base && base->clear) - (*base->clear)(self); - } } void CellLayout_Class::add_attribute_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, const gchar* attribute, gint column) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -273,40 +285,44 @@ void CellLayout_Class::add_attribute_vfunc_callback(GtkCellLayout* self, GtkCell // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->add_attribute_vfunc(Glib::wrap(cell) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->add_attribute_vfunc(Glib::wrap(cell) , Glib::convert_const_gchar_ptr_to_ustring(attribute) , column ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_attribute) + (*base->add_attribute)(self, cell, attribute, column); - // Call the original underlying C function: - if(base && base->add_attribute) - (*base->add_attribute)(self, cell, attribute, column); - } } void CellLayout_Class::clear_attributes_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -314,38 +330,42 @@ void CellLayout_Class::clear_attributes_vfunc_callback(GtkCellLayout* self, GtkC // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->clear_attributes_vfunc(Glib::wrap(cell) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->clear_attributes_vfunc(Glib::wrap(cell) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->clear_attributes) + (*base->clear_attributes)(self, cell); - // Call the original underlying C function: - if(base && base->clear_attributes) - (*base->clear_attributes)(self, cell); - } } void CellLayout_Class::reorder_vfunc_callback(GtkCellLayout* self, GtkCellRenderer* cell, gint position) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -353,35 +373,39 @@ void CellLayout_Class::reorder_vfunc_callback(GtkCellLayout* self, GtkCellRender // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->reorder_vfunc(Glib::wrap(cell) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->reorder_vfunc(Glib::wrap(cell) , position ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->reorder) + (*base->reorder)(self, cell, position); - // Call the original underlying C function: - if(base && base->reorder) - (*base->reorder)(self, cell, position); - } } #endif //GLIBMM_VFUNCS_ENABLED @@ -439,6 +463,16 @@ void CellLayout::pack_end(CellRenderer& cell, bool expand) gtk_cell_layout_pack_end(gobj(), (cell).gobj(), static_cast(expand)); } +Glib::ListHandle CellLayout::get_cells() +{ + return Glib::ListHandle(gtk_cell_layout_get_cells(gobj()), Glib::OWNERSHIP_SHALLOW); +} + +Glib::ListHandle CellLayout::get_cells() const +{ + return Glib::ListHandle(gtk_cell_layout_get_cells(const_cast(gobj())), Glib::OWNERSHIP_SHALLOW); +} + void CellLayout::clear() { gtk_cell_layout_clear(gobj()); diff --git a/libs/gtkmm2/gtk/gtkmm/celllayout.h b/libs/gtkmm2/gtk/gtkmm/celllayout.h index 7a2484621f..f0be6772f9 100644 --- a/libs/gtkmm2/gtk/gtkmm/celllayout.h +++ b/libs/gtkmm2/gtk/gtkmm/celllayout.h @@ -76,8 +76,14 @@ private: protected: CellLayout(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit CellLayout(GtkCellLayout* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -128,6 +134,22 @@ public: * @param expand true if @a cell is to be given extra space allocated to @a cell_layout . */ void pack_end(CellRenderer& cell, bool expand = true); + + + /** Return value: a list of cell renderers. + * @return A list of cell renderers. + * + * @newin2p12. + */ + Glib::ListHandle get_cells(); + + /** Return value: a list of cell renderers. + * @return A list of cell renderers. + * + * @newin2p12. + */ + Glib::ListHandle get_cells() const; + /** Unsets all the mappings on all renderers on @a cell_layout and * removes all renderers from @a cell_layout . @@ -199,7 +221,7 @@ protected: virtual void add_attribute_vfunc(CellRenderer* cell, const Glib::ustring& attribute, int column); #endif //GLIBMM_VFUNCS_ENABLED -//TODO: _WRAP_VFUNC(void set_cell_data_func(CellRenderer* cell, GtkCellLayoutDataFunc func, gpointer func_data, GDestroyNotify destroy), set_cell_data_func) +//TODO (added in GTK+ 2.4): _WRAP_VFUNC(void set_cell_data_func(CellRenderer* cell, GtkCellLayoutDataFunc func, gpointer func_data, GDestroyNotify destroy), gtk_cell_layout_set_cell_data_func) #ifdef GLIBMM_VFUNCS_ENABLED virtual void clear_attributes_vfunc(CellRenderer* cell); #endif //GLIBMM_VFUNCS_ENABLED @@ -250,10 +272,13 @@ void CellLayout::pack_start(const TreeModelColumn& column, bo namespace Glib { - /** @relates Gtk::CellLayout - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellLayout */ Glib::RefPtr wrap(GtkCellLayout* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc index 8ce803d02e..534ad5f98c 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer.cc @@ -169,7 +169,7 @@ void CellRenderer_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void CellRenderer_Class::get_size_vfunc_callback(GtkCellRenderer* self, GtkWidget* widget, GdkRectangle* cell_area, gint* x_offset, gint* y_offset, gint* width, gint* height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -177,42 +177,46 @@ void CellRenderer_Class::get_size_vfunc_callback(GtkCellRenderer* self, GtkWidge // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_size_vfunc(*Glib::wrap(widget) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_size_vfunc(*Glib::wrap(widget) , &Glib::wrap(cell_area) , x_offset , y_offset , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_size) + (*base->get_size)(self, widget, cell_area, x_offset, y_offset, width, height); - // Call the original underlying C function: - if(base && base->get_size) - (*base->get_size)(self, widget, cell_area, x_offset, y_offset, width, height); - } } void CellRenderer_Class::render_vfunc_callback(GtkCellRenderer* self, GdkDrawable* window, GtkWidget* widget, GdkRectangle* background_area, GdkRectangle* cell_area, GdkRectangle* expose_area, GtkCellRendererState flags) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -220,42 +224,46 @@ void CellRenderer_Class::render_vfunc_callback(GtkCellRenderer* self, GdkDrawabl // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->render_vfunc(Glib::wrap(window, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->render_vfunc(Glib::wrap(window, true) , *Glib::wrap(widget) , Glib::wrap(background_area) , Glib::wrap(cell_area) , Glib::wrap(expose_area) , ((CellRendererState)(flags)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->render) + (*base->render)(self, window, widget, background_area, cell_area, expose_area, flags); - // Call the original underlying C function: - if(base && base->render) - (*base->render)(self, window, widget, background_area, cell_area, expose_area, flags); - } } gboolean CellRenderer_Class::activate_vfunc_callback(GtkCellRenderer* self, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -263,44 +271,47 @@ gboolean CellRenderer_Class::activate_vfunc_callback(GtkCellRenderer* self, GdkE // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->activate_vfunc(event, *Glib::wrap(widget) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->activate_vfunc(event, *Glib::wrap(widget) , Glib::convert_const_gchar_ptr_to_ustring(path) , Glib::wrap(background_area) , Glib::wrap(cell_area) , ((CellRendererState)(flags)) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->activate) + return (*base->activate)(self, event, widget, path, background_area, cell_area, flags); - // Call the original underlying C function: - if(base && base->activate) - return (*base->activate)(self, event, widget, path, background_area, cell_area, flags); - } typedef gboolean RType; return RType(); } GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRenderer* self, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -308,37 +319,40 @@ GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRendere // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->start_editing_vfunc(event, *Glib::wrap(widget) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->start_editing_vfunc(event, *Glib::wrap(widget) , Glib::convert_const_gchar_ptr_to_ustring(path) , Glib::wrap(background_area) , Glib::wrap(cell_area) , ((CellRendererState)(flags)) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->start_editing) + return (*base->start_editing)(self, event, widget, path, background_area, cell_area, flags); - // Call the original underlying C function: - if(base && base->start_editing) - return (*base->start_editing)(self, event, widget, path, background_area, cell_area, flags); - } typedef GtkCellEditable* RType; return RType(); @@ -348,7 +362,7 @@ GtkCellEditable* CellRenderer_Class::start_editing_vfunc_callback(GtkCellRendere #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void CellRenderer_Class::editing_canceled_callback(GtkCellRenderer* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -356,32 +370,35 @@ void CellRenderer_Class::editing_canceled_callback(GtkCellRenderer* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_editing_canceled(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_editing_canceled(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->editing_canceled) - (*base->editing_canceled)(self); - } + // Call the original underlying C function: + if(base && base->editing_canceled) + (*base->editing_canceled)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -471,7 +488,8 @@ gtk_cell_renderer_stop_editing(gobj(), static_cast(canceled)); CellRenderer::CellRenderer() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Object(Glib::ConstructParams(cellrenderer_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer.h b/libs/gtkmm2/gtk/gtkmm/cellrenderer.h index 95a2d4e616..838d86255e 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderer.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer.h @@ -258,7 +258,8 @@ public: * @a window . @a expose_area is a clip rectangle. * @param window A Gdk::Drawable to draw to. * @param widget The widget owning @a window . - * @param background_area Entire cell area (including tree expanders and maybe padding on the sides). + * @param background_area Entire cell area (including tree expanders and maybe + * padding on the sides). * @param cell_area Area normally rendered by a cell renderer. * @param expose_area Area that actually needs updating. * @param flags Flags that affect rendering. @@ -272,14 +273,15 @@ public: CellRendererState flags); - /** Passes an activate event to the cell renderer for possible processing. Some - * cell renderers may use events; for example, Gtk::CellRendererToggle toggles - * when it gets a mouse click. + /** Passes an activate event to the cell renderer for possible processing. + * Some cell renderers may use events; for example, Gtk::CellRendererToggle + * toggles when it gets a mouse click. * @param event A Gdk::Event. * @param widget Widget that received the event. - * @param path Widget-dependent string representation of the event location; e.g. for Gtk::TreeView, a string representation of Gtk::TreePath. - * @param background_area Background area as passed to @a gtk_cell_renderer_render . - * @param cell_area Cell area as passed to @a gtk_cell_renderer_render . + * @param path Widget-dependent string representation of the event location; + * e.g. for Gtk::TreeView, a string representation of Gtk::TreePath. + * @param background_area Background area as passed to render(). + * @param cell_area Cell area as passed to render(). * @param flags Render flags. * @return true if the event was consumed/handled. */ @@ -295,9 +297,10 @@ public: /** Passes an activate event to the cell renderer for possible processing. * @param event A Gdk::Event. * @param widget Widget that received the event. - * @param path Widget-dependent string representation of the event location; e.g. for Gtk::TreeView, a string representation of Gtk::TreePath. - * @param background_area Background area as passed to @a gtk_cell_renderer_render . - * @param cell_area Cell area as passed to @a gtk_cell_renderer_render . + * @param path Widget-dependent string representation of the event location; + * e.g. for Gtk::TreeView, a string representation of Gtk::TreePath. + * @param background_area Background area as passed to render(). + * @param cell_area Cell area as passed to render(). * @param flags Render flags. * @return A new Gtk::CellEditable, or 0. */ @@ -324,13 +327,15 @@ public: #ifndef GTKMM_DISABLE_DEPRECATED - /** Causes the cell renderer to emit the "editing-canceled" signal. This - * function is for use only by implementations of cell renderers that need to - * notify the client program that an editing process was canceled and the - * changes were not committed. + /** Causes the cell renderer to emit the Gtk::CellRenderer::editing-canceled + * signal. + * + * This function is for use only by implementations of cell renderers that + * need to notify the client program that an editing process was canceled + * and the changes were not committed. * * @newin2p4 - * Deprecated: Use stop_editing() instead + * Deprecated: 2.6: Use stop_editing() instead * @deprecated Use stop_editing(). */ void editing_canceled(); @@ -338,9 +343,12 @@ public: /** Informs the cell renderer that the editing is stopped. - * If @a canceled is true, the cell renderer will emit the "editing-canceled" - * signal. This function should be called by cell renderer implementations - * in response to the "editing-done" signal of Gtk::CellEditable. + * If @a canceled is true, the cell renderer will emit the + * Gtk::CellRenderer::editing-canceled signal. + * + * This function should be called by cell renderer implementations + * in response to the Gtk::CellEditable::editing-done signal of + * Gtk::CellEditable. * * @newin2p6 * @param canceled true if the editing has been canceled. @@ -362,11 +370,9 @@ public: * editing when the user presses Escape. * * @see editing_canceled() - */ - -/** + * * @par Prototype: - * void %editing_canceled() + * void on_my_%editing_canceled() */ Glib::SignalProxy0< void > signal_editing_canceled(); @@ -392,11 +398,9 @@ public: * * @param editable the CellEditable. * @param path the path identifying the edited cell. - */ - -/** + * * @par Prototype: - * void %editing_started(CellEditable* editable, const Glib::ustring& path) + * void on_my_%editing_started(CellEditable* editable, const Glib::ustring& path) */ Glib::SignalProxy2< void,CellEditable*,const Glib::ustring& > signal_editing_started(); @@ -720,10 +724,13 @@ protected: namespace Glib { - /** @relates Gtk::CellRenderer - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRenderer */ Gtk::CellRenderer* wrap(GtkCellRenderer* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.cc b/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.cc index 0e10e4d80f..9cadd021ca 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.cc @@ -171,7 +171,7 @@ void CellRendererAccel_Class::class_init_function(void* g_class, void* class_dat #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void CellRendererAccel_Class::accel_edited_callback(GtkCellRendererAccel* self, const gchar* p0, guint p1, GdkModifierType p2, guint p3) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -179,38 +179,41 @@ void CellRendererAccel_Class::accel_edited_callback(GtkCellRendererAccel* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_accel_edited(Glib::convert_const_gchar_ptr_to_ustring(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_accel_edited(Glib::convert_const_gchar_ptr_to_ustring(p0) , p1, ((Gdk::ModifierType)(p2)) , p3); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->accel_edited) - (*base->accel_edited)(self, p0, p1, p2, p3); - } + // Call the original underlying C function: + if(base && base->accel_edited) + (*base->accel_edited)(self, p0, p1, p2, p3); } void CellRendererAccel_Class::accel_cleared_callback(GtkCellRendererAccel* self, const gchar* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -218,33 +221,36 @@ void CellRendererAccel_Class::accel_cleared_callback(GtkCellRendererAccel* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_accel_cleared(Glib::convert_const_gchar_ptr_to_ustring(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_accel_cleared(Glib::convert_const_gchar_ptr_to_ustring(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->accel_cleared) - (*base->accel_cleared)(self, p0); - } + // Call the original underlying C function: + if(base && base->accel_cleared) + (*base->accel_cleared)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -290,7 +296,8 @@ GType CellRendererAccel::get_base_type() CellRendererAccel::CellRendererAccel() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRendererText(Glib::ConstructParams(cellrendereraccel_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.h b/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.h index 075be99c45..a242a7d406 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrendereraccel.h @@ -43,7 +43,12 @@ namespace Gtk { /** . - * TODO. + * Renders a keyboard accelerator in a cell + * + * Gtk::CellRendererAccel displays a keyboard accelerator + * (i.e. a key combination like -a). + * If the cell renderer is editable, the accelerator can be changed by + * simply typing the new combination. * * @ingroup TreeView * @newin2p10 @@ -115,17 +120,17 @@ public: //TODO: Wrap accel_key and accel_mods in an AccelKey? -/** + /** * @par Prototype: - * void %accel_edited(const Glib::ustring& path_string, guint accel_key, Gdk::ModifierType accel_mods, guint hardware_keycode) + * void on_my_%accel_edited(const Glib::ustring& path_string, guint accel_key, Gdk::ModifierType accel_mods, guint hardware_keycode) */ Glib::SignalProxy4< void,const Glib::ustring&,guint,Gdk::ModifierType,guint > signal_accel_edited(); -/** + /** * @par Prototype: - * void %accel_cleared(const Glib::ustring& path_string) + * void on_my_%accel_cleared(const Glib::ustring& path_string) */ Glib::SignalProxy1< void,const Glib::ustring& > signal_accel_cleared(); @@ -204,10 +209,13 @@ public: namespace Glib { - /** @relates Gtk::CellRendererAccel - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererAccel */ Gtk::CellRendererAccel* wrap(GtkCellRendererAccel* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc index aa4771f28b..d3848fbc55 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.cc @@ -146,7 +146,8 @@ GType CellRendererCombo::get_base_type() CellRendererCombo::CellRendererCombo() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRendererText(Glib::ConstructParams(cellrenderercombo_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h index 8dc0250e66..dc024c11f8 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderercombo.h @@ -192,10 +192,13 @@ public: namespace Glib { - /** @relates Gtk::CellRendererCombo - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererCombo */ Gtk::CellRendererCombo* wrap(GtkCellRendererCombo* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc index 82ab381c6c..90f504194a 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.cc @@ -145,7 +145,8 @@ GType CellRendererPixbuf::get_base_type() CellRendererPixbuf::CellRendererPixbuf() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRenderer(Glib::ConstructParams(cellrendererpixbuf_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h index b9cb844d7d..43aa4364b3 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrendererpixbuf.h @@ -250,10 +250,13 @@ public: namespace Glib { - /** @relates Gtk::CellRendererPixbuf - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererPixbuf */ Gtk::CellRendererPixbuf* wrap(GtkCellRendererPixbuf* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc index 87795f7db1..f4e981419e 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.cc @@ -148,7 +148,8 @@ GType CellRendererProgress::get_base_type() CellRendererProgress::CellRendererProgress() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRenderer(Glib::ConstructParams(cellrendererprogress_class_.init())) { } @@ -182,6 +183,48 @@ Glib::PropertyProxy_ReadOnly CellRendererProgress::property_text( } #endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy CellRendererProgress::property_pulse() +{ + return Glib::PropertyProxy(this, "pulse"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly CellRendererProgress::property_pulse() const +{ + return Glib::PropertyProxy_ReadOnly(this, "pulse"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy CellRendererProgress::property_text_xalign() +{ + return Glib::PropertyProxy(this, "text-xalign"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly CellRendererProgress::property_text_xalign() const +{ + return Glib::PropertyProxy_ReadOnly(this, "text-xalign"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy CellRendererProgress::property_text_yalign() +{ + return Glib::PropertyProxy(this, "text-yalign"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly CellRendererProgress::property_text_yalign() const +{ + return Glib::PropertyProxy_ReadOnly(this, "text-yalign"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h index 1316e177d5..8810d80e2e 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrendererprogress.h @@ -42,6 +42,7 @@ namespace Gtk /** Renders numbers as progress bars. * * @ingroup TreeView + * @newin2p6 */ class CellRendererProgress : public CellRenderer @@ -145,6 +146,66 @@ public: Glib::PropertyProxy_ReadOnly property_text() const; #endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Set this to positive values to indicate that some progress is made + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_pulse() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Set this to positive values to indicate that some progress is made + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_pulse() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The horizontal text alignment + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_text_xalign() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The horizontal text alignment + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_text_xalign() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The vertical text alignment + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_text_yalign() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The vertical text alignment + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_text_yalign() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED virtual Glib::PropertyProxy_Base _property_renderable(); @@ -160,10 +221,13 @@ public: namespace Glib { - /** @relates Gtk::CellRendererProgress - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererProgress */ Gtk::CellRendererProgress* wrap(GtkCellRendererProgress* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererspin.cc b/libs/gtkmm2/gtk/gtkmm/cellrendererspin.cc index 396686d536..ee057ec6c9 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendererspin.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrendererspin.cc @@ -136,7 +136,8 @@ GType CellRendererSpin::get_base_type() CellRendererSpin::CellRendererSpin() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRendererText(Glib::ConstructParams(cellrendererspin_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrendererspin.h b/libs/gtkmm2/gtk/gtkmm/cellrendererspin.h index 45dc03709b..934dbc1286 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrendererspin.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrendererspin.h @@ -38,9 +38,23 @@ namespace Gtk namespace Gtk { -/** TODO. +/** Renders a spin button in a cell. + * + * Gtk::CellRendererSpin renders text in a cell like Gtk::CellRendererText, + * from which it is derived. But while Gtk::CellRendererText offers a simple + * entry to edit the text, Gtk::CellRendererSpin offers a Gtk::SpinButton widget. + * Of course, that means that the text must be parseable as a floating point + * number. + * + * The range of the spinbutton is taken from the adjustment property of the + * cell renderer, which can be set explicitly or mapped to a column in + * the tree model, like all properties of cell renders. Gtk::CellRendererSpin + * also has properties for the climb rate and the number of digits to display. + * Other Gtk::SpinButton properties can be set in a handler for the start-editing + * signal. * * @ingroup TreeView + * @newin2p12 */ class CellRendererSpin : public CellRendererText @@ -178,10 +192,13 @@ public: namespace Glib { - /** @relates Gtk::CellRendererSpin - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererSpin */ Gtk::CellRendererSpin* wrap(GtkCellRendererSpin* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc index 26cc8533f9..b0d478211e 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.cc @@ -146,7 +146,7 @@ void CellRendererText_Class::class_init_function(void* g_class, void* class_data #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void CellRendererText_Class::edited_callback(GtkCellRendererText* self, const gchar* p0, const gchar* p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -154,34 +154,37 @@ void CellRendererText_Class::edited_callback(GtkCellRendererText* self, const gc // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_edited(Glib::convert_const_gchar_ptr_to_ustring(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_edited(Glib::convert_const_gchar_ptr_to_ustring(p0) , Glib::convert_const_gchar_ptr_to_ustring(p1) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->edited) - (*base->edited)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->edited) + (*base->edited)(self, p0, p1); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -227,7 +230,8 @@ GType CellRendererText::get_base_type() CellRendererText::CellRendererText() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRenderer(Glib::ConstructParams(cellrenderertext_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h index 408a9e4774..ebf7984442 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertext.h @@ -121,9 +121,9 @@ public: void set_fixed_height_from_font(int number_of_rows); -/** + /** * @par Prototype: - * void %edited(const Glib::ustring& path, const Glib::ustring& new_text) + * void on_my_%edited(const Glib::ustring& path, const Glib::ustring& new_text) */ Glib::SignalProxy2< void,const Glib::ustring&,const Glib::ustring& > signal_edited(); @@ -243,7 +243,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** Font description as a string. +/** Font description as a string * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -253,7 +253,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** Font description as a string. +/** Font description as a string * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -983,10 +983,13 @@ protected: namespace Glib { - /** @relates Gtk::CellRendererText - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererText */ Gtk::CellRendererText* wrap(GtkCellRendererText* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc index 55742abf81..62b08cf4b2 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.cc @@ -140,7 +140,7 @@ void CellRendererToggle_Class::class_init_function(void* g_class, void* class_da #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void CellRendererToggle_Class::toggled_callback(GtkCellRendererToggle* self, const gchar* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -148,33 +148,36 @@ void CellRendererToggle_Class::toggled_callback(GtkCellRendererToggle* self, con // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_toggled(Glib::convert_const_gchar_ptr_to_ustring(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_toggled(Glib::convert_const_gchar_ptr_to_ustring(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->toggled) - (*base->toggled)(self, p0); - } + // Call the original underlying C function: + if(base && base->toggled) + (*base->toggled)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -220,7 +223,8 @@ GType CellRendererToggle::get_base_type() CellRendererToggle::CellRendererToggle() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::CellRenderer(Glib::ConstructParams(cellrenderertoggle_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h index 56f0d9df4f..af588887a3 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h +++ b/libs/gtkmm2/gtk/gtkmm/cellrenderertoggle.h @@ -112,7 +112,7 @@ public: CellRendererToggle(); - /** Returns whether we're rendering radio toggles rather than checkboxes. + /** Return value: true if we're rendering radio toggles rather than checkboxes * @return true if we're rendering radio toggles rather than checkboxes. */ bool get_radio() const; @@ -128,8 +128,7 @@ public: */ void set_radio(bool radio = true); - /** Returns whether the cell renderer is active. See - * set_active(). + /** Return value: true if the cell renderer is active. * @return true if the cell renderer is active. */ bool get_active() const; @@ -143,11 +142,9 @@ public: /** The toggled signal is emitted when the cell is toggled. * * @param path string representation of TreePath describing the event location - */ - -/** + * * @par Prototype: - * void %toggled(const Glib::ustring& path) + * void on_my_%toggled(const Glib::ustring& path) */ Glib::SignalProxy1< void,const Glib::ustring& > signal_toggled(); @@ -248,10 +245,13 @@ public: namespace Glib { - /** @relates Gtk::CellRendererToggle - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellRendererToggle */ Gtk::CellRendererToggle* wrap(GtkCellRendererToggle* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/cellview.cc b/libs/gtkmm2/gtk/gtkmm/cellview.cc index 3691fbaa6b..9596dcdebc 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellview.cc +++ b/libs/gtkmm2/gtk/gtkmm/cellview.cc @@ -35,8 +35,9 @@ namespace Gtk CellView::CellView(const Glib::ustring& text, bool use_markup) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Widget(Glib::ConstructParams(cellview_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Widget(Glib::ConstructParams(cellview_class_.init())) { Gtk::CellRendererText* cell = Gtk::manage(new Gtk::CellRendererText()); @@ -62,8 +63,9 @@ CellView::CellView(const Glib::ustring& text, bool use_markup) CellView::CellView(const Glib::RefPtr& pixbuf) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Widget(Glib::ConstructParams(cellview_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Widget(Glib::ConstructParams(cellview_class_.init())) { Gtk::CellRendererPixbuf* cell = Gtk::manage(new Gtk::CellRendererPixbuf()); @@ -181,7 +183,8 @@ GType CellView::get_base_type() CellView::CellView() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(cellview_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/cellview.h b/libs/gtkmm2/gtk/gtkmm/cellview.h index a804824739..6405044b30 100644 --- a/libs/gtkmm2/gtk/gtkmm/cellview.h +++ b/libs/gtkmm2/gtk/gtkmm/cellview.h @@ -159,9 +159,7 @@ public: */ void set_displayed_row(const TreeModel::Path& path); - /** Returns a Gtk::TreePath referring to the currently - * displayed row. If no row is currently displayed, - * 0 is returned. + /** Returns: the currently displayed row or 0 * @return The currently displayed row or 0 * * @newin2p6. @@ -187,7 +185,7 @@ public: void set_background_color(const Gdk::Color& color); - /** Returns the cell renderers which have been added to @a cell_view . + /** Return value: a list of cell renderers. The list, but not the * @return A list of cell renderers. The list, but not the * renderers has been newly allocated and should be freed with * Glib::list_free() when no longer needed. @@ -196,7 +194,7 @@ public: */ Glib::ListHandle get_cell_renderers(); - /** Returns the cell renderers which have been added to @a cell_view . + /** Return value: a list of cell renderers. The list, but not the * @return A list of cell renderers. The list, but not the * renderers has been newly allocated and should be freed with * Glib::list_free() when no longer needed. @@ -213,10 +211,13 @@ public: namespace Glib { - /** @relates Gtk::CellView - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CellView */ Gtk::CellView* wrap(GtkCellView* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/checkbutton.cc b/libs/gtkmm2/gtk/gtkmm/checkbutton.cc index 61fec35704..e8d24abd51 100644 --- a/libs/gtkmm2/gtk/gtkmm/checkbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/checkbutton.cc @@ -33,8 +33,9 @@ namespace Gtk CheckButton::CheckButton(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::ToggleButton(Glib::ConstructParams(checkbutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::ToggleButton(Glib::ConstructParams(checkbutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) {} } // namespace Gtk @@ -97,7 +98,7 @@ void CheckButton_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void CheckButton_Class::draw_indicator_vfunc_callback(GtkCheckButton* self, GdkRectangle* area) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -105,32 +106,36 @@ void CheckButton_Class::draw_indicator_vfunc_callback(GtkCheckButton* self, GdkR // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_indicator_vfunc(area); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_indicator_vfunc(area); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_indicator) + (*base->draw_indicator)(self, area); - // Call the original underlying C function: - if(base && base->draw_indicator) - (*base->draw_indicator)(self, area); - } } #endif //GLIBMM_VFUNCS_ENABLED @@ -179,7 +184,8 @@ GType CheckButton::get_base_type() CheckButton::CheckButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::ToggleButton(Glib::ConstructParams(checkbutton_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/checkbutton.h b/libs/gtkmm2/gtk/gtkmm/checkbutton.h index 2e33cf9f6d..69897193fa 100644 --- a/libs/gtkmm2/gtk/gtkmm/checkbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/checkbutton.h @@ -149,10 +149,13 @@ protected: namespace Glib { - /** @relates Gtk::CheckButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CheckButton */ Gtk::CheckButton* wrap(GtkCheckButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc index f66910811f..6cbf30cf57 100644 --- a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc +++ b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.cc @@ -35,8 +35,9 @@ namespace Gtk CheckMenuItem::CheckMenuItem(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::MenuItem(Glib::ConstructParams(checkmenuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::MenuItem(Glib::ConstructParams(checkmenuitem_class_.init())) { add_accel_label(label, mnemonic); /* Left-aligned label */ } @@ -112,7 +113,7 @@ void CheckMenuItem_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void CheckMenuItem_Class::draw_indicator_vfunc_callback(GtkCheckMenuItem* self, GdkRectangle* area) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -120,39 +121,43 @@ void CheckMenuItem_Class::draw_indicator_vfunc_callback(GtkCheckMenuItem* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_indicator_vfunc(area); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_indicator_vfunc(area); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_indicator) + (*base->draw_indicator)(self, area); - // Call the original underlying C function: - if(base && base->draw_indicator) - (*base->draw_indicator)(self, area); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void CheckMenuItem_Class::toggled_callback(GtkCheckMenuItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -160,32 +165,35 @@ void CheckMenuItem_Class::toggled_callback(GtkCheckMenuItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_toggled(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_toggled(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->toggled) - (*base->toggled)(self); - } + // Call the original underlying C function: + if(base && base->toggled) + (*base->toggled)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -231,7 +239,8 @@ GType CheckMenuItem::get_base_type() CheckMenuItem::CheckMenuItem() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::MenuItem(Glib::ConstructParams(checkmenuitem_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h index 0aa9405b5b..38fe463f66 100644 --- a/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h +++ b/libs/gtkmm2/gtk/gtkmm/checkmenuitem.h @@ -116,8 +116,7 @@ public: void set_active(bool state = true); - /** Returns whether the check menu item is active. See - * set_active(). + /** Return value: true if the menu item is checked. * @return true if the menu item is checked. */ bool get_active() const; @@ -151,7 +150,7 @@ public: */ void set_draw_as_radio(bool draw_as_radio = true); - /** Returns whether @a check_menu_item looks like a Gtk::RadioMenuItem + /** Return value: Whether @a check_menu_item looks like a Gtk::RadioMenuItem * @return Whether @a check_menu_item looks like a Gtk::RadioMenuItem * * @newin2p4. @@ -161,11 +160,9 @@ public: /** Triggered when the item changes state * (Note : changing the item's state with set_active() will also trigger * this signal) - */ - -/** + * * @par Prototype: - * void %toggled() + * void on_my_%toggled() */ Glib::SignalProxy0< void > signal_toggled(); @@ -251,10 +248,13 @@ protected: namespace Glib { - /** @relates Gtk::CheckMenuItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::CheckMenuItem */ Gtk::CheckMenuItem* wrap(GtkCheckMenuItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/clipboard.h b/libs/gtkmm2/gtk/gtkmm/clipboard.h index 401a1738b9..923aedcb06 100644 --- a/libs/gtkmm2/gtk/gtkmm/clipboard.h +++ b/libs/gtkmm2/gtk/gtkmm/clipboard.h @@ -124,8 +124,7 @@ private: public: - /** Returns the clipboard object for the given selection. - * See gtk_clipboard_get_for_display() for complete details. + /** Return value: the appropriate clipboard object. If no * @param selection A Gdk::Atom which identifies the clipboard * to use. * @return The appropriate clipboard object. If no @@ -137,30 +136,7 @@ public: */ static Glib::RefPtr get(GdkAtom selection = GDK_SELECTION_CLIPBOARD); - /** Returns the clipboard object for the given selection. - * Cut/copy/paste menu items and keyboard shortcuts should use - * the default clipboard, returned by passing Gdk::SELECTION_CLIPBOARD for @a selection . - * (Gdk::NONE is supported as a synonym for GDK_SELECTION_CLIPBOARD - * for backwards compatibility reasons.) - * The currently-selected object or text should be provided on the clipboard - * identified by Gdk::SELECTION_PRIMARY. Cut/copy/paste menu items - * conceptually copy the contents of the Gdk::SELECTION_PRIMARY clipboard - * to the default clipboard, i.e. they copy the selection to what the - * user sees as the clipboard. - * - * (Passing Gdk::NONE is the same as using gdk_atom_intern - * ("CLIPBOARD", false). See - * http://www.freedesktop.org/Standards/clipboards-spec - * for a detailed discussion of the "CLIPBOARD" vs. "PRIMARY" - * selections under the X window system. On Win32 the - * Gdk::SELECTION_PRIMARY clipboard is essentially ignored.) - * - * It's possible to have arbitrary named clipboards; if you do invent - * new clipboards, you should prefix the selection name with an - * underscore (because the ICCCM requires that nonstandard atoms are - * underscore-prefixed), and namespace it as well. For example, - * if your application called "Foo" has a special-purpose - * clipboard, you might call it "_FOO_SPECIAL_CLIPBOARD". + /** Return value: the appropriate clipboard object. If no * @param display The display for which the clipboard is to be retrieved or created. * @param selection A Gdk::Atom which identifies the clipboard * to use. @@ -418,6 +394,20 @@ public: */ bool wait_is_text_available() const; + /** Test to see if there is rich text available to be pasted + * This is done by requesting the TARGETS atom and checking + * if it contains any of the supported rich text targets. This function + * waits for the data to be received using the main loop, so events, + * timeouts, etc, may be dispatched during the wait. + * + * This function is a little faster than calling + * gtk_clipboard_wait_for_rich_text() since it doesn't need to retrieve + * the actual text. + * @param buffer A Gtk::TextBuffer. + * @return true is there is rich text available, false otherwise. + * + * @newin2p10. + */ bool wait_is_rich_text_available(const Glib::RefPtr& buffer) const; /** Test to see if there is an image available to be pasted @@ -487,9 +477,9 @@ public: //We use no_default_handler because this signal was added and we don't want to break the ABI by adding a virtual function. -/** + /** * @par Prototype: - * void %owner_change(GdkEventOwnerChange* event) + * void on_my_%owner_change(GdkEventOwnerChange* event) */ Glib::SignalProxy1< void,GdkEventOwnerChange* > signal_owner_change(); @@ -519,10 +509,13 @@ protected: namespace Glib { - /** @relates Gtk::Clipboard - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Clipboard */ Glib::RefPtr wrap(GtkClipboard* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/colorbutton.cc b/libs/gtkmm2/gtk/gtkmm/colorbutton.cc index 6696319b15..d375aadc9a 100644 --- a/libs/gtkmm2/gtk/gtkmm/colorbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/colorbutton.cc @@ -113,7 +113,7 @@ void ColorButton_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void ColorButton_Class::color_set_callback(GtkColorButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -121,32 +121,35 @@ void ColorButton_Class::color_set_callback(GtkColorButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_color_set(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_color_set(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->color_set) - (*base->color_set)(self); - } + // Call the original underlying C function: + if(base && base->color_set) + (*base->color_set)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -192,15 +195,17 @@ GType ColorButton::get_base_type() ColorButton::ColorButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Button(Glib::ConstructParams(colorbutton_class_.init())) { } ColorButton::ColorButton(const Gdk::Color& color) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Button(Glib::ConstructParams(colorbutton_class_.init(), "color", (color).gobj(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Button(Glib::ConstructParams(colorbutton_class_.init(), "color", (color).gobj(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/colorbutton.h b/libs/gtkmm2/gtk/gtkmm/colorbutton.h index 214bad401a..d6a898461e 100644 --- a/libs/gtkmm2/gtk/gtkmm/colorbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/colorbutton.h @@ -162,7 +162,7 @@ public: Gdk::Color get_color() const; - /** Returns the current alpha value. + /** Return value: an integer between 0 and 65535. * @return An integer between 0 and 65535. * * @newin2p4. @@ -281,11 +281,9 @@ public: /** The color_set signal is emitted when the user selects a color. When handling this signal, * use get_color() and get_alpha() to find out which color * was just selected. - */ - -/** + * * @par Prototype: - * void %color_set() + * void on_my_%color_set() */ Glib::SignalProxy0< void > signal_color_set(); @@ -299,10 +297,13 @@ public: namespace Glib { - /** @relates Gtk::ColorButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ColorButton */ Gtk::ColorButton* wrap(GtkColorButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/colorselection.cc b/libs/gtkmm2/gtk/gtkmm/colorselection.cc index 489b929c18..6c2e67538c 100644 --- a/libs/gtkmm2/gtk/gtkmm/colorselection.cc +++ b/libs/gtkmm2/gtk/gtkmm/colorselection.cc @@ -219,7 +219,7 @@ void ColorSelection_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void ColorSelection_Class::color_changed_callback(GtkColorSelection* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -227,32 +227,35 @@ void ColorSelection_Class::color_changed_callback(GtkColorSelection* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_color_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_color_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->color_changed) - (*base->color_changed)(self); - } + // Call the original underlying C function: + if(base && base->color_changed) + (*base->color_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -298,7 +301,8 @@ GType ColorSelection::get_base_type() ColorSelection::ColorSelection() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::VBox(Glib::ConstructParams(colorselection_class_.init())) { } @@ -536,15 +540,17 @@ GType ColorSelectionDialog::get_base_type() ColorSelectionDialog::ColorSelectionDialog() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Dialog(Glib::ConstructParams(colorselectiondialog_class_.init())) { } ColorSelectionDialog::ColorSelectionDialog(const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(colorselectiondialog_class_.init(), "title", title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(colorselectiondialog_class_.init(), "title", title.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/colorselection.h b/libs/gtkmm2/gtk/gtkmm/colorselection.h index 718565383c..e7837f89ba 100644 --- a/libs/gtkmm2/gtk/gtkmm/colorselection.h +++ b/libs/gtkmm2/gtk/gtkmm/colorselection.h @@ -159,7 +159,7 @@ public: void set_current_alpha(guint16 alpha); Gdk::Color get_current_color() const; - /** Returns the current alpha value. + /** Return value: an integer between 0 and 65535. * @return An integer between 0 and 65535. */ guint16 get_current_alpha() const; @@ -179,7 +179,7 @@ public: void set_previous_alpha(guint16 alpha); Gdk::Color get_previous_color() const; - /** Returns the previous alpha value. + /** Return value: an integer between 0 and 65535. * @return An integer between 0 and 65535. */ guint16 get_previous_alpha() const; @@ -200,9 +200,9 @@ public: static SlotChangePaletteHook set_change_palette_hook(const SlotChangePaletteHook& slot); -/** + /** * @par Prototype: - * void %color_changed() + * void on_my_%color_changed() */ Glib::SignalProxy0< void > signal_color_changed(); @@ -376,10 +376,13 @@ public: namespace Glib { - /** @relates Gtk::ColorSelection - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ColorSelection */ Gtk::ColorSelection* wrap(GtkColorSelection* object, bool take_copy = false); } //namespace Glib @@ -387,10 +390,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::ColorSelectionDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ColorSelectionDialog */ Gtk::ColorSelectionDialog* wrap(GtkColorSelectionDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/combo.cc b/libs/gtkmm2/gtk/gtkmm/combo.cc index c36c030ace..843a9f8836 100644 --- a/libs/gtkmm2/gtk/gtkmm/combo.cc +++ b/libs/gtkmm2/gtk/gtkmm/combo.cc @@ -341,7 +341,7 @@ void ComboDropDownItem_Class::class_init_function(void* g_class, void* class_dat #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void ComboDropDownItem_Class::scroll_horizontal_callback(GtkListItem* self, GtkScrollType p0, gfloat p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -349,38 +349,41 @@ void ComboDropDownItem_Class::scroll_horizontal_callback(GtkListItem* self, GtkS // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_scroll_horizontal(((ScrollType)(p0)) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_scroll_horizontal(((ScrollType)(p0)) , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->scroll_horizontal) - (*base->scroll_horizontal)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->scroll_horizontal) + (*base->scroll_horizontal)(self, p0, p1); } void ComboDropDownItem_Class::scroll_vertical_callback(GtkListItem* self, GtkScrollType p0, gfloat p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -388,34 +391,37 @@ void ComboDropDownItem_Class::scroll_vertical_callback(GtkListItem* self, GtkScr // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_scroll_vertical(((ScrollType)(p0)) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_scroll_vertical(((ScrollType)(p0)) , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->scroll_vertical) - (*base->scroll_vertical)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->scroll_vertical) + (*base->scroll_vertical)(self, p0, p1); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -461,7 +467,8 @@ GType ComboDropDownItem::get_base_type() ComboDropDownItem::ComboDropDownItem() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Item(Glib::ConstructParams(combodropdownitem_class_.init())) { } @@ -564,7 +571,7 @@ void ComboDropDown_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void ComboDropDown_Class::select_child_callback(GtkList* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -572,37 +579,40 @@ void ComboDropDown_Class::select_child_callback(GtkList* self, GtkWidget* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_select_child(*Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_select_child(*Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->select_child) - (*base->select_child)(self, p0); - } + // Call the original underlying C function: + if(base && base->select_child) + (*base->select_child)(self, p0); } void ComboDropDown_Class::selection_changed_callback(GtkList* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -610,36 +620,39 @@ void ComboDropDown_Class::selection_changed_callback(GtkList* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_selection_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_selection_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->selection_changed) - (*base->selection_changed)(self); - } + // Call the original underlying C function: + if(base && base->selection_changed) + (*base->selection_changed)(self); } void ComboDropDown_Class::unselect_child_callback(GtkList* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -647,33 +660,36 @@ void ComboDropDown_Class::unselect_child_callback(GtkList* self, GtkWidget* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_unselect_child(*Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_unselect_child(*Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->unselect_child) - (*base->unselect_child)(self, p0); - } + // Call the original underlying C function: + if(base && base->unselect_child) + (*base->unselect_child)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -787,7 +803,8 @@ ComboDropDownList::reference ComboDropDownList::operator[](size_type l) const ComboDropDown::ComboDropDown() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(combodropdown_class_.init())) { } @@ -953,7 +970,8 @@ GType Combo::get_base_type() Combo::Combo() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::HBox(Glib::ConstructParams(combo_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/combo.h b/libs/gtkmm2/gtk/gtkmm/combo.h index efbb772495..e6064a864f 100644 --- a/libs/gtkmm2/gtk/gtkmm/combo.h +++ b/libs/gtkmm2/gtk/gtkmm/combo.h @@ -3,6 +3,8 @@ #ifndef _GTKMM_COMBO_H #define _GTKMM_COMBO_H +#include + #ifndef GTKMM_DISABLE_DEPRECATED @@ -29,6 +31,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include #include #include @@ -137,17 +143,17 @@ public: ComboDropDownItem(); -/** + /** * @par Prototype: - * void %scroll_horizontal(ScrollType scroll_type, float position) + * void on_my_%scroll_horizontal(ScrollType scroll_type, float position) */ Glib::SignalProxy2< void,ScrollType,float > signal_scroll_horizontal(); -/** + /** * @par Prototype: - * void %scroll_vertical(ScrollType scroll_type, float position) + * void on_my_%scroll_vertical(ScrollType scroll_type, float position) */ Glib::SignalProxy2< void,ScrollType,float > signal_scroll_vertical(); @@ -304,25 +310,25 @@ public: const ComboDropDownList& children() const; -/** + /** * @par Prototype: - * void %select_child(Widget& item) + * void on_my_%select_child(Widget& item) */ Glib::SignalProxy1< void,Widget& > signal_select_child(); -/** + /** * @par Prototype: - * void %selection_changed() + * void on_my_%selection_changed() */ Glib::SignalProxy0< void > signal_selection_changed(); -/** + /** * @par Prototype: - * void %unselect_child(Widget& item) + * void on_my_%unselect_child(Widget& item) */ Glib::SignalProxy1< void,Widget& > signal_unselect_child(); @@ -582,10 +588,13 @@ public: namespace Glib { - /** @relates Gtk::ComboDropDownItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ComboDropDownItem */ Gtk::ComboDropDownItem* wrap(GtkListItem* object, bool take_copy = false); } //namespace Glib @@ -593,10 +602,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::ComboDropDown - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ComboDropDown */ Gtk::ComboDropDown* wrap(GtkList* object, bool take_copy = false); } //namespace Glib @@ -604,10 +616,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::Combo - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Combo */ Gtk::Combo* wrap(GtkCombo* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/combobox.cc b/libs/gtkmm2/gtk/gtkmm/combobox.cc index b56d24e2ba..abc516e8fd 100644 --- a/libs/gtkmm2/gtk/gtkmm/combobox.cc +++ b/libs/gtkmm2/gtk/gtkmm/combobox.cc @@ -163,7 +163,7 @@ void ComboBox_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void ComboBox_Class::changed_callback(GtkComboBox* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -171,32 +171,35 @@ void ComboBox_Class::changed_callback(GtkComboBox* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -242,15 +245,17 @@ GType ComboBox::get_base_type() ComboBox::ComboBox() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(combobox_class_.init())) { } ComboBox::ComboBox(const Glib::RefPtr& model) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(combobox_class_.init(), "model", Glib::unwrap(model), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(combobox_class_.init(), "model", Glib::unwrap(model), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/combobox.h b/libs/gtkmm2/gtk/gtkmm/combobox.h index 2201940cec..8b21ca8588 100644 --- a/libs/gtkmm2/gtk/gtkmm/combobox.h +++ b/libs/gtkmm2/gtk/gtkmm/combobox.h @@ -144,9 +144,7 @@ public: */ void set_wrap_width(int width); - /** Returns the wrap width which is used to determine the number - * of columns for the popup menu. If the wrap width is larger than - * 1, the combo box is in table mode. + /** Returns: the wrap width. * @return The wrap width. * * @newin2p6. @@ -163,7 +161,7 @@ public: */ void set_row_span_column(int row_span); - /** Returns the column with row span information for @a combo_box . + /** Returns: the row span column. * @return The row span column. * * @newin2p6. @@ -180,7 +178,7 @@ public: */ void set_column_span_column(int column_span); - /** Returns the column with column span information for @a combo_box . + /** Returns: the column span column. * @return The column span column. * * @newin2p6. @@ -202,13 +200,24 @@ public: void set_add_tearoffs(bool add_tearoffs = true); + /** Gets the current title of the menu in tearoff mode. See + * set_add_tearoffs(). + * @return The menu's title in tearoff mode. This is an internal copy of the + * string which must not be freed. + * + * @newin2p10. + */ Glib::ustring get_title() const; + /** Sets the menu's title in tearoff mode. + * + * @newin2p10 + * @param title A title for the menu in tearoff mode. + */ void set_title(const Glib::ustring& title); - /** Returns whether the combo box grabs focus when it is clicked - * with the mouse. See set_focus_on_click(). + /** Return value: true if the combo box grabs focus when it is * @return true if the combo box grabs focus when it is * clicked with the mouse. * @@ -229,13 +238,9 @@ public: /* get/set active item */ - /** Returns the index of the currently active item, or -1 if there's no - * active item. If the model is a non-flat treemodel, and the active item - * is not an immediate child of the root of the tree, this function returns - * gtk_tree_path_get_indices (path)[0], where - * path is the Gtk::TreePath of the active item. - * @return An integer which is the index of the currently active item, or - * -1 if there's no active item. + /** Return value: An integer which is the index of the currently active item, + * @return An integer which is the index of the currently active item, + * or -1 if there's no active item. * * @newin2p4. */ @@ -273,14 +278,14 @@ public: void unset_active(); - /** Returns the Gtk::TreeModel which is acting as data source for @a combo_box . + /** Return value: A Gtk::TreeModel which was passed during construction. * @return A Gtk::TreeModel which was passed during construction. * * @newin2p4. */ Glib::RefPtr get_model(); - /** Returns the Gtk::TreeModel which is acting as data source for @a combo_box . + /** Return value: A Gtk::TreeModel which was passed during construction. * @return A Gtk::TreeModel which was passed during construction. * * @newin2p4. @@ -291,8 +296,8 @@ public: * model (if applicable). If model is 0, then it will unset the model. * * Note that this function does not clear the cell renderers, you have to - * call gtk_combo_box_cell_layout_clear() yourself if you need to set up - * different cell renderers for the new model. + * call Gtk::CellLayout::clear() yourself if you need to set up different + * cell renderers for the new model. * * @newin2p4 * @param model A Gtk::TreeModel. @@ -547,16 +552,17 @@ public: * item is changed. This can be due to the user selecting * a different item from the list, or due to a * call to set_active_iter(). - */ - -/** + * * @par Prototype: - * void %changed() + * void on_my_%changed() */ Glib::SignalProxy0< void > signal_changed(); - + + //Key-binding signals: + + }; @@ -565,10 +571,13 @@ public: namespace Glib { - /** @relates Gtk::ComboBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ComboBox */ Gtk::ComboBox* wrap(GtkComboBox* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc b/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc index 0b850de778..7e1369f9c4 100644 --- a/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc +++ b/libs/gtkmm2/gtk/gtkmm/comboboxentry.cc @@ -148,22 +148,25 @@ GType ComboBoxEntry::get_base_type() ComboBoxEntry::ComboBoxEntry() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::ComboBox(Glib::ConstructParams(comboboxentry_class_.init())) { } ComboBoxEntry::ComboBoxEntry(const Glib::RefPtr& model, const TreeModelColumnBase& text_column) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::ComboBox(Glib::ConstructParams(comboboxentry_class_.init(), "model", Glib::unwrap(model), "text_column", (text_column).index(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::ComboBox(Glib::ConstructParams(comboboxentry_class_.init(), "model", Glib::unwrap(model), "text_column", (text_column).index(), static_cast(0))) { } ComboBoxEntry::ComboBoxEntry(const Glib::RefPtr& model, int text_column) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::ComboBox(Glib::ConstructParams(comboboxentry_class_.init(), "model", Glib::unwrap(model), "text_column", text_column, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::ComboBox(Glib::ConstructParams(comboboxentry_class_.init(), "model", Glib::unwrap(model), "text_column", text_column, static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/comboboxentry.h b/libs/gtkmm2/gtk/gtkmm/comboboxentry.h index 72d8d8ec73..3e622d784a 100644 --- a/libs/gtkmm2/gtk/gtkmm/comboboxentry.h +++ b/libs/gtkmm2/gtk/gtkmm/comboboxentry.h @@ -140,7 +140,7 @@ public: /** Sets the model column which @a entry_box should use to get strings from * to be @a text_column . * - * @newin2p4. + * @newin2p4 * @param text_column A column in @a model to get the strings from. */ void set_text_column(const TreeModelColumnBase& text_column) const; @@ -148,12 +148,12 @@ public: /** Sets the model column which @a entry_box should use to get strings from * to be @a text_column . * - * @newin2p4. + * @newin2p4 * @param text_column A column in @a model to get the strings from. */ void set_text_column(int text_column) const; - /** Returns the column which @a entry_box is using to get the strings from. + /** Return value: A column in the data source model of @a entry_box . * @return A column in the data source model of @a entry_box . * * @newin2p4. @@ -179,10 +179,13 @@ public: namespace Glib { - /** @relates Gtk::ComboBoxEntry - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ComboBoxEntry */ Gtk::ComboBoxEntry* wrap(GtkComboBoxEntry* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/container.cc b/libs/gtkmm2/gtk/gtkmm/container.cc index 6c6d70caec..49d49d00cc 100644 --- a/libs/gtkmm2/gtk/gtkmm/container.cc +++ b/libs/gtkmm2/gtk/gtkmm/container.cc @@ -411,7 +411,7 @@ void Container_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED GtkType Container_Class::child_type_vfunc_callback(GtkContainer* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -419,39 +419,42 @@ GtkType Container_Class::child_type_vfunc_callback(GtkContainer* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->child_type_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->child_type_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->child_type) + return (*base->child_type)(self); - // Call the original underlying C function: - if(base && base->child_type) - return (*base->child_type)(self); - } typedef GtkType RType; return RType(); } void Container_Class::forall_vfunc_callback(GtkContainer* self, gboolean include_internals, GtkCallback callback, gpointer callback_data) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -459,36 +462,40 @@ void Container_Class::forall_vfunc_callback(GtkContainer* self, gboolean include // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->forall_vfunc(include_internals, callback, callback_data); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->forall_vfunc(include_internals, callback, callback_data); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->forall) + (*base->forall)(self, include_internals, callback, callback_data); - // Call the original underlying C function: - if(base && base->forall) - (*base->forall)(self, include_internals, callback, callback_data); - } } gchar* Container_Class::composite_name_vfunc_callback(GtkContainer* self, GtkWidget* child) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -496,39 +503,42 @@ gchar* Container_Class::composite_name_vfunc_callback(GtkContainer* self, GtkWid // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->composite_name_vfunc(child); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->composite_name_vfunc(child); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->composite_name) + return (*base->composite_name)(self, child); - // Call the original underlying C function: - if(base && base->composite_name) - return (*base->composite_name)(self, child); - } typedef gchar* RType; return RType(); } void Container_Class::set_child_property_vfunc_callback(GtkContainer* self, GtkWidget* child, guint property_id, const GValue* value, GParamSpec* pspec) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -536,36 +546,40 @@ void Container_Class::set_child_property_vfunc_callback(GtkContainer* self, GtkW // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_child_property_vfunc(child, property_id, value, pspec); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_child_property_vfunc(child, property_id, value, pspec); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->set_child_property) + (*base->set_child_property)(self, child, property_id, value, pspec); - // Call the original underlying C function: - if(base && base->set_child_property) - (*base->set_child_property)(self, child, property_id, value, pspec); - } } void Container_Class::get_child_property_vfunc_callback(GtkContainer* self, GtkWidget* child, guint property_id, GValue* value, GParamSpec* pspec) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -573,39 +587,43 @@ void Container_Class::get_child_property_vfunc_callback(GtkContainer* self, GtkW // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_child_property_vfunc(child, property_id, value, pspec); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_child_property_vfunc(child, property_id, value, pspec); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_child_property) + (*base->get_child_property)(self, child, property_id, value, pspec); - // Call the original underlying C function: - if(base && base->get_child_property) - (*base->get_child_property)(self, child, property_id, value, pspec); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Container_Class::add_callback(GtkContainer* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -613,37 +631,40 @@ void Container_Class::add_callback(GtkContainer* self, GtkWidget* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_add(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_add(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->add) - (*base->add)(self, p0); - } + // Call the original underlying C function: + if(base && base->add) + (*base->add)(self, p0); } void Container_Class::check_resize_callback(GtkContainer* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -651,36 +672,39 @@ void Container_Class::check_resize_callback(GtkContainer* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_check_resize(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_check_resize(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->check_resize) - (*base->check_resize)(self); - } + // Call the original underlying C function: + if(base && base->check_resize) + (*base->check_resize)(self); } void Container_Class::set_focus_child_callback(GtkContainer* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -688,33 +712,36 @@ void Container_Class::set_focus_child_callback(GtkContainer* self, GtkWidget* p0 // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_set_focus_child(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_set_focus_child(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->set_focus_child) - (*base->set_focus_child)(self, p0); - } + // Call the original underlying C function: + if(base && base->set_focus_child) + (*base->set_focus_child)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -860,7 +887,8 @@ GType Container::child_type() const Container::Container() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(container_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/container.h b/libs/gtkmm2/gtk/gtkmm/container.h index a3b04aaa08..98b8b64106 100644 --- a/libs/gtkmm2/gtk/gtkmm/container.h +++ b/libs/gtkmm2/gtk/gtkmm/container.h @@ -144,8 +144,8 @@ public: * the container. To add space to only one side, one approach is to * create a Gtk::Alignment widget, call Gtk::Widget::set_usize() to give * it a size, and place it on the side of the container as a spacer. - * @param border_width Amount of blank space to leave outside the container. - * Valid values are in the range 0-65535 pixels. + * @param border_width Amount of blank space to leave outside + * the container. Valid values are in the range 0-65535 pixels. */ void set_border_width(guint border_width); @@ -180,8 +180,7 @@ public: void set_resize_mode(ResizeMode resize_mode); - /** Returns the resize mode for the container. See - * set_resize_mode(). + /** Return value: the current resize mode * @return The current resize mode. */ ResizeMode get_resize_mode() const; @@ -213,14 +212,12 @@ public: //_WRAP_METHOD(void foreach_full_(GtkCallback callback,GtkCallbackMarshal marshal, gpointer data,GtkDestroyNotify notify),gtk_container_foreach_full) - /** Returns the container's non-internal children. See - * forall() for details on what constitutes an "internal" child. + /** Return value: a newly-allocated list of the container's non-internal children. * @return A newly-allocated list of the container's non-internal children. */ Glib::ListHandle get_children(); - /** Returns the container's non-internal children. See - * forall() for details on what constitutes an "internal" child. + /** Return value: a newly-allocated list of the container's non-internal children. * @return A newly-allocated list of the container's non-internal children. */ Glib::ListHandle get_children() const; @@ -237,7 +234,7 @@ public: * the event's area with the child area, and sending the event. * * In most cases, a container can simply either simply inherit the - * ::expose implementation from Gtk::Container, or, do some drawing + * Gtk::Widget::expose implementation from Gtk::Container, or, do some drawing * and then chain to the ::expose implementation from Gtk::Container. * @param child A child of @a container . * @param event A expose event sent to container. @@ -284,16 +281,17 @@ public: void set_focus_child(Widget& widget); - /** Hooks up an adjustment to focus handling in a container, so when a child of the - * container is focused, the adjustment is scrolled to show that widget. This function - * sets the vertical alignment. See Gtk::ScrolledWindow::get_vadjustment() for a typical - * way of obtaining the adjustment and set_focus_hadjustment() for setting + /** Hooks up an adjustment to focus handling in a container, so when a + * child of the container is focused, the adjustment is scrolled to + * show that widget. This function sets the vertical alignment. See + * Gtk::ScrolledWindow::get_vadjustment() for a typical way of obtaining + * the adjustment and set_focus_hadjustment() for setting * the horizontal adjustment. * - * The adjustments have to be in pixel units and in the same coordinate system as the - * allocation for immediate children of the container. - * @param adjustment An adjustment which should be adjusted when the focus is moved among the - * descendents of @a container . + * The adjustments have to be in pixel units and in the same coordinate + * system as the allocation for immediate children of the container. + * @param adjustment An adjustment which should be adjusted when the focus + * is moved among the descendents of @a container . */ void set_focus_vadjustment(Adjustment& adjustment); @@ -313,16 +311,17 @@ public: const Adjustment* get_focus_vadjustment() const; - /** Hooks up an adjustment to focus handling in a container, so when a child of the - * container is focused, the adjustment is scrolled to show that widget. This function - * sets the horizontal alignment. See Gtk::ScrolledWindow::get_hadjustment() for a typical - * way of obtaining the adjustment and set_focus_vadjustment() for setting + /** Hooks up an adjustment to focus handling in a container, so when a child + * of the container is focused, the adjustment is scrolled to show that + * widget. This function sets the horizontal alignment. + * See Gtk::ScrolledWindow::get_hadjustment() for a typical way of obtaining + * the adjustment and set_focus_vadjustment() for setting * the vertical adjustment. * - * The adjustments have to be in pixel units and in the same coordinate system as the - * allocation for immediate children of the container. - * @param adjustment An adjustment which should be adjusted when the focus is moved among the - * descendents of @a container . + * The adjustments have to be in pixel units and in the same coordinate + * system as the allocation for immediate children of the container. + * @param adjustment An adjustment which should be adjusted when the focus is + * moved among the descendents of @a container . */ void set_focus_hadjustment(Adjustment& adjustment); @@ -345,11 +344,7 @@ public: void resize_children(); - /** Returns the type of the children supported by the container. - * - * Note that this may return G::TYPE_NONE to indicate that no more - * children can be added, e.g. for a Gtk::Paned which already has two - * children. + /** Return value: a G::Type. * @return A G::Type. */ GType child_type() const; @@ -357,9 +352,9 @@ public: // Ignore functions such as gtk_container_class_install_child_property(), which I think are for themes, like the GtkWidget style properties. -/** + /** * @par Prototype: - * void %add(Widget* widget) + * void on_my_%add(Widget* widget) */ Glib::SignalProxy1< void,Widget* > signal_add(); @@ -368,25 +363,25 @@ public: //We use the optional custom_c_callback parameter with _WRAP_SIGNAL() here, //so that we can write special code to check for deleted child widget parameters: -/** + /** * @par Prototype: - * void %remove(Widget* widget) + * void on_my_%remove(Widget* widget) */ Glib::SignalProxy1< void,Widget* > signal_remove(); -/** + /** * @par Prototype: - * void %check_resize() + * void on_my_%check_resize() */ Glib::SignalProxy0< void > signal_check_resize(); -/** + /** * @par Prototype: - * void %set_focus_child(Widget* widget) + * void on_my_%set_focus_child(Widget* widget) */ Glib::SignalProxy1< void,Widget* > signal_set_focus_child(); @@ -477,10 +472,13 @@ protected: namespace Glib { - /** @relates Gtk::Container - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Container */ Gtk::Container* wrap(GtkContainer* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/curve.cc b/libs/gtkmm2/gtk/gtkmm/curve.cc index 9cd9cc345e..210e07e191 100644 --- a/libs/gtkmm2/gtk/gtkmm/curve.cc +++ b/libs/gtkmm2/gtk/gtkmm/curve.cc @@ -118,7 +118,7 @@ void Curve_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Curve_Class::curve_type_changed_callback(GtkCurve* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -126,32 +126,35 @@ void Curve_Class::curve_type_changed_callback(GtkCurve* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_curve_type_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_curve_type_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->curve_type_changed) - (*base->curve_type_changed)(self); - } + // Call the original underlying C function: + if(base && base->curve_type_changed) + (*base->curve_type_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -197,7 +200,8 @@ GType Curve::get_base_type() Curve::Curve() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::DrawingArea(Glib::ConstructParams(curve_class_.init())) { } @@ -419,7 +423,8 @@ GType GammaCurve::get_base_type() GammaCurve::GammaCurve() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::VBox(Glib::ConstructParams(gammacurve_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/curve.h b/libs/gtkmm2/gtk/gtkmm/curve.h index 9ccfcc7e90..7b064d9bcf 100644 --- a/libs/gtkmm2/gtk/gtkmm/curve.h +++ b/libs/gtkmm2/gtk/gtkmm/curve.h @@ -136,9 +136,9 @@ public: void set_curve_type(CurveType type); -/** + /** * @par Prototype: - * void %curve_type_changed() + * void on_my_%curve_type_changed() */ Glib::SignalProxy0< void > signal_curve_type_changed(); @@ -321,10 +321,13 @@ public: namespace Glib { - /** @relates Gtk::Curve - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Curve */ Gtk::Curve* wrap(GtkCurve* object, bool take_copy = false); } //namespace Glib @@ -332,10 +335,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::GammaCurve - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::GammaCurve */ Gtk::GammaCurve* wrap(GtkGammaCurve* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/dialog.cc b/libs/gtkmm2/gtk/gtkmm/dialog.cc index 803a6b149d..fd8e21ed7c 100644 --- a/libs/gtkmm2/gtk/gtkmm/dialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/dialog.cc @@ -32,8 +32,9 @@ namespace Gtk Dialog::Dialog(const Glib::ustring& title, Gtk::Window& parent, bool modal, bool use_separator) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Window(Glib::ConstructParams(dialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Window(Glib::ConstructParams(dialog_class_.init(), "title",title.c_str(), static_cast(0))) { construct_(modal, use_separator); set_transient_for(parent); @@ -41,8 +42,9 @@ Dialog::Dialog(const Glib::ustring& title, Gtk::Window& parent, bool modal, bool Dialog::Dialog(const Glib::ustring& title, bool modal, bool use_separator) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Window(Glib::ConstructParams(dialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Window(Glib::ConstructParams(dialog_class_.init(), "title",title.c_str(), static_cast(0))) { construct_(modal, use_separator); } @@ -162,7 +164,7 @@ void Dialog_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Dialog_Class::response_callback(GtkDialog* self, gint p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -170,33 +172,36 @@ void Dialog_Class::response_callback(GtkDialog* self, gint p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_response(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_response(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->response) - (*base->response)(self, p0); - } + // Call the original underlying C function: + if(base && base->response) + (*base->response)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -242,7 +247,8 @@ GType Dialog::get_base_type() Dialog::Dialog() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Window(Glib::ConstructParams(dialog_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/dialog.h b/libs/gtkmm2/gtk/gtkmm/dialog.h index d019795eb6..7b12e3b7fa 100644 --- a/libs/gtkmm2/gtk/gtkmm/dialog.h +++ b/libs/gtkmm2/gtk/gtkmm/dialog.h @@ -187,11 +187,11 @@ public: /** Adds an activatable widget to the action area of a Gtk::Dialog, - * connecting a signal handler that will emit the "response" signal on - * the dialog when the widget is activated. The widget is appended to - * the end of the dialog's action area. If you want to add a - * non-activatable widget, simply pack it into the - * action_area field of the Gtk::Dialog struct. + * connecting a signal handler that will emit the Gtk::Dialog::response + * signal on the dialog when the widget is activated. The widget is + * appended to the end of the dialog's action area. If you want to add a + * non-activatable widget, simply pack it into the @a action_area field + * of the Gtk::Dialog struct. * @param child An activatable widget. * @param response_id Response ID for @a child . */ @@ -199,9 +199,9 @@ public: /** Adds a button with the given text (or a stock button, if @a button_text is a * stock ID) and sets things up so that clicking the button will emit the - * "response" signal with the given @a response_id . The button is appended to the - * end of the dialog's action area. The button widget is returned, but usually - * you don't need it. + * Gtk::Dialog::response signal with the given @a response_id . The button is + * appended to the end of the dialog's action area. The button widget is + * returned, but usually you don't need it. * @param button_text Text of button, or stock ID. * @param response_id Response ID for the button. * @return The button widget that was added. @@ -210,9 +210,9 @@ public: /** Adds a button with the given text (or a stock button, if @a button_text is a * stock ID) and sets things up so that clicking the button will emit the - * "response" signal with the given @a response_id . The button is appended to the - * end of the dialog's action area. The button widget is returned, but usually - * you don't need it. + * Gtk::Dialog::response signal with the given @a response_id . The button is + * appended to the end of the dialog's action area. The button widget is + * returned, but usually you don't need it. * @param button_text Text of button, or stock ID. * @param response_id Response ID for the button. * @return The button widget that was added. @@ -256,15 +256,7 @@ public: bool get_has_separator() const; - /** Returns true if dialogs are expected to use an alternative - * button order on the screen @a screen . See - * Gtk::Dialog::set_alternative_button_order() for more details - * about alternative button order. - * - * If you need to use this function, you should probably connect - * to the ::notify:gtk-alternative-button-order signal on the - * Gtk::Settings object associated to @a screen , in order to be - * notified if the button order setting changes. + /** Returns: Whether the alternative button order should be used * @param screen A Gdk::Screen, or 0 to use the default screen. * @return Whether the alternative button order should be used * @@ -292,10 +284,10 @@ public: void set_alternative_button_order_from_array(const Glib::ArrayHandle& new_order); - /** Emits the "response" signal with the given response ID. Used to - * indicate that the user has responded to the dialog in some way; + /** Emits the Gtk::Dialog::response signal with the given response ID. + * Used to indicate that the user has responded to the dialog in some way; * typically either you or run() will be monitoring the - * "response" signal and take appropriate action. + * ::response signal and take appropriate action. * @param response_id Response ID. */ void response(int response_id); @@ -358,9 +350,9 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED -/** + /** * @par Prototype: - * void %response(int response_id) + * void on_my_%response(int response_id) */ Glib::SignalProxy1< void,int > signal_response(); @@ -377,10 +369,13 @@ protected: namespace Glib { - /** @relates Gtk::Dialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Dialog */ Gtk::Dialog* wrap(GtkDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/drawingarea.cc b/libs/gtkmm2/gtk/gtkmm/drawingarea.cc index 20796b368c..a0ba952e9c 100644 --- a/libs/gtkmm2/gtk/gtkmm/drawingarea.cc +++ b/libs/gtkmm2/gtk/gtkmm/drawingarea.cc @@ -130,7 +130,8 @@ GType DrawingArea::get_base_type() DrawingArea::DrawingArea() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(drawingarea_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/drawingarea.h b/libs/gtkmm2/gtk/gtkmm/drawingarea.h index 0d0529c3a3..d164038df6 100644 --- a/libs/gtkmm2/gtk/gtkmm/drawingarea.h +++ b/libs/gtkmm2/gtk/gtkmm/drawingarea.h @@ -116,10 +116,13 @@ public: namespace Glib { - /** @relates Gtk::DrawingArea - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::DrawingArea */ Gtk::DrawingArea* wrap(GtkDrawingArea* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/editable.cc b/libs/gtkmm2/gtk/gtkmm/editable.cc index 4f02024475..37cc81645f 100644 --- a/libs/gtkmm2/gtk/gtkmm/editable.cc +++ b/libs/gtkmm2/gtk/gtkmm/editable.cc @@ -113,7 +113,7 @@ namespace Glib Glib::RefPtr wrap(GtkEditable* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -169,7 +169,7 @@ void Editable_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED void Editable_Class::do_insert_text_vfunc_callback(GtkEditable* self, const gchar* text, gint length, gint* position) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*) self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -177,37 +177,41 @@ void Editable_Class::do_insert_text_vfunc_callback(GtkEditable* self, const gcha // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->insert_text_vfunc( Glib::ustring(text, text + length), *position); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->insert_text_vfunc( Glib::ustring(text, text + length), *position); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->do_insert_text) + (*base->do_insert_text)( self, text, length, position); - // Call the original underlying C function: - if(base && base->do_insert_text) - (*base->do_insert_text)( self, text, length, position); - } } void Editable_Class::do_delete_text_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -215,39 +219,43 @@ void Editable_Class::do_delete_text_vfunc_callback(GtkEditable* self, gint start // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->delete_text_vfunc(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->delete_text_vfunc(start_pos , end_pos ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->do_delete_text) + (*base->do_delete_text)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->do_delete_text) - (*base->do_delete_text)(self, start_pos, end_pos); - } } gchar* Editable_Class::get_chars_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -255,42 +263,45 @@ gchar* Editable_Class::get_chars_vfunc_callback(GtkEditable* self, gint start_po // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_chars_vfunc(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_chars_vfunc(start_pos , end_pos )).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_chars) + return (*base->get_chars)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->get_chars) - return (*base->get_chars)(self, start_pos, end_pos); - } typedef gchar* RType; return RType(); } void Editable_Class::set_selection_bounds_vfunc_callback(GtkEditable* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -298,39 +309,43 @@ void Editable_Class::set_selection_bounds_vfunc_callback(GtkEditable* self, gint // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->select_region_vfunc(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->select_region_vfunc(start_pos , end_pos ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_selection_bounds) + (*base->set_selection_bounds)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->set_selection_bounds) - (*base->set_selection_bounds)(self, start_pos, end_pos); - } } gboolean Editable_Class::get_selection_bounds_vfunc_callback(GtkEditable* self, gint* start_pos, gint* end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -338,42 +353,45 @@ gboolean Editable_Class::get_selection_bounds_vfunc_callback(GtkEditable* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->get_selection_bounds_vfunc(*(start_pos) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->get_selection_bounds_vfunc(*(start_pos) , *(end_pos) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_selection_bounds) + return (*base->get_selection_bounds)(self, start_pos, end_pos); - // Call the original underlying C function: - if(base && base->get_selection_bounds) - return (*base->get_selection_bounds)(self, start_pos, end_pos); - } typedef gboolean RType; return RType(); } void Editable_Class::set_position_vfunc_callback(GtkEditable* self, gint position) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -381,38 +399,42 @@ void Editable_Class::set_position_vfunc_callback(GtkEditable* self, gint positio // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_position_vfunc(position + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_position_vfunc(position ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->set_position) + (*base->set_position)(self, position); - // Call the original underlying C function: - if(base && base->set_position) - (*base->set_position)(self, position); - } } gint Editable_Class::get_position_vfunc_callback(GtkEditable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -420,33 +442,36 @@ gint Editable_Class::get_position_vfunc_callback(GtkEditable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->get_position_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->get_position_vfunc(); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_position) + return (*base->get_position)(self); - // Call the original underlying C function: - if(base && base->get_position) - return (*base->get_position)(self); - } typedef gint RType; return RType(); @@ -456,7 +481,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Editable_Class::insert_text_callback(GtkEditable* self, const gchar* text, gint length, gint* position) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*) self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -464,37 +489,40 @@ void Editable_Class::insert_text_callback(GtkEditable* self, const gchar* text, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_insert_text( Glib::ustring(text, text + length), position); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_insert_text( Glib::ustring(text, text + length), position); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->insert_text) - (*base->insert_text)( self, text, length, position); - } + // Call the original underlying C function: + if(base && base->insert_text) + (*base->insert_text)( self, text, length, position); } void Editable_Class::delete_text_callback(GtkEditable* self, gint start_pos, gint end_pos) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -502,39 +530,42 @@ void Editable_Class::delete_text_callback(GtkEditable* self, gint start_pos, gin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_delete_text(start_pos + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_delete_text(start_pos , end_pos ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->delete_text) - (*base->delete_text)(self, start_pos, end_pos); - } + // Call the original underlying C function: + if(base && base->delete_text) + (*base->delete_text)(self, start_pos, end_pos); } void Editable_Class::changed_callback(GtkEditable* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -542,33 +573,36 @@ void Editable_Class::changed_callback(GtkEditable* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/editable.h b/libs/gtkmm2/gtk/gtkmm/editable.h index edc79ed88b..eecd4b17ce 100644 --- a/libs/gtkmm2/gtk/gtkmm/editable.h +++ b/libs/gtkmm2/gtk/gtkmm/editable.h @@ -72,8 +72,14 @@ private: protected: Editable(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit Editable(GtkEditable* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -135,17 +141,17 @@ public: Glib::SignalProxy2< void,const Glib::ustring&,int* > signal_insert_text(); -/** + /** * @par Prototype: - * void %delete_text(int start_pos, int end_pos) + * void on_my_%delete_text(int start_pos, int end_pos) */ Glib::SignalProxy2< void,int,int > signal_delete_text(); -/** + /** * @par Prototype: - * void %changed() + * void on_my_%changed() */ Glib::SignalProxy0< void > signal_changed(); @@ -210,10 +216,13 @@ virtual void insert_text_vfunc(const Glib::ustring& text, int& position); namespace Glib { - /** @relates Gtk::Editable - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Editable */ Glib::RefPtr wrap(GtkEditable* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/entry.cc b/libs/gtkmm2/gtk/gtkmm/entry.cc index 9c10aecef8..29beb397c4 100644 --- a/libs/gtkmm2/gtk/gtkmm/entry.cc +++ b/libs/gtkmm2/gtk/gtkmm/entry.cc @@ -169,7 +169,7 @@ void Entry_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Entry_Class::populate_popup_callback(GtkEntry* self, GtkMenu* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -177,37 +177,40 @@ void Entry_Class::populate_popup_callback(GtkEntry* self, GtkMenu* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_populate_popup(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_populate_popup(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->populate_popup) - (*base->populate_popup)(self, p0); - } + // Call the original underlying C function: + if(base && base->populate_popup) + (*base->populate_popup)(self, p0); } void Entry_Class::insert_at_cursor_callback(GtkEntry* self, const gchar* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -215,37 +218,40 @@ void Entry_Class::insert_at_cursor_callback(GtkEntry* self, const gchar* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_insert_at_cursor(Glib::convert_const_gchar_ptr_to_ustring(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_insert_at_cursor(Glib::convert_const_gchar_ptr_to_ustring(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->insert_at_cursor) - (*base->insert_at_cursor)(self, p0); - } + // Call the original underlying C function: + if(base && base->insert_at_cursor) + (*base->insert_at_cursor)(self, p0); } void Entry_Class::activate_callback(GtkEntry* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -253,32 +259,35 @@ void Entry_Class::activate_callback(GtkEntry* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_activate(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_activate(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->activate) - (*base->activate)(self); - } + // Call the original underlying C function: + if(base && base->activate) + (*base->activate)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -324,7 +333,8 @@ GType Entry::get_base_type() Entry::Entry() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(entry_class_.init())) { } @@ -439,6 +449,26 @@ int Entry::text_index_to_layout_index(int text_index) const return gtk_entry_text_index_to_layout_index(const_cast(gobj()), text_index); } +void Entry::set_cursor_hadjustment(Adjustment& adjustment) +{ +gtk_entry_set_cursor_hadjustment(gobj(), (adjustment).gobj()); +} + +Adjustment* Entry::get_cursor_hadjustment() +{ + + Adjustment* retvalue = Glib::wrap(gtk_entry_get_cursor_hadjustment(gobj())); + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; + +} + +const Adjustment* Entry::get_cursor_hadjustment() const +{ + return const_cast(this)->get_cursor_hadjustment(); +} + void Entry::set_alignment(float xalign) { gtk_entry_set_alignment(gobj(), xalign); diff --git a/libs/gtkmm2/gtk/gtkmm/entry.h b/libs/gtkmm2/gtk/gtkmm/entry.h index 4b2eb14177..d042590c3e 100644 --- a/libs/gtkmm2/gtk/gtkmm/entry.h +++ b/libs/gtkmm2/gtk/gtkmm/entry.h @@ -32,6 +32,7 @@ #include #include #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -128,6 +129,16 @@ public: Entry(); + /** Sets whether the contents of the entry are visible or not. + * When visibility is set to false, characters are displayed + * as the invisible char, and will also appear that way when + * the text in the entry widget is copied elsewhere. + * + * The default invisible char is the asterisk '*', but it can + * be changed with set_invisible_char(). + * @param visible true if the contents of the entry are displayed + * as plaintext. + */ void set_visibility(bool visible = true); /** Retrieves whether the text in @a entry is visible. See @@ -148,7 +159,7 @@ public: void set_invisible_char(gunichar ch); /** Retrieves the character displayed in place of the real characters - * for entries with visisbility set to false. See set_invisible_char(). + * for entries with visibility set to false. See set_invisible_char(). * @return The current invisible char, or 0, if the entry does not * show invisible text at all. */ @@ -165,8 +176,26 @@ public: bool get_has_frame() const; + /** Sets %entry's inner-border property to %border, or clears it if 0 + * is passed. The inner-border is the area around the entry's text, but + * inside its frame. + * + * If set, this property overrides the inner-border style property. + * Overriding the style-provided border is useful when you want to do + * in-place editing of some text in a canvas or list widget, where + * pixel-exact positioning of the entry is important. + * + * @newin2p10 + * @param border A Gtk::Border, or 0. + */ void set_inner_border(const Border& border); + /** This function returns the entry's Gtk::Entry:inner-border property. See + * set_inner_border() for more information. + * @return The entry's Gtk::Border, or 0 if none was set. + * + * @newin2p10. + */ Border get_inner_border() const; @@ -193,7 +222,7 @@ public: * * (For experts: if @a setting is true, the entry calls * Gtk::Window::activate_default() on the window containing the entry, in - * the default handler for the "activate" signal.) + * the default handler for the Gtk::Widget::activate signal.) * @param setting true to activate window's default widget on Enter keypress. */ void set_activates_default(bool setting = true); @@ -217,12 +246,16 @@ public: */ int get_width_chars() const; + /** Sets the text in the widget to the given + * value, replacing the current contents. + * @param text The new text. + */ void set_text(const Glib::ustring &text); /** Retrieves the contents of the entry widget. * See also Gtk::Editable::get_chars(). * @return A pointer to the contents of the widget as a - * string. This string points to internally allocated + * string. This string points to internally allocated * storage in the widget and must not be freed, modified or * stored. */ @@ -299,6 +332,39 @@ public: int text_index_to_layout_index(int text_index) const; + /** Hooks up an adjustment to the cursor position in an entry, so that when + * the cursor is moved, the adjustment is scrolled to show that position. + * See Gtk::ScrolledWindow::get_hadjustment() for a typical way of obtaining + * the adjustment. + * + * The adjustment has to be in pixel units and in the same coordinate system + * as the entry. + * + * @newin2p12 + * @param adjustment An adjustment which should be adjusted when the cursor + * is moved, or 0. + */ + void set_cursor_hadjustment (Adjustment& adjustment); + + /** Retrieves the horizontal cursor adjustment for the entry. + * See set_cursor_hadjustment(). + * @return The horizontal cursor adjustment, or 0 + * if none has been set. + * + * @newin2p12. + */ + Adjustment* get_cursor_hadjustment(); + + /** Retrieves the horizontal cursor adjustment for the entry. + * See set_cursor_hadjustment(). + * @return The horizontal cursor adjustment, or 0 + * if none has been set. + * + * @newin2p12. + */ + const Adjustment* get_cursor_hadjustment() const; + + /** Sets the alignment for the contents of the entry. This controls * the horizontal positioning of the contents when the displayed * text is shorter than the width of the entry. @@ -329,21 +395,22 @@ public: /** Sets @a completion to be the auxiliary completion object to use with @a entry . * All further configuration of the completion mechanism is done on - * @a completion using the Gtk::EntryCompletion API. + * @a completion using the Gtk::EntryCompletion API. Completion is disabled if + * @a completion is set to 0. * * @newin2p4 - * @param completion The Gtk::EntryCompletion. + * @param completion The Gtk::EntryCompletion or 0. */ void set_completion(const Glib::RefPtr& completion); - /** Returns the auxiliary completion object currently in use by @a entry . + /** Return value: The auxiliary completion object currently in use by @a entry . * @return The auxiliary completion object currently in use by @a entry . * * @newin2p4. */ Glib::RefPtr get_completion(); - /** Returns the auxiliary completion object currently in use by @a entry . + /** Return value: The auxiliary completion object currently in use by @a entry . * @return The auxiliary completion object currently in use by @a entry . * * @newin2p4. @@ -353,17 +420,17 @@ public: guint16 get_text_length() const; -/** + /** * @par Prototype: - * void %populate_popup(Menu* menu) + * void on_my_%populate_popup(Menu* menu) */ Glib::SignalProxy1< void,Menu* > signal_populate_popup(); -/** + /** * @par Prototype: - * void %insert_at_cursor(const Glib::ustring& str) + * void on_my_%insert_at_cursor(const Glib::ustring& str) */ Glib::SignalProxy1< void,const Glib::ustring& > signal_insert_at_cursor(); @@ -375,9 +442,9 @@ public: // http://mail.gnome.org/archives/gtk-devel-list/2003-January/msg00108.html // "activate is probably about the only exception" -/** + /** * @par Prototype: - * void %activate() + * void on_my_%activate() */ Glib::SignalProxy0< void > signal_activate(); @@ -624,10 +691,13 @@ public: namespace Glib { - /** @relates Gtk::Entry - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Entry */ Gtk::Entry* wrap(GtkEntry* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc b/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc index 83c619c9a8..4033251429 100644 --- a/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc +++ b/libs/gtkmm2/gtk/gtkmm/entrycompletion.cc @@ -176,6 +176,79 @@ const Glib::SignalProxyInfo EntryCompletion_signal_match_selected_info = (GCallback) &Widget_signal_match_selected_notify_callback }; + +static gboolean Widget_signal_cursor_on_match_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter, void* data) +{ + using namespace Gtk; + typedef sigc::slot< bool, const TreeModel::iterator& > SlotType; + + // Do not try to call a signal on a disassociated wrapper. + if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + { + //This conversion is the custom-written part: + Gtk::TreeModel::iterator cppIter(c_model, c_iter); + + return static_cast( (*static_cast(slot))(cppIter) ); + } + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } + + typedef gboolean RType; + return RType(); +} + +static gboolean Widget_signal_cursor_on_match_notify_callback(GtkEntryCompletion* self, GtkTreeModel* c_model, GtkTreeIter* c_iter, void* data) +{ + using namespace Gtk; + typedef sigc::slot< void, const TreeModel::iterator& > SlotType; + + // Do not try to call a signal on a disassociated wrapper. + if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + { + //This conversion is the custom-written part: + Gtk::TreeModel::iterator cppIter(c_model, c_iter); + + (*static_cast(slot))(cppIter); + } + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } + + typedef gboolean RType; + return RType(); +} + + +const Glib::SignalProxyInfo EntryCompletion_signal_cursor_on_match_info = +{ + "match_selected", + (GCallback) &Widget_signal_cursor_on_match_callback, + (GCallback) &Widget_signal_cursor_on_match_notify_callback +}; + } //anonymous namespace @@ -250,6 +323,11 @@ Glib::SignalProxy1< bool, const TreeModel::iterator& > EntryCompletion::signal_m return Glib::SignalProxy1< bool, const TreeModel::iterator& >(this, &EntryCompletion_signal_match_selected_info); } +Glib::SignalProxy1< bool, const TreeModel::iterator& > EntryCompletion::signal_cursor_on_match() +{ + return Glib::SignalProxy1< bool, const TreeModel::iterator& >(this, &EntryCompletion_signal_cursor_on_match_info); +} + } // namespace Gtk @@ -416,7 +494,7 @@ void EntryCompletion_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void EntryCompletion_Class::action_activated_callback(GtkEntryCompletion* self, gint p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -424,33 +502,36 @@ void EntryCompletion_Class::action_activated_callback(GtkEntryCompletion* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_action_activated(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_action_activated(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->action_activated) - (*base->action_activated)(self, p0); - } + // Call the original underlying C function: + if(base && base->action_activated) + (*base->action_activated)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -498,7 +579,8 @@ GType EntryCompletion::get_base_type() EntryCompletion::EntryCompletion() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(entrycompletion_class_.init())) { } @@ -572,6 +654,16 @@ bool EntryCompletion::get_inline_completion() const return gtk_entry_completion_get_inline_completion(const_cast(gobj())); } +void EntryCompletion::set_inline_selection(bool inline_selection) +{ +gtk_entry_completion_set_inline_selection(gobj(), static_cast(inline_selection)); +} + +bool EntryCompletion::get_inline_selection() const +{ + return gtk_entry_completion_get_inline_selection(const_cast(gobj())); +} + void EntryCompletion::set_popup_completion(bool popup_completion) { gtk_entry_completion_set_popup_completion(gobj(), static_cast(popup_completion)); @@ -602,6 +694,11 @@ bool EntryCompletion::get_popup_single_match() const return gtk_entry_completion_get_popup_single_match(const_cast(gobj())); } +Glib::ustring EntryCompletion::get_completion_prefix() const +{ + return Glib::convert_const_gchar_ptr_to_ustring(gtk_entry_completion_get_completion_prefix(const_cast(gobj()))); +} + void EntryCompletion::set_text_column(const TreeModelColumnBase& column) { gtk_entry_completion_set_text_column(gobj(), (column).index()); @@ -728,6 +825,20 @@ Glib::PropertyProxy_ReadOnly EntryCompletion::property_popup_single_match( } #endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy EntryCompletion::property_inline_selection() +{ + return Glib::PropertyProxy(this, "inline-selection"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly EntryCompletion::property_inline_selection() const +{ + return Glib::PropertyProxy_ReadOnly(this, "inline-selection"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Gtk::EntryCompletion::on_action_activated(int index) diff --git a/libs/gtkmm2/gtk/gtkmm/entrycompletion.h b/libs/gtkmm2/gtk/gtkmm/entrycompletion.h index d4086b2bfb..ff887b441b 100644 --- a/libs/gtkmm2/gtk/gtkmm/entrycompletion.h +++ b/libs/gtkmm2/gtk/gtkmm/entrycompletion.h @@ -43,6 +43,34 @@ namespace Gtk class Entry; //TODO: This should derive+implement from CellLayout, when we can break ABI. +//Then we should add "It derives from the Gtk::CellLayout, to allow the user to add extra cells to the Gtk::TreeView with completion matches". + +/** Completion functionality for Gtk::Entry. + * + * Gtk::EntryCompletion is an auxiliary object to be used in conjunction with + * Gtk::Entry to provide the completion functionality. + * + * "Completion functionality" means that when the user modifies the text in the + * entry, Gtk::EntryCompletion checks which rows in the model match the current + * content of the entry, and displays a list of matches. By default, the + * matching is done by comparing the entry text case-insensitively against + * the text column of the model (see set_text_column()), + * but this can be overridden with a custom match function (see set_match_func()). + * + * When the user selects a completion, the content of the entry is updated. + * By default, the content of the entry is replaced by the text column of the + * model, but this can be overridden by connecting to the match_selected signal + * and updating the entry in the signal handler. Note that you should return true + * from the signal handler to suppress the default behaviour. + * + * To add completion functionality to an entry, use Gtk::Entry::set_completion(). + * + * In addition to regular completion matches, which will be inserted into + * the entry when they are selected, Gtk::EntryCompletion also allows the display of + * "actions" in the popup window. Their appearance is similar to menu items, + * to differentiate them clearly from completion strings. When an action is + * selected, the action_activated signal is emitted. + */ class EntryCompletion : public Glib::Object { @@ -123,16 +151,16 @@ public: */ void set_model(const Glib::RefPtr& model); - /** Returns the model the Gtk::EntryCompletion is using as data source. - * Returns 0 if the model is unset. + /** Returns 0 if the model is unset. + * Return value: A Gtk::TreeModel, or 0 if none is currently being used. * @return A Gtk::TreeModel, or 0 if none is currently being used. * * @newin2p4. */ Glib::RefPtr get_model(); - /** Returns the model the Gtk::EntryCompletion is using as data source. - * Returns 0 if the model is unset. + /** Returns 0 if the model is unset. + * Return value: A Gtk::TreeModel, or 0 if none is currently being used. * @return A Gtk::TreeModel, or 0 if none is currently being used. * * @newin2p4. @@ -155,7 +183,7 @@ public: */ void set_minimum_key_length(int length); - /** Returns the minimum key length as set for @a completion . + /** Return value: The currently used minimum key length. * @return The currently used minimum key length. * * @newin2p4. @@ -207,14 +235,28 @@ public: */ void set_inline_completion(bool inline_completion = true); - /** Returns whether the common prefix of the possible completions should - * be automatically inserted in the entry. + /** Return value: true if inline completion is turned on * @return true if inline completion is turned on * * @newin2p6. */ bool get_inline_completion() const; + /** Sets whether it is possible to cycle through the possible completions + * inside the entry. + * + * @newin2p12 + * @param inline_selection true to do inline selection. + */ + void set_inline_selection(bool inline_selection = true); + + /** Returns: true if inline-selection mode is on + * @return true if inline-selection mode is on + * + * @newin2p12. + */ + bool get_inline_selection() const; + /** Sets whether the completions should be presented in a popup window. * * @newin2p6 @@ -222,7 +264,7 @@ public: */ void set_popup_completion(bool popup_completion = true); - /** Returns whether the completions should be presented in a popup window. + /** Return value: true if popup completion is turned on * @return true if popup completion is turned on * * @newin2p6. @@ -238,14 +280,15 @@ public: */ void set_popup_set_width(bool popup_set_width = true); - /** Returns whether the completion popup window will be resized to the - * width of the entry. + /** Return value: true if the popup window will be resized to the width of * @return true if the popup window will be resized to the width of * the entry * * @newin2p8. */ bool get_popup_set_width() const; + + //TODO This is wrongly named: Deprecate it and add set_popup_single_match(). /** Sets whether the completion popup window will appear even if there is * only a single match. You may want to set this to false if you @@ -257,15 +300,23 @@ public: * match. */ void set_popup_single_width(bool popup_single_match = true); + - /** Returns whether the completion popup window will appear even if there is - * only a single match. + /** Return value: true if the popup window will appear regardless of the * @return true if the popup window will appear regardless of the * number of matches. * * @newin2p8. */ bool get_popup_single_match() const; + + /** Get the original text entered by the user that triggered + * the completion or an empty string if there's no completion ongoing. + * @return The prefix for the current completion + * + * @newin2p12. + */ + Glib::ustring get_completion_prefix() const; /** Convenience function for setting up the most used case of this code: a @@ -296,7 +347,7 @@ public: */ void set_text_column(int column); - /** Returns the column in the model of @a completion to get strings from. + /** Return value: the column containing the strings * @return The column containing the strings * * @newin2p6. @@ -306,20 +357,18 @@ public: /** Emitted when an action is activated. * * @param index The index of the activated action. - */ - -/** + * * @par Prototype: - * void %action_activated(int index) + * void on_my_%action_activated(int index) */ Glib::SignalProxy1< void,int > signal_action_activated(); - //We completely hand-code this signal because we want to change how the parameters are wrapped, + //We completely hand-code these signals because we want to change how the parameters are wrapped, //because we need both the iter and the model to make the C++ iter. - + /** Emitted when a match from the list is selected. * The default behaviour is to replace the contents of the * entry with the contents of the text column in the row @@ -330,13 +379,30 @@ public: * @result true if the signal has been handled * * @par Prototype: - * bool %match_selected(const TreeModel::iterator& iter) + * bool %on_match_selected(const TreeModel::iterator& iter) */ Glib::SignalProxy1< bool, const TreeModel::iterator& > signal_match_selected(); - - //We use no_default_handler for this, because we can not add a new vfunc to 2.5 without breaking ABI. + /** Emitted when a match from the cursor is on a match + * of the list. The default behaviour is to replace the contents + * of the entry with the contents of the text column in the row + * pointed to by @a iter. + * + * @param model The TreeModel containing the matches + * @param iter A TreeModel::iterator positioned at the selected match + * @result true if the signal has been handled + * + * @par Prototype: + * bool %on_cursor_on_match(const TreeModel::iterator& iter) + * + * @newin2p12 + */ + Glib::SignalProxy1< bool, const TreeModel::iterator& > signal_cursor_on_match(); + + + //We use no_default_handler for these signals, because we can not add a new vfunc without breaking ABI. //TODO: Remove no_default_handler when we do an ABI-break-with-parallel-install. + /** Emitted when the inline autocompletion is triggered. * The default behaviour is to make the entry display the * whole prefix and select the newly inserted part. @@ -350,15 +416,13 @@ public: * * @param prefix The common prefix of all possible completions. * @result true if the signal has been handled - */ - -/** + * * @par Prototype: - * bool %insert_prefix(const Glib::ustring& prefix) + * bool on_my_%insert_prefix(const Glib::ustring& prefix) */ Glib::SignalProxy1< bool,const Glib::ustring& > signal_insert_prefix(); - + #ifdef GLIBMM_PROPERTIES_ENABLED /** The model to find matches in. @@ -500,12 +564,33 @@ public: Glib::PropertyProxy_ReadOnly property_popup_single_match() const; #endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Your description here. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_inline_selection() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Your description here. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_inline_selection() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + protected: #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED //Default Signal Handler: - virtual bool on_match_selected(const TreeModel::iterator& iter); + virtual bool on_match_selected(const TreeModel::iterator& iter); + //No default handler for on_cursor_on_match(), to preserver ABI. TODO: Add this when we can break ABI. #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -534,10 +619,13 @@ protected: namespace Glib { - /** @relates Gtk::EntryCompletion - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::EntryCompletion */ Glib::RefPtr wrap(GtkEntryCompletion* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/enums.h b/libs/gtkmm2/gtk/gtkmm/enums.h index 052f7ecf40..23c1f19036 100644 --- a/libs/gtkmm2/gtk/gtkmm/enums.h +++ b/libs/gtkmm2/gtk/gtkmm/enums.h @@ -148,6 +148,8 @@ namespace Gtk /** Used to indicate the direction in which a Gtk::Arrow should point. + */ +/** * @ingroup gtkmmEnums */ enum ArrowType @@ -198,6 +200,8 @@ namespace Gtk */ /** Denotes the expansion properties that a widget will have when it (or its parent) is resized. + */ +/** * @ingroup gtkmmEnums * @par Bitwise operators: * %AttachOptions operator|(AttachOptions, AttachOptions)
@@ -284,7 +288,8 @@ enum ButtonBoxStyle BUTTONBOX_SPREAD, BUTTONBOX_EDGE, BUTTONBOX_START, - BUTTONBOX_END + BUTTONBOX_END, + BUTTONBOX_CENTER }; } // namespace Gtk @@ -1078,7 +1083,9 @@ namespace Gtk enum TargetFlags { TARGET_SAME_APP = 1 << 0, - TARGET_SAME_WIDGET = 1 << 1 + TARGET_SAME_WIDGET = 1 << 1, + TARGET_OTHER_APP = 1 << 2, + TARGET_OTHER_WIDGET = 1 << 3 }; /** @ingroup gtkmmEnums */ diff --git a/libs/gtkmm2/gtk/gtkmm/eventbox.cc b/libs/gtkmm2/gtk/gtkmm/eventbox.cc index 25dc971d05..5d10e277f6 100644 --- a/libs/gtkmm2/gtk/gtkmm/eventbox.cc +++ b/libs/gtkmm2/gtk/gtkmm/eventbox.cc @@ -129,7 +129,8 @@ GType EventBox::get_base_type() EventBox::EventBox() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(eventbox_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/eventbox.h b/libs/gtkmm2/gtk/gtkmm/eventbox.h index 74854dd095..1ff0344a10 100644 --- a/libs/gtkmm2/gtk/gtkmm/eventbox.h +++ b/libs/gtkmm2/gtk/gtkmm/eventbox.h @@ -116,8 +116,7 @@ public: EventBox(); - /** Returns whether the event box has a visible window. - * See set_visible_window() for details. + /** Return value: true if the event box window is visible * @return true if the event box window is visible * * @newin2p4. @@ -127,7 +126,7 @@ public: /** Set whether the event box uses a visible or invisible child * window. The default is to use visible windows. * - * In an invisible window event box, the window that that the + * In an invisible window event box, the window that the * event box creates is a Gdk::INPUT_ONLY window, which * means that it is invisible and only serves to receive * events. @@ -165,9 +164,7 @@ public: */ void set_visible_window(bool visible_window = true); - /** Returns whether the event box window is above or below the - * windows of its child. See set_above_child() for - * details. + /** Return value: true if the event box window is above the window * @return true if the event box window is above the window * of its child. * @@ -236,10 +233,13 @@ public: namespace Glib { - /** @relates Gtk::EventBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::EventBox */ Gtk::EventBox* wrap(GtkEventBox* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/expander.cc b/libs/gtkmm2/gtk/gtkmm/expander.cc index 7a14dda085..0ef35d09e8 100644 --- a/libs/gtkmm2/gtk/gtkmm/expander.cc +++ b/libs/gtkmm2/gtk/gtkmm/expander.cc @@ -33,8 +33,9 @@ namespace Gtk Expander::Expander(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(expander_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(expander_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) {} } // namespace Gtk @@ -141,7 +142,8 @@ GType Expander::get_base_type() Expander::Expander() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(expander_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/expander.h b/libs/gtkmm2/gtk/gtkmm/expander.h index cb9e89894c..fcc4b4a357 100644 --- a/libs/gtkmm2/gtk/gtkmm/expander.h +++ b/libs/gtkmm2/gtk/gtkmm/expander.h @@ -218,8 +218,7 @@ public: */ void set_use_underline(bool use_underline = true); - /** Returns whether an embedded underline in the expander label indicates a - * mnemonic. See set_use_underline(). + /** Return value: true if an embedded underline in the expander label * @return true if an embedded underline in the expander label * indicates the mnemonic accelerator keys. * @@ -236,9 +235,7 @@ public: */ void set_use_markup(bool use_markup = true); - /** Returns whether the label's text is interpreted as marked up with - * the Pango text markup - * language. See set_use_markup(). + /** Return value: true if the label's text will be parsed for markup * @return true if the label's text will be parsed for markup * * @newin2p4. @@ -333,7 +330,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The text of the label includes XML markup. See pango_parse_markup. +/** The text of the label includes XML markup. See pango_parse_markup(). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -343,7 +340,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The text of the label includes XML markup. See pango_parse_markup. +/** The text of the label includes XML markup. See pango_parse_markup(). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -401,10 +398,13 @@ public: namespace Glib { - /** @relates Gtk::Expander - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Expander */ Gtk::Expander* wrap(GtkExpander* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/filechooser.cc b/libs/gtkmm2/gtk/gtkmm/filechooser.cc index ae4be56d65..67e02cbe84 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooser.cc +++ b/libs/gtkmm2/gtk/gtkmm/filechooser.cc @@ -181,7 +181,7 @@ namespace Glib Glib::RefPtr wrap(GtkFileChooser* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } diff --git a/libs/gtkmm2/gtk/gtkmm/filechooser.h b/libs/gtkmm2/gtk/gtkmm/filechooser.h index 24a51c0a6f..f39951c9f1 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooser.h +++ b/libs/gtkmm2/gtk/gtkmm/filechooser.h @@ -107,9 +107,8 @@ namespace Gtk { -//TODO: //Is GTK_FILE_SYSTEM_ERROR really part of the public API? For instance, do app writers ever need to check for it?. -//If so, then it needs to have a generated get_type() function, like the others. murrayc. -//_TODO_GERROR(FileSystemError,GtkFileSystemError,GTK_FILE_SYSTEM_ERROR) +//Note that GTK_FILE_SYSTEM_ERROR is not currently public GTK+ API and should +//never be instantiated by the GTK+ C API. /** Exception class for Gdk::FileChooser errors. */ @@ -218,8 +217,14 @@ private: protected: FileChooser(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit FileChooser(GtkFileChooser* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -287,8 +292,7 @@ public: /** Sets whether multiple files can be selected in the file selector. This is * only relevant if the action is set to be GTK_FILE_CHOOSER_ACTION_OPEN or - * GTK_FILE_CHOOSER_ACTION_SAVE. It cannot be set with either of the folder - * actions. + * GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER. * * @newin2p4 * @param select_multiple true if multiple files can be selected. @@ -451,9 +455,8 @@ public: * @a chooser . The returned names are full absolute paths. If files in the current * folder cannot be represented as local filenames they will be ignored. (See * get_uris()) - * @return A G::SList containing the filenames of all selected - * files and subfolders in the current folder. Free the returned list - * with Glib::slist_free(), and the filenames with Glib::free(). + * @return A list containing the filenames of all selected + * files and subfolders in the current folder. * * @newin2p4. */ @@ -472,10 +475,10 @@ public: /** Gets the current folder of @a chooser as a local filename. * See set_current_folder(). - * @return The full path of the current folder, or 0 if the current - * path cannot be represented as a local filename. Free with Glib::free(). This - * function will also return 0 if the file chooser was unable to load the - * last folder that was requested from it; for example, as would be for calling + * @return The full path of the current folder, possibly empty if the current + * path cannot be represented as a local filename. This function may also return + * and empty string if the file chooser was unable to load the last folder that was + * requested from it; for example, as would be for calling * set_current_folder() on a nonexistent folder. * * @newin2p4. @@ -559,9 +562,8 @@ public: /** Lists all the selected files and subfolders in the current folder of * @a chooser . The returned names are full absolute URIs. - * @return A G::SList containing the URIs of all selected - * files and subfolders in the current folder. Free the returned list - * with Glib::slist_free(), and the filenames with Glib::free(). + * @return A list containing the URIs of all selected + * files and subfolders in the current folder. * * @newin2p4. */ @@ -581,6 +583,14 @@ public: /** Gets the current folder of @a chooser as an URI. * See set_current_folder_uri(). + * + * Note that this is the folder that the file chooser is currently displaying + * (e.g. "file:///home/username/Documents"), which is not the same + * as the currently-selected folder if the chooser is in + * Gtk::FILE_CHOOSER_SELECT_FOLDER mode + * (e.g. "file:///home/username/Documents/selected-folder/". To get the + * currently-selected folder in that mode, use get_uri() as the + * usual way to get the selection. * @return The URI for the current folder. */ Glib::ustring get_current_folder_uri() const; @@ -731,10 +741,8 @@ public: /** Lists the current set of user-selectable filters; see * add_filter(), remove_filter(). - * @return A G::SList containing the current set of - * user selectable filters. The contents of the list are - * owned by GTK+, but you must free the list itself with - * Glib::slist_free() when you are done with it. + * @return A list containing the current set of + * user selectable filters. * * @newin2p4. */ @@ -742,10 +750,8 @@ public: /** Lists the current set of user-selectable filters; see * add_filter(), remove_filter(). - * @return A G::SList containing the current set of - * user selectable filters. The contents of the list are - * owned by GTK+, but you must free the list itself with - * Glib::slist_free() when you are done with it. + * @return A list containing the current set of + * user selectable filters. * * @newin2p4. */ @@ -861,9 +867,7 @@ public: /** Queries the list of shortcut folders in the file chooser, as set by * add_shortcut_folder_uri(). - * @return A list of folder URIs, or 0 if there are no shortcut - * folders. Free the returned list with Glib::slist_free(), and the URIs with - * Glib::free(). + * @return A list of folder URIs * * @newin2p4. */ @@ -881,11 +885,9 @@ public: * * @see set_current_folder(), get_current_folder(), * set_current_folder_uri(), get_current_folder_uri(). - */ - -/** + * * @par Prototype: - * void %current_folder_changed() + * void on_my_%current_folder_changed() */ Glib::SignalProxy0< void > signal_current_folder_changed(); @@ -904,11 +906,9 @@ public: * get_filenames(), select_uri(), * unselect_uri(), get_uri(), * get_uris(). - */ - -/** + * * @par Prototype: - * void %selection_changed() + * void on_my_%selection_changed() */ Glib::SignalProxy0< void > signal_selection_changed(); @@ -929,11 +929,9 @@ public: * * @see set_preview_widget(), set_preview_widget_active(), * set_use_preview_label(), get_preview_filename(), get_preview_uri(). - */ - -/** + * * @par Prototype: - * void %update_preview() + * void on_my_%update_preview() */ Glib::SignalProxy0< void > signal_update_preview(); @@ -948,22 +946,17 @@ public: * dialog. * * @see get_filename(), get_filenames(), get_uri(), get_uris(). - */ - -/** + * * @par Prototype: - * void %file_activated() + * void on_my_%file_activated() */ Glib::SignalProxy0< void > signal_file_activated(); - /** TODO - */ - -/** + /** * @par Prototype: - * FileChooserConfirmation %confirm_overwrite() + * FileChooserConfirmation on_my_%confirm_overwrite() */ Glib::SignalProxy0< FileChooserConfirmation > signal_confirm_overwrite(); @@ -1215,10 +1208,13 @@ protected: namespace Glib { - /** @relates Gtk::FileChooser - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FileChooser */ Glib::RefPtr wrap(GtkFileChooser* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc index 730a0f70c4..81d066cabc 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.cc @@ -33,8 +33,9 @@ namespace Gtk FileChooserButton::FileChooserButton(FileChooserAction action) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "action",action, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "action",action, static_cast(0))) { } @@ -144,22 +145,25 @@ GType FileChooserButton::get_base_type() FileChooserButton::FileChooserButton(const Glib::ustring& title, FileChooserAction action) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "title", title.c_str(), "action", ((GtkFileChooserAction)(action)), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "title", title.c_str(), "action", ((GtkFileChooserAction)(action)), static_cast(0))) { } FileChooserButton::FileChooserButton(const Glib::ustring& title, FileChooserAction action, const Glib::ustring& backend) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "title", title.c_str(), "action", ((GtkFileChooserAction)(action)), "backend", backend.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "title", title.c_str(), "action", ((GtkFileChooserAction)(action)), "backend", backend.c_str(), static_cast(0))) { } FileChooserButton::FileChooserButton(FileChooserDialog& dialog) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "dialog", (dialog).Gtk::Widget::gobj(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::HBox(Glib::ConstructParams(filechooserbutton_class_.init(), "dialog", (dialog).Gtk::Widget::gobj(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h index a6de8ea035..3b3253cabf 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/filechooserbutton.h @@ -180,10 +180,27 @@ public: void set_width_chars(int n_chars); + /** Return value: true if the button grabs focus when it is clicked with + * @return true if the button grabs focus when it is clicked with + * the mouse. + * + * @newin2p10. + */ bool get_focus_on_click() const; + /** Sets whether the button will grab focus when it is clicked with the mouse. + * Making mouse clicks not grab focus is useful in places like toolbars where + * you don't want the keyboard focus removed from the main area of the + * application. + * + * @newin2p10 + * @param focus_on_click Whether the button grabs focus when clicked with the mouse. + */ void set_focus_on_click(gboolean focus_on_click = true); + //I'm no totally convinced that this is only a key-binding signal. murrayc: + + #ifdef GLIBMM_PROPERTIES_ENABLED /** The file chooser dialog to use. * @@ -264,10 +281,13 @@ public: namespace Glib { - /** @relates Gtk::FileChooserButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FileChooserButton */ Gtk::FileChooserButton* wrap(GtkFileChooserButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc index dc48e4337c..5077f0e3ce 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.cc @@ -34,30 +34,34 @@ namespace Gtk FileChooserDialog::FileChooserDialog(Gtk::Window& parent, const Glib::ustring& title, FileChooserAction action) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action, static_cast(0))) { set_transient_for(parent); } FileChooserDialog::FileChooserDialog(const Glib::ustring& title, FileChooserAction action) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action, static_cast(0))) { } FileChooserDialog::FileChooserDialog(const Glib::ustring& title, FileChooserAction action, const Glib::ustring& backend) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action,"file-system-backend",backend.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action,"file-system-backend",backend.c_str(), static_cast(0))) { } FileChooserDialog::FileChooserDialog(Gtk::Window& parent, const Glib::ustring& title, FileChooserAction action, const Glib::ustring& backend) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action,"file-system-backend",backend.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(filechooserdialog_class_.init(), "title",title.c_str(),"action",(GtkFileChooserAction)action,"file-system-backend",backend.c_str(), static_cast(0))) { set_transient_for(parent); } diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h index e6c818c1dc..3a91bf2dc6 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h +++ b/libs/gtkmm2/gtk/gtkmm/filechooserdialog.h @@ -125,10 +125,13 @@ public: namespace Glib { - /** @relates Gtk::FileChooserDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FileChooserDialog */ Gtk::FileChooserDialog* wrap(GtkFileChooserDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc index 59d9fece59..127e71631c 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc +++ b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.cc @@ -137,22 +137,25 @@ GType FileChooserWidget::get_base_type() FileChooserWidget::FileChooserWidget() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::VBox(Glib::ConstructParams(filechooserwidget_class_.init())) { } FileChooserWidget::FileChooserWidget(FileChooserAction action) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::VBox(Glib::ConstructParams(filechooserwidget_class_.init(), "action", ((GtkFileChooserAction)(action)), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::VBox(Glib::ConstructParams(filechooserwidget_class_.init(), "action", ((GtkFileChooserAction)(action)), static_cast(0))) { } FileChooserWidget::FileChooserWidget(FileChooserAction action, const Glib::ustring& backend) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::VBox(Glib::ConstructParams(filechooserwidget_class_.init(), "action", ((GtkFileChooserAction)(action)), "backend", backend.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::VBox(Glib::ConstructParams(filechooserwidget_class_.init(), "action", ((GtkFileChooserAction)(action)), "backend", backend.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h index 2a40a95b94..f64bc87846 100644 --- a/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h +++ b/libs/gtkmm2/gtk/gtkmm/filechooserwidget.h @@ -136,10 +136,13 @@ public: namespace Glib { - /** @relates Gtk::FileChooserWidget - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FileChooserWidget */ Gtk::FileChooserWidget* wrap(GtkFileChooserWidget* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/filefilter.cc b/libs/gtkmm2/gtk/gtkmm/filefilter.cc index 4c6bc09958..8cbbbe8c05 100644 --- a/libs/gtkmm2/gtk/gtkmm/filefilter.cc +++ b/libs/gtkmm2/gtk/gtkmm/filefilter.cc @@ -185,7 +185,8 @@ GType FileFilter::get_base_type() FileFilter::FileFilter() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Object(Glib::ConstructParams(filefilter_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/filefilter.h b/libs/gtkmm2/gtk/gtkmm/filefilter.h index fd5aadf8c4..58ec13a3af 100644 --- a/libs/gtkmm2/gtk/gtkmm/filefilter.h +++ b/libs/gtkmm2/gtk/gtkmm/filefilter.h @@ -116,6 +116,22 @@ namespace Gtk { +/** A filter for selecting a file subset. + * + * A Gtk::FileFilter can be used to restrict the files being shown in a Gtk::FileChooser. + * Files can be filtered based on their name (with add_pattern()), + * on their mime type (with add_mime_type()), or by a custom filter + * function (with add_custom()). + * + * Filtering by mime types handles aliasing and subclassing of mime types; + * e.g. a filter for text/plain also matches a file with mime type application/rtf, + * since application/rtf is a subclass of text/plain. Note that Gtk::FileFilter + * allows wildcards for the subtype of a mime type, so you can e.g. filter for image/ *. + * + * Normally, filters are used by adding them to a Gtk::FileChooser. See Gtk::FileChooser::add_filter(). + * But it is also possible to manually use a filter on a file with filter(). + */ + class FileFilter : public Gtk::Object { public: @@ -260,10 +276,13 @@ public: namespace Glib { - /** @relates Gtk::FileFilter - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FileFilter */ Gtk::FileFilter* wrap(GtkFileFilter* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/fileselection.cc b/libs/gtkmm2/gtk/gtkmm/fileselection.cc index 4a5f387047..68001c18cb 100644 --- a/libs/gtkmm2/gtk/gtkmm/fileselection.cc +++ b/libs/gtkmm2/gtk/gtkmm/fileselection.cc @@ -38,8 +38,9 @@ namespace Gtk FileSelection::FileSelection() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(fileselection_class_.init(), "title",(char*) 0, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(fileselection_class_.init(), "title",(char*) 0, static_cast(0))) {} } // namespace Gtk @@ -146,8 +147,9 @@ GType FileSelection::get_base_type() FileSelection::FileSelection(const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(fileselection_class_.init(), "title", title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(fileselection_class_.init(), "title", title.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/fileselection.h b/libs/gtkmm2/gtk/gtkmm/fileselection.h index 5923b16da0..109b2b7e2a 100644 --- a/libs/gtkmm2/gtk/gtkmm/fileselection.h +++ b/libs/gtkmm2/gtk/gtkmm/fileselection.h @@ -3,6 +3,8 @@ #ifndef _GTKMM_FILESELECTION_H #define _GTKMM_FILESELECTION_H +#include + #ifndef GTKMM_DISABLE_DEPRECATED @@ -30,6 +32,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include #include #include @@ -279,10 +285,13 @@ public: namespace Glib { - /** @relates Gtk::FileSelection - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FileSelection */ Gtk::FileSelection* wrap(GtkFileSelection* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/fixed.cc b/libs/gtkmm2/gtk/gtkmm/fixed.cc index 9b522f3579..3fe91f6a06 100644 --- a/libs/gtkmm2/gtk/gtkmm/fixed.cc +++ b/libs/gtkmm2/gtk/gtkmm/fixed.cc @@ -134,7 +134,8 @@ GType Fixed::get_base_type() Fixed::Fixed() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(fixed_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/fixed.h b/libs/gtkmm2/gtk/gtkmm/fixed.h index d0f8eeeb98..0e6697eeeb 100644 --- a/libs/gtkmm2/gtk/gtkmm/fixed.h +++ b/libs/gtkmm2/gtk/gtkmm/fixed.h @@ -148,10 +148,13 @@ public: namespace Glib { - /** @relates Gtk::Fixed - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Fixed */ Gtk::Fixed* wrap(GtkFixed* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/fontbutton.cc b/libs/gtkmm2/gtk/gtkmm/fontbutton.cc index 731ad35b1d..b8daafb09b 100644 --- a/libs/gtkmm2/gtk/gtkmm/fontbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/fontbutton.cc @@ -105,7 +105,7 @@ void FontButton_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void FontButton_Class::font_set_callback(GtkFontButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -113,32 +113,35 @@ void FontButton_Class::font_set_callback(GtkFontButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_font_set(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_font_set(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->font_set) - (*base->font_set)(self); - } + // Call the original underlying C function: + if(base && base->font_set) + (*base->font_set)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -184,15 +187,17 @@ GType FontButton::get_base_type() FontButton::FontButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Button(Glib::ConstructParams(fontbutton_class_.init())) { } FontButton::FontButton(const Glib::ustring& font_name) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Button(Glib::ConstructParams(fontbutton_class_.init(), "font_name", font_name.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Button(Glib::ConstructParams(fontbutton_class_.init(), "font_name", font_name.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/fontbutton.h b/libs/gtkmm2/gtk/gtkmm/fontbutton.h index 5ac3bbd8a1..a949f9f3f3 100644 --- a/libs/gtkmm2/gtk/gtkmm/fontbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/fontbutton.h @@ -127,7 +127,7 @@ public: */ void set_title(const Glib::ustring& title); - /** Returns whether the selected font is used in the label. + /** Returns: whether the selected font is used in the label. * @return Whether the selected font is used in the label. * * @newin2p4. @@ -141,7 +141,7 @@ public: */ void set_use_font(bool use_font = true); - /** Returns whether the selected size is used in the label. + /** Returns: whether the selected size is used in the label. * @return Whether the selected size is used in the label. * * @newin2p4. @@ -171,7 +171,7 @@ public: */ bool set_font_name(const Glib::ustring& fontname); - /** Returns whether the name of the font style will be shown in the label. + /** Return value: whether the font style will be shown in the label. * @return Whether the font style will be shown in the label. * * @newin2p4. @@ -185,7 +185,7 @@ public: */ void set_show_style(bool show_style = true); - /** Returns whether the font size will be shown in the label. + /** Return value: whether the font size will be shown in the label. * @return Whether the font size will be shown in the label. * * @newin2p4. @@ -322,11 +322,9 @@ public: /** The font_set signal is emitted when the user selects a font. When handling this signal, * use get_font_name() to find out which font was just selected. - */ - -/** + * * @par Prototype: - * void %font_set() + * void on_my_%font_set() */ Glib::SignalProxy0< void > signal_font_set(); @@ -340,10 +338,13 @@ public: namespace Glib { - /** @relates Gtk::FontButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FontButton */ Gtk::FontButton* wrap(GtkFontButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/fontselection.cc b/libs/gtkmm2/gtk/gtkmm/fontselection.cc index cf9e9799d4..f08e5ab395 100644 --- a/libs/gtkmm2/gtk/gtkmm/fontselection.cc +++ b/libs/gtkmm2/gtk/gtkmm/fontselection.cc @@ -131,7 +131,8 @@ GType FontSelection::get_base_type() FontSelection::FontSelection() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::VBox(Glib::ConstructParams(fontselection_class_.init())) { } @@ -361,15 +362,17 @@ GType FontSelectionDialog::get_base_type() FontSelectionDialog::FontSelectionDialog() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Dialog(Glib::ConstructParams(fontselectiondialog_class_.init())) { } FontSelectionDialog::FontSelectionDialog(const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(fontselectiondialog_class_.init(), "title", title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(fontselectiondialog_class_.init(), "title", title.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/fontselection.h b/libs/gtkmm2/gtk/gtkmm/fontselection.h index f1afc19017..af7c375586 100644 --- a/libs/gtkmm2/gtk/gtkmm/fontselection.h +++ b/libs/gtkmm2/gtk/gtkmm/fontselection.h @@ -127,8 +127,25 @@ public: FontSelection(); + /** Gets the currently-selected font name. Note that this can be a different + * string than what you set with set_font_name(), as + * the font selection widget may normalize font names and thus return a string + * with a different structure. For example, "Helvetica Italic Bold 12" could be + * normalized to "Helvetica Bold Italic 12". Use pango_font_description_equal() + * if you want to compare two font descriptions. + * @return A string with the name of the current font, or #0 if no font + * is selected. You must free this string with Glib::free(). + */ Glib::ustring get_font_name() const; + /** Sets the currently-selected font. Note that the @a fontsel needs to know the + * screen in which it will appear for this to work; this can be guaranteed by + * simply making sure that the @a fontsel is inserted in a toplevel window before + * you call this function. + * @param fontname A font name like "Helvetica 12" or "Times Bold 18". + * @return #true if the font could be set successfully; #false if no such + * font exists or if the @a fontsel doesn't belong to a particular screen yet. + */ bool set_font_name(const Glib::ustring& fontname); Glib::ustring get_preview_text() const; @@ -270,6 +287,15 @@ public: bool set_font_name(const Glib::ustring& fontname); + /** Gets the currently-selected font name. Note that this can be a different + * string than what you set with set_font_name(), as + * the font selection widget may normalize font names and thus return a string + * with a different structure. For example, "Helvetica Italic Bold 12" could be + * normalized to "Helvetica Bold Italic 12". Use pango_font_description_equal() + * if you want to compare two font descriptions. + * @return A string with the name of the current font, or #0 if no font + * is selected. You must free this string with Glib::free(). + */ Glib::ustring get_font_name() const; Glib::ustring get_preview_text() const; @@ -293,10 +319,13 @@ public: namespace Glib { - /** @relates Gtk::FontSelection - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FontSelection */ Gtk::FontSelection* wrap(GtkFontSelection* object, bool take_copy = false); } //namespace Glib @@ -304,10 +333,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::FontSelectionDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::FontSelectionDialog */ Gtk::FontSelectionDialog* wrap(GtkFontSelectionDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/frame.cc b/libs/gtkmm2/gtk/gtkmm/frame.cc index 03df181272..90096504e2 100644 --- a/libs/gtkmm2/gtk/gtkmm/frame.cc +++ b/libs/gtkmm2/gtk/gtkmm/frame.cc @@ -94,7 +94,7 @@ void Frame_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void Frame_Class::compute_child_allocation_vfunc_callback(GtkFrame* self, GtkAllocation* allocation) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -102,33 +102,37 @@ void Frame_Class::compute_child_allocation_vfunc_callback(GtkFrame* self, GtkAll // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->compute_child_allocation_vfunc((Allocation&)(Glib::wrap(allocation)) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->compute_child_allocation_vfunc((Allocation&)(Glib::wrap(allocation)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->compute_child_allocation) + (*base->compute_child_allocation)(self, allocation); - // Call the original underlying C function: - if(base && base->compute_child_allocation) - (*base->compute_child_allocation)(self, allocation); - } } #endif //GLIBMM_VFUNCS_ENABLED @@ -177,15 +181,17 @@ GType Frame::get_base_type() Frame::Frame() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(frame_class_.init())) { } Frame::Frame(const Glib::ustring& label) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(frame_class_.init(), "label", label.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(frame_class_.init(), "label", label.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/frame.h b/libs/gtkmm2/gtk/gtkmm/frame.h index d67fab075c..e18bfc6884 100644 --- a/libs/gtkmm2/gtk/gtkmm/frame.h +++ b/libs/gtkmm2/gtk/gtkmm/frame.h @@ -173,7 +173,9 @@ public: * of the widget. A value of 0.0 represents left alignment; * 1.0 represents right alignment. * @param yalign The y alignment of the label. A value of 0.0 aligns under - * the frame; 1.0 aligns above the frame. + * the frame; 1.0 aligns above the frame. If the values are exactly + * 0.0 or 1.0 the gap in the frame won't be painted because the label + * will be completely above or below the frame. */ void set_label_align(float xalign = 0.0, float yalign = 0.5); @@ -183,7 +185,9 @@ public: * of the widget. A value of 0.0 represents left alignment; * 1.0 represents right alignment. * @param yalign The y alignment of the label. A value of 0.0 aligns under - * the frame; 1.0 aligns above the frame. + * the frame; 1.0 aligns above the frame. If the values are exactly + * 0.0 or 1.0 the gap in the frame won't be painted because the label + * will be completely above or below the frame. */ void set_label_align(AlignmentEnum xalign, AlignmentEnum yalign = Gtk::ALIGN_CENTER); @@ -323,10 +327,13 @@ protected: namespace Glib { - /** @relates Gtk::Frame - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Frame */ Gtk::Frame* wrap(GtkFrame* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/handlebox.cc b/libs/gtkmm2/gtk/gtkmm/handlebox.cc index 2e4000b1f7..cf10e3f683 100644 --- a/libs/gtkmm2/gtk/gtkmm/handlebox.cc +++ b/libs/gtkmm2/gtk/gtkmm/handlebox.cc @@ -184,7 +184,7 @@ void HandleBox_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void HandleBox_Class::child_attached_callback(GtkHandleBox* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -192,37 +192,40 @@ void HandleBox_Class::child_attached_callback(GtkHandleBox* self, GtkWidget* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_child_attached(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_child_attached(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->child_attached) - (*base->child_attached)(self, p0); - } + // Call the original underlying C function: + if(base && base->child_attached) + (*base->child_attached)(self, p0); } void HandleBox_Class::child_detached_callback(GtkHandleBox* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -230,33 +233,36 @@ void HandleBox_Class::child_detached_callback(GtkHandleBox* self, GtkWidget* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_child_detached(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_child_detached(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->child_detached) - (*base->child_detached)(self, p0); - } + // Call the original underlying C function: + if(base && base->child_detached) + (*base->child_detached)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -302,7 +308,8 @@ GType HandleBox::get_base_type() HandleBox::HandleBox() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(handlebox_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/handlebox.h b/libs/gtkmm2/gtk/gtkmm/handlebox.h index fe211425e2..2a4d49169d 100644 --- a/libs/gtkmm2/gtk/gtkmm/handlebox.h +++ b/libs/gtkmm2/gtk/gtkmm/handlebox.h @@ -143,17 +143,17 @@ public: PositionType get_snap_edge() const; -/** + /** * @par Prototype: - * void %child_attached(Widget* child) + * void on_my_%child_attached(Widget* child) */ Glib::SignalProxy1< void,Widget* > signal_child_attached(); -/** + /** * @par Prototype: - * void %child_detached(Widget* child) + * void on_my_%child_detached(Widget* child) */ Glib::SignalProxy1< void,Widget* > signal_child_detached(); @@ -238,10 +238,13 @@ public: namespace Glib { - /** @relates Gtk::HandleBox - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HandleBox */ Gtk::HandleBox* wrap(GtkHandleBox* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/iconfactory.cc b/libs/gtkmm2/gtk/gtkmm/iconfactory.cc index d068b95433..af8570413c 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconfactory.cc +++ b/libs/gtkmm2/gtk/gtkmm/iconfactory.cc @@ -171,7 +171,8 @@ GType IconFactory::get_base_type() IconFactory::IconFactory() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(iconfactory_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/iconfactory.h b/libs/gtkmm2/gtk/gtkmm/iconfactory.h index 5b323f1976..eb3825c7ad 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconfactory.h +++ b/libs/gtkmm2/gtk/gtkmm/iconfactory.h @@ -154,10 +154,13 @@ protected: namespace Glib { - /** @relates Gtk::IconFactory - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::IconFactory */ Glib::RefPtr wrap(GtkIconFactory* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/iconinfo.cc b/libs/gtkmm2/gtk/gtkmm/iconinfo.cc index a5655cd711..dc9ef094ec 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconinfo.cc +++ b/libs/gtkmm2/gtk/gtkmm/iconinfo.cc @@ -34,8 +34,9 @@ bool IconInfo::get_attach_points(Glib::ArrayHandle& /* points */) co if(c_attach_points) { - //TODO: Why doesn't this compile? - //points = Glib::ArrayHandle(c_attach_points, n_points, Glib::OWNERSHIP_SHALLOW); //We use OWNERSHIP_SHALLOW because we just need to g_free() the array and nothing more. + //TODO: We can't use = with an ArrayHandle. + //Investigate whether the bool return value has a special meaning - maybe we can just return an empty ArrayHandle. + //points = Glib::ArrayHandle(reinterpret_cast(c_attach_points), (size_t)n_points, Glib::OWNERSHIP_SHALLOW); //We use OWNERSHIP_SHALLOW because we just need to g_free() the array and nothing more. } return result; } diff --git a/libs/gtkmm2/gtk/gtkmm/iconinfo.h b/libs/gtkmm2/gtk/gtkmm/iconinfo.h index 5eadf4f2e8..9c1057f7f0 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconinfo.h +++ b/libs/gtkmm2/gtk/gtkmm/iconinfo.h @@ -215,10 +215,13 @@ inline void swap(IconInfo& lhs, IconInfo& rhs) namespace Glib { -/** @relates Gtk::IconInfo - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::IconInfo */ Gtk::IconInfo wrap(GtkIconInfo* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/iconset.h b/libs/gtkmm2/gtk/gtkmm/iconset.h index 65ab0b57fa..1766a89104 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconset.h +++ b/libs/gtkmm2/gtk/gtkmm/iconset.h @@ -48,6 +48,7 @@ class Widget; //TODO_API: Is _CLASS_BOXEDTYPE the appropriate thing to use here. //This seems to be reference-counted, not copied. +/* TODO: Documentation, thought the C API has no documentation for this either. */ class IconSet { public: @@ -173,10 +174,13 @@ inline void swap(IconSet& lhs, IconSet& rhs) namespace Glib { -/** @relates Gtk::IconSet - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::IconSet */ Gtk::IconSet wrap(GtkIconSet* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/iconsource.h b/libs/gtkmm2/gtk/gtkmm/iconsource.h index 9365b1984b..112ac7e303 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconsource.h +++ b/libs/gtkmm2/gtk/gtkmm/iconsource.h @@ -270,10 +270,13 @@ inline void swap(IconSource& lhs, IconSource& rhs) namespace Glib { -/** @relates Gtk::IconSource - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::IconSource */ Gtk::IconSource wrap(GtkIconSource* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/icontheme.cc b/libs/gtkmm2/gtk/gtkmm/icontheme.cc index 281df63663..8d51f6b170 100644 --- a/libs/gtkmm2/gtk/gtkmm/icontheme.cc +++ b/libs/gtkmm2/gtk/gtkmm/icontheme.cc @@ -46,7 +46,7 @@ Glib::ArrayHandle IconTheme::get_icon_sizes(const Glib::ustring& icon_name) int* pArrayInts = gtk_icon_theme_get_icon_sizes(const_cast(gobj()), icon_name.c_str()); //pArrayInts is null-terminated. - return Glib::ArrayHandle(pArrayInts, Glib::OWNERSHIP_SHALLOW); //TODO: I'm not sure about the ownership. murrayc. + return Glib::ArrayHandle(pArrayInts, Glib::OWNERSHIP_SHALLOW); } Glib::ListHandle IconTheme::list_icons() const @@ -165,7 +165,7 @@ void IconTheme_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void IconTheme_Class::changed_callback(GtkIconTheme* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -173,32 +173,35 @@ void IconTheme_Class::changed_callback(GtkIconTheme* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -246,7 +249,8 @@ GType IconTheme::get_base_type() IconTheme::IconTheme() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(icontheme_class_.init())) { } @@ -307,6 +311,11 @@ IconInfo IconTheme::lookup_icon(const Glib::ustring& icon_name, int size, IconLo return Glib::wrap(gtk_icon_theme_lookup_icon(const_cast(gobj()), icon_name.c_str(), size, ((GtkIconLookupFlags)(flags)))); } +IconInfo IconTheme::choose_icon(const Glib::StringArrayHandle& icon_names, int size, IconLookupFlags flags) +{ + return Glib::wrap(gtk_icon_theme_choose_icon(gobj(), const_cast((icon_names).data()), size, ((GtkIconLookupFlags)(flags)))); +} + #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr IconTheme::load_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags) const #else @@ -332,6 +341,11 @@ Glib::ListHandle IconTheme::list_icons(const Glib::ustring& conte return Glib::ListHandle(gtk_icon_theme_list_icons(const_cast(gobj()), context.c_str()), Glib::OWNERSHIP_SHALLOW); } +Glib::ListHandle IconTheme::list_contexts() const +{ + return Glib::ListHandle(gtk_icon_theme_list_contexts(const_cast(gobj())), Glib::OWNERSHIP_SHALLOW); +} + Glib::ustring IconTheme::get_example_icon_name() const { return Glib::convert_return_gchar_ptr_to_ustring(gtk_icon_theme_get_example_icon_name(const_cast(gobj()))); diff --git a/libs/gtkmm2/gtk/gtkmm/icontheme.h b/libs/gtkmm2/gtk/gtkmm/icontheme.h index c17f46b828..a2ca6bbbaf 100644 --- a/libs/gtkmm2/gtk/gtkmm/icontheme.h +++ b/libs/gtkmm2/gtk/gtkmm/icontheme.h @@ -57,7 +57,8 @@ enum IconLookupFlags { ICON_LOOKUP_NO_SVG = 1 << 0, ICON_LOOKUP_FORCE_SVG = 1 << 1, - ICON_LOOKUP_USE_BUILTIN = 1 << 2 + ICON_LOOKUP_USE_BUILTIN = 1 << 2, + ICON_LOOKUP_GENERIC_FALLBACK = 1 << 3 }; /** @ingroup gtkmmEnums */ @@ -271,8 +272,6 @@ public: Glib::ArrayHandle get_icon_sizes(const Glib::ustring& icon_name) const; -//TODO: Update the docs for this, to suggest use of IconInfo::operator bool() instead of saying that it returns null. - /** Looks up a named icon and returns a structure containing * information such as the filename of the icon. The icon * can then be rendered into a pixbuf using @@ -281,14 +280,35 @@ public: * @param icon_name The name of the icon to lookup. * @param size Desired icon size. * @param flags Flags modifying the behavior of the icon lookup. - * @return A Gtk::IconInfo structure containing information - * about the icon, or 0 if the icon wasn't found. Free with - * gtk_icon_info_free() + * @return An IconInfo structure containing information + * about the icon. IconInfo::operator bool() will return false if the icon wasn't found. + * For instance, if (icon_info) { ... }. * * @newin2p4. */ IconInfo lookup_icon(const Glib::ustring& icon_name, int size, IconLookupFlags flags) const; + + /** Looks up a named icon and returns a structure containing + * information such as the filename of the icon. The icon + * can then be rendered into a pixbuf using + * gtk_icon_info_load_icon(). (load_icon() + * combines these two steps if all you need is the pixbuf.) + * + * If @a icon_names contains more than one name, this function + * tries them all in the given order before falling back to + * inherited icon themes. + * @param icon_names Array of icon names to lookup. + * @param size Desired icon size. + * @param flags Flags modifying the behavior of the icon lookup. + * @return A Gtk::IconInfo structure containing information + * about the icon. IconInfo::operator bool() will be false if the icon wasn't found - + * for instance, if (icon_info) { ... }. + * + * @newin2p12. + */ + IconInfo choose_icon(const Glib::StringArrayHandle& icon_names, int size, IconLookupFlags flags); + /** Looks up an icon in an icon theme, scales it to the given size * and renders it into a pixbuf. This is a convenience function; @@ -341,13 +361,21 @@ public: Glib::ListHandle list_icons() const; + /** Gets the list of contexts available within the current + * hierarchy of icon themes. + * @return A list holding the names of all the + * contexts in the theme. + * + * @newin2p12. + */ + Glib::ListHandle list_contexts() const; + + /** Gets the name of an icon that is representative of the * current theme (for instance, to use when presenting * a list of themes to the user.) - * @return The name of an example icon or 0. - * Free with Glib::free(). * - * @newin2p4. + * @newin2p4 */ Glib::ustring get_example_icon_name() const; @@ -386,9 +414,9 @@ public: static void add_builtin_icon(const Glib::ustring& icon_name, int size, const Glib::RefPtr& pixbuf); -/** + /** * @par Prototype: - * void %changed() + * void on_my_%changed() */ Glib::SignalProxy0< void > signal_changed(); @@ -419,10 +447,13 @@ protected: namespace Glib { - /** @relates Gtk::IconTheme - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::IconTheme */ Glib::RefPtr wrap(GtkIconTheme* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/iconview.cc b/libs/gtkmm2/gtk/gtkmm/iconview.cc index 82d3901f94..970eb7bdd2 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconview.cc +++ b/libs/gtkmm2/gtk/gtkmm/iconview.cc @@ -4,7 +4,7 @@ #include #include -// -*- c++ -*- +// -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /* $Id$ */ /* Copyright 1998-2004 The gtkmm Development Team @@ -26,6 +26,9 @@ #include #include +#include +#include +#include namespace //anonymous namespace { @@ -193,6 +196,50 @@ void IconView::enable_model_drag_dest(const ArrayHandle_TargetEntry& targets, G gtk_icon_view_enable_model_drag_dest(gobj(), targets.data(), targets.size(), (GdkDragAction)actions); } +bool +IconView::get_tooltip_context_path(int& x, int& y, + bool keyboard_tip, + TreeModel::Path& path) +{ + //It's cleaner to use a temporary C++ object and get a C pointer to it, + //because GtkTreePath is a simple struct, not a GtkObject, so + //gtk_tree_path_new() would be necessary. markoa. + TreeModel::Path tmp_path; + GtkTreePath* cpath = tmp_path.gobj(); + + gboolean result = + gtk_icon_view_get_tooltip_context(gobj(), + &x, &y, + keyboard_tip, + 0, + &cpath, + 0); + + path = Glib::wrap(cpath, false /* take_copy=false */); + + return result; +} + +bool +IconView::get_tooltip_context_iter(int& x, int& y, + bool keyboard_tip, + Gtk::TreeModel::iterator& iter) +{ + GtkTreeIter src_iter; + + gboolean result = + gtk_icon_view_get_tooltip_context(gobj(), + &x, &y, + keyboard_tip, + 0, + 0, + &src_iter); + + iter = TreeIter(gtk_icon_view_get_model(this->gobj()), &src_iter); + + return result; +} + } // namespace Gtk @@ -341,7 +388,7 @@ void IconView_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void IconView_Class::set_scroll_adjustments_callback(GtkIconView* self, GtkAdjustment* p0, GtkAdjustment* p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -349,38 +396,41 @@ void IconView_Class::set_scroll_adjustments_callback(GtkIconView* self, GtkAdjus // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_set_scroll_adjustments(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_set_scroll_adjustments(Glib::wrap(p0) , Glib::wrap(p1) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->set_scroll_adjustments) - (*base->set_scroll_adjustments)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->set_scroll_adjustments) + (*base->set_scroll_adjustments)(self, p0, p1); } void IconView_Class::item_activated_callback(GtkIconView* self, GtkTreePath* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -388,37 +438,40 @@ void IconView_Class::item_activated_callback(GtkIconView* self, GtkTreePath* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_item_activated(Gtk::TreePath(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_item_activated(Gtk::TreePath(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->item_activated) - (*base->item_activated)(self, p0); - } + // Call the original underlying C function: + if(base && base->item_activated) + (*base->item_activated)(self, p0); } void IconView_Class::selection_changed_callback(GtkIconView* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -426,32 +479,35 @@ void IconView_Class::selection_changed_callback(GtkIconView* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_selection_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_selection_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->selection_changed) - (*base->selection_changed)(self); - } + // Call the original underlying C function: + if(base && base->selection_changed) + (*base->selection_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -497,15 +553,17 @@ GType IconView::get_base_type() IconView::IconView() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(iconview_class_.init())) { } IconView::IconView(const Glib::RefPtr& model) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Container(Glib::ConstructParams(iconview_class_.init(), "model", Glib::unwrap(model), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Container(Glib::ConstructParams(iconview_class_.init(), "model", Glib::unwrap(model), static_cast(0))) { } @@ -689,6 +747,11 @@ void IconView::item_activated(const TreeModel::Path& path) gtk_icon_view_item_activated(gobj(), const_cast((path).gobj())); } +void IconView::set_cursor(const TreeModel::Path& path, CellRenderer& cell, bool start_editing) +{ +gtk_icon_view_set_cursor(gobj(), const_cast((path).gobj()), (cell).gobj(), static_cast(start_editing)); +} + void IconView::scroll_to_path(const TreeModel::Path& path, bool use_align, gfloat row_align, gfloat col_align) { gtk_icon_view_scroll_to_path(gobj(), const_cast((path).gobj()), static_cast(use_align), row_align, col_align); @@ -724,6 +787,31 @@ Glib::RefPtr IconView::create_drag_icon(const TreeModel::Path& path return Glib::wrap((GdkPixmapObject*)(gtk_icon_view_create_drag_icon(gobj(), const_cast((path).gobj())))); } +void IconView::convert_widget_to_bin_window_coords(int wx, int wy, int& bx, int& by) const +{ +gtk_icon_view_convert_widget_to_bin_window_coords(const_cast(gobj()), wx, wy, &bx, &by); +} + +void IconView::set_tooltip_item(const Glib::RefPtr& tooltip, const TreeModel::Path& path) +{ +gtk_icon_view_set_tooltip_item(gobj(), Glib::unwrap(tooltip), const_cast((path).gobj())); +} + +void IconView::set_tooltip_cell(const Glib::RefPtr& tooltip, const TreeModel::Path& path, CellRenderer& cell) +{ +gtk_icon_view_set_tooltip_cell(gobj(), Glib::unwrap(tooltip), const_cast((path).gobj()), (cell).gobj()); +} + +void IconView::set_tooltip_column(int column) +{ +gtk_icon_view_set_tooltip_column(gobj(), column); +} + +int IconView::get_tooltip_column() const +{ + return gtk_icon_view_get_tooltip_column(const_cast(gobj())); +} + Glib::SignalProxy2< void,Adjustment*,Adjustment* > IconView::signal_set_scroll_adjustments() { diff --git a/libs/gtkmm2/gtk/gtkmm/iconview.h b/libs/gtkmm2/gtk/gtkmm/iconview.h index 54539e3046..ee2641d8a4 100644 --- a/libs/gtkmm2/gtk/gtkmm/iconview.h +++ b/libs/gtkmm2/gtk/gtkmm/iconview.h @@ -32,6 +32,7 @@ #include #include #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -172,16 +173,14 @@ public: */ void set_model(const Glib::RefPtr& model); - /** Returns the model the Gtk::IconView is based on. Returns 0 if the - * model is unset. + /** Return value: A Gtk::TreeModel, or 0 if none is currently being used. * @return A Gtk::TreeModel, or 0 if none is currently being used. * * @newin2p6. */ Glib::RefPtr get_model(); - /** Returns the model the Gtk::IconView is based on. Returns 0 if the - * model is unset. + /** Return value: A Gtk::TreeModel, or 0 if none is currently being used. * @return A Gtk::TreeModel, or 0 if none is currently being used. * * @newin2p6. @@ -193,7 +192,7 @@ public: * column must be of type G::TYPE_STRING. * * @newin2p6 - * @param column A column in the currently used model. + * @param column A column in the currently used model, or -1 to display no text. */ void set_text_column(int column); @@ -201,11 +200,11 @@ public: * column must be of type G::TYPE_STRING. * * @newin2p6 - * @param column A column in the currently used model. + * @param column A column in the currently used model, or -1 to display no text. */ void set_text_column(const TreeModelColumnBase& model_column); - /** Returns the column with text for @a icon_view . + /** Returns: the text column, or -1 if it's unset. * @return The text column, or -1 if it's unset. * * @newin2p6. @@ -218,7 +217,7 @@ public: * the text column set by set_text_column(). * * @newin2p6 - * @param column A column in the currently used model. + * @param column A column in the currently used model, or -1 to display no text. */ void set_markup_column(int column); @@ -228,11 +227,11 @@ public: * the text column set by set_text_column(). * * @newin2p6 - * @param column A column in the currently used model. + * @param column A column in the currently used model, or -1 to display no text. */ void set_markup_column(const TreeModelColumnBase& column); - /** Returns the column with markup text for @a icon_view . + /** Returns: the markup column, or -1 if it's unset. * @return The markup column, or -1 if it's unset. * * @newin2p6. @@ -243,7 +242,7 @@ public: * column must be of type Gdk::TYPE_PIXBUF * * @newin2p6 - * @param column A column in the currently used model. + * @param column A column in the currently used model, or -1 to disable. */ void set_pixbuf_column(int column); @@ -251,11 +250,11 @@ public: * column must be of type Gdk::TYPE_PIXBUF * * @newin2p6 - * @param column A column in the currently used model. + * @param column A column in the currently used model, or -1 to disable. */ void set_pixbuf_column(const TreeModelColumnBase& column); - /** Returns the column with pixbufs for @a icon_view . + /** Returns: the pixbuf column, or -1 if it's unset. * @return The pixbuf column, or -1 if it's unset. * * @newin2p6. @@ -271,8 +270,7 @@ public: */ void set_orientation(Orientation orientation); - /** Returns the value of the ::orientation property which determines - * whether the labels are drawn beside the icons instead of below. + /** Return value: the relative position of texts and icons * @return The relative position of texts and icons * * @newin2p6. @@ -290,7 +288,7 @@ public: */ void set_columns(int columns); - /** Returns the value of the ::columns property. + /** Return value: the number of columns, or -1 * @return The number of columns, or -1 * * @newin2p6. @@ -306,7 +304,7 @@ public: */ void set_item_width(int item_width); - /** Returns the value of the ::item-width property. + /** Return value: the width of a single item, or -1 * @return The width of a single item, or -1 * * @newin2p6. @@ -322,7 +320,7 @@ public: */ void set_spacing(int spacing); - /** Returns the value of the ::spacing property. + /** Return value: the space between cells * @return The space between cells * * @newin2p6. @@ -337,7 +335,7 @@ public: */ void set_row_spacing(int row_spacing); - /** Returns the value of the ::row-spacing property. + /** Return value: the space between rows * @return The space between rows * * @newin2p6. @@ -352,7 +350,7 @@ public: */ void set_column_spacing(int column_spacing); - /** Returns the value of the ::column-spacing property. + /** Return value: the space between columns * @return The space between columns * * @newin2p6. @@ -369,7 +367,7 @@ public: */ void set_margin(int margin); - /** Returns the value of the ::margin property. + /** Return value: the space at the borders * @return The space at the borders * * @newin2p6. @@ -377,9 +375,11 @@ public: int get_margin() const; - /** Finds the path at the point ( @a x , @a y ), relative to widget coordinates. + /** Finds the path at the point ( @a x , @a y ), relative to bin_window coordinates. * See get_item_at_pos(), if you are also interested in - * the cell at the specified position. + * the cell at the specified position. + * See convert_widget_to_bin_window_coords() for converting + * widget coordinates to bin_window coordinates. * @param x The x position to be identified. * @param y The y position to be identified. * @return The Gtk::TreePath corresponding to the icon or 0 @@ -474,8 +474,7 @@ public: */ void unselect_path(const TreeModel::Path& path); - /** Returns true if the icon pointed to by @a path is currently - * selected. If @a icon does not point to a valid location, false is returned. + /** Return value: true if @a path is selected. * @param path A Gtk::TreePath to check selection on. * @return true if @a path is selected. * @@ -539,8 +538,24 @@ public: */ void item_activated(const TreeModel::Path& path); - void set_cursor(const TreeModel::Path& path, CellRenderer& cell, bool start_editing); + //TODO: Add a version with no cell parameter. + /** Sets the current keyboard focus to be at @a path , and selects it. This is + * useful when you want to focus the user's attention on a particular item. + * If @a cell is not 0, then focus is given to the cell specified by + * it. Additionally, if @a start_editing is true, then editing should be + * started in the specified cell. + * + * This function is often followed by gtk_widget_grab_focus + * (icon_view) in order to give keyboard focus to the widget. + * Please note that editing can only happen when the widget is realized. + * + * @newin2p8 + * @param path A Gtk::TreePath. + * @param cell One of the cell renderers of @a icon_view , or 0. + * @param start_editing true if the specified cell should start being edited. + */ + void set_cursor(const TreeModel::Path& path, CellRenderer& cell, bool start_editing); /** Fills in @a path and @a cell with the current cursor path and cell. * If the cursor isn't currently set, then @a path will be empty. @@ -578,18 +593,19 @@ public: /** Moves the alignments of @a icon_view to the position specified by @a path . - * @a row_align determines where the row is placed, and @a col_align determines where - * @a column is placed. Both are expected to be between 0.0 and 1.0. - * 0.0 means left/top alignment, 1.0 means right/bottom alignment, 0.5 means center. + * @a row_align determines where the row is placed, and @a col_align determines + * where @a column is placed. Both are expected to be between 0.0 and 1.0. + * 0.0 means left/top alignment, 1.0 means right/bottom alignment, 0.5 means + * center. * * If @a use_align is false, then the alignment arguments are ignored, and the * tree does the minimum amount of work to scroll the item onto the screen. * This means that the item will be scrolled to the edge closest to its current * position. If the item is currently visible on the screen, nothing is done. * - * This function only works if the model is set, and @a path is a valid row on the - * model. If the model changes before the @a icon_view is realized, the centered - * path will be modified to reflect this change. + * This function only works if the model is set, and @a path is a valid row on + * the model. If the model changes before the @a icon_view is realized, the + * centered path will be modified to reflect this change. * * @newin2p8 * @param path The path of the item to move to. @@ -739,26 +755,124 @@ public: */ Glib::RefPtr create_drag_icon( const TreeModel::Path& path); + + /** Converts widget coordinates to coordinates for the bin_window, + * as expected by e.g.\ get_path_at_pos(). + * + * @newin2p12 + * @param wy Y coordinate relative to the widget. + * @param bx Return location for bin_window X coordinate. + * @param by Return location for bin_window Y coordinate. + */ + void convert_widget_to_bin_window_coords(int wx, int wy, int& bx, int& by) const; -/** + + /** Sets the tip area of @a tooltip to be the area covered by the item at @a path . + * See also Tooltip::set_tip_area(). + * + * @newin2p12 + * @param tooltip A Gtk::Tooltip. + * @param path A Gtk::TreePath. + */ + void set_tooltip_item(const Glib::RefPtr& tooltip, const TreeModel::Path& path); + + /** Sets the tip area of @a tooltip to the area which @a cell occupies in + * the item pointed to by @a path . See also Tooltip::set_tip_area(). + * + * @newin2p12 + * @param tooltip A Gtk::Tooltip. + * @param path A Gtk::TreePath. + * @param cell A Gtk::CellRenderer. + */ + void set_tooltip_cell(const Glib::RefPtr& tooltip, const TreeModel::Path& path, CellRenderer& cell); + + /** Sets the tip area of @a tooltip to the area occupied by + * the item pointed to by @a path. See also Tooltip::set_tip_area(). + * + * @newin2p12 + * @param tooltip A Gtk::Tooltip. + * @param path A Gtk::TreePath. + */ + void set_tooltip_cell(const Glib::RefPtr& tooltip, const TreeModel::Path& path); + + + /** + * @param x: the x coordinate (relative to widget coordinates) + * @param y: the y coordinate (relative to widget coordinates) + * @param keyboard_tip: whether this is a keyboard tooltip or not + * @param path: a reference to receive a Gtk::TreePath + * + * This function is supposed to be used in a Gtk::Widget::query-tooltip + * signal handler for Gtk::IconView. The x, y and keyboard_tip values + * which are received in the signal handler, should be passed to this + * function without modification. + * + * The return value indicates whether there is an icon view item at the given + * coordinates (true) or not (false) for mouse tooltips. For keyboard + * tooltips the item returned will be the cursor item. When true, then the + * path which has been provided will be set to point to + * that row and the corresponding model. x and y will always be converted + * to be relative to IconView's bin_window if keyboard_tooltip is false. + * + * Return value: whether or not the given tooltip context points to a item. + * + * @newin2p12 + */ + bool get_tooltip_context_path(int& x, int& y, + bool keyboard_tip, + TreeModel::Path& path); + + /** + * @param x: the x coordinate (relative to widget coordinates) + * @param y: the y coordinate (relative to widget coordinates) + * @param keyboard_tip: whether this is a keyboard tooltip or not + * @param iter: a pointer to receive a Gtk::TreeIter + * + * This function is supposed to be used in a Gtk::Widget::query-tooltip + * signal handler for Gtk::IconView. The x, y and keyboard_tip values + * which are received in the signal handler, should be passed to this + * function without modification. + * + * The return value indicates whether there is an icon view item at the given + * coordinates (true) or not (false) for mouse tooltips. For keyboard + * tooltips the item returned will be the cursor item. When true, then the + * iter which has been provided will be set to point to + * that row and the corresponding model. x and y will always be converted + * to be relative to IconView's bin_window if keyboard_tooltip is false. + * + * Return value: whether or not the given tooltip context points to a item. + * + * @newin2p12 + */ + bool get_tooltip_context_iter(int& x, int& y, + bool keyboard_tip, + Gtk::TreeModel::iterator& iter); + + + void set_tooltip_column(int column); + + int get_tooltip_column() const; + + + /** * @par Prototype: - * void %set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment) + * void on_my_%set_scroll_adjustments(Adjustment* hadjustment, Adjustment* vadjustment) */ Glib::SignalProxy2< void,Adjustment*,Adjustment* > signal_set_scroll_adjustments(); -/** + /** * @par Prototype: - * void %item_activated(const TreeModel::Path& path) + * void on_my_%item_activated(const TreeModel::Path& path) */ Glib::SignalProxy1< void,const TreeModel::Path& > signal_item_activated(); -/** + /** * @par Prototype: - * void %selection_changed() + * void on_my_%selection_changed() */ Glib::SignalProxy0< void > signal_selection_changed(); @@ -1015,10 +1129,13 @@ public: namespace Glib { - /** @relates Gtk::IconView - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::IconView */ Gtk::IconView* wrap(GtkIconView* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/image.cc b/libs/gtkmm2/gtk/gtkmm/image.cc index 7a0a31b9e9..7e578ccc5b 100644 --- a/libs/gtkmm2/gtk/gtkmm/image.cc +++ b/libs/gtkmm2/gtk/gtkmm/image.cc @@ -37,20 +37,23 @@ namespace Gtk Image::Image(const Gtk::StockID& stock_id, IconSize size) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "stock",stock_id.get_c_str(),"icon-size",(GtkIconSize) int(size), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "stock",stock_id.get_c_str(),"icon-size",(GtkIconSize) int(size), static_cast(0))) {} Image::Image(IconSet& icon_set, IconSize size) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "icon-set",icon_set.gobj(),"icon-size",(GtkIconSize) int(size), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "icon-set",icon_set.gobj(),"icon-size",(GtkIconSize) int(size), static_cast(0))) {} Image::Image(const Glib::RefPtr& animation) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "pixbuf-animation",Glib::unwrap(animation), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "pixbuf-animation",Glib::unwrap(animation), static_cast(0))) {} void Image::get_pixmap(Glib::RefPtr& pixmap, Glib::RefPtr& mask) const @@ -223,36 +226,41 @@ GType Image::get_base_type() Image::Image() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Misc(Glib::ConstructParams(image_class_.init())) { } Image::Image(const Glib::RefPtr& pixmap, const Glib::RefPtr& mask) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "pixmap", Glib::unwrap(pixmap), "mask", Glib::unwrap(mask), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "pixmap", Glib::unwrap(pixmap), "mask", Glib::unwrap(mask), static_cast(0))) { } Image::Image(const Glib::RefPtr& image, const Glib::RefPtr& mask) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "image", Glib::unwrap(image), "mask", Glib::unwrap(mask), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "image", Glib::unwrap(image), "mask", Glib::unwrap(mask), static_cast(0))) { } Image::Image(const std::string& file) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "file", file.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "file", file.c_str(), static_cast(0))) { } Image::Image(const Glib::RefPtr& pixbuf) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(image_class_.init(), "pixbuf", Glib::unwrap(pixbuf), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(image_class_.init(), "pixbuf", Glib::unwrap(pixbuf), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/image.h b/libs/gtkmm2/gtk/gtkmm/image.h index 799be0c4d3..5023d6bc8e 100644 --- a/libs/gtkmm2/gtk/gtkmm/image.h +++ b/libs/gtkmm2/gtk/gtkmm/image.h @@ -502,10 +502,13 @@ public: namespace Glib { - /** @relates Gtk::Image - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Image */ Gtk::Image* wrap(GtkImage* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc index 7543a2ddd1..33c4e7adda 100644 --- a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc +++ b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.cc @@ -38,8 +38,9 @@ namespace Gtk ImageMenuItem::ImageMenuItem(Widget& image, const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init())) { set_image(image); add_accel_label(label, mnemonic); @@ -47,16 +48,18 @@ ImageMenuItem::ImageMenuItem(Widget& image, ImageMenuItem::ImageMenuItem(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init())) { add_accel_label(label, mnemonic); } ImageMenuItem::ImageMenuItem(const Gtk::StockID& stock_id) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init())) { Gtk::Image* image = new Gtk::Image(stock_id, ICON_SIZE_MENU); image->show(); @@ -178,7 +181,8 @@ GType ImageMenuItem::get_base_type() ImageMenuItem::ImageMenuItem() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::MenuItem(Glib::ConstructParams(imagemenuitem_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h index b5ba9d358a..064717d164 100644 --- a/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h +++ b/libs/gtkmm2/gtk/gtkmm/imagemenuitem.h @@ -145,10 +145,13 @@ public: namespace Glib { - /** @relates Gtk::ImageMenuItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ImageMenuItem */ Gtk::ImageMenuItem* wrap(GtkImageMenuItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/inputdialog.cc b/libs/gtkmm2/gtk/gtkmm/inputdialog.cc index 929a385f47..eacb9155b0 100644 --- a/libs/gtkmm2/gtk/gtkmm/inputdialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/inputdialog.cc @@ -161,7 +161,7 @@ void InputDialog_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void InputDialog_Class::enable_device_callback(GtkInputDialog* self, GdkDevice* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -169,37 +169,40 @@ void InputDialog_Class::enable_device_callback(GtkInputDialog* self, GdkDevice* // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_enable_device(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_enable_device(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->enable_device) - (*base->enable_device)(self, p0); - } + // Call the original underlying C function: + if(base && base->enable_device) + (*base->enable_device)(self, p0); } void InputDialog_Class::disable_device_callback(GtkInputDialog* self, GdkDevice* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -207,33 +210,36 @@ void InputDialog_Class::disable_device_callback(GtkInputDialog* self, GdkDevice* // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_disable_device(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_disable_device(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->disable_device) - (*base->disable_device)(self, p0); - } + // Call the original underlying C function: + if(base && base->disable_device) + (*base->disable_device)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -279,7 +285,8 @@ GType InputDialog::get_base_type() InputDialog::InputDialog() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Dialog(Glib::ConstructParams(inputdialog_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/inputdialog.h b/libs/gtkmm2/gtk/gtkmm/inputdialog.h index 45bf5d7eca..29b5ee9820 100644 --- a/libs/gtkmm2/gtk/gtkmm/inputdialog.h +++ b/libs/gtkmm2/gtk/gtkmm/inputdialog.h @@ -3,6 +3,8 @@ #ifndef _GTKMM_INPUTDIALOG_H #define _GTKMM_INPUTDIALOG_H +#include + #include @@ -27,6 +29,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include @@ -145,18 +151,18 @@ public: ScrolledWindow* get_keys_box(); const ScrolledWindow* get_keys_box() const; - -/** + + /** * @par Prototype: - * void %enable_device(const Glib::RefPtr& device) + * void on_my_%enable_device(const Glib::RefPtr& device) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_enable_device(); -/** + /** * @par Prototype: - * void %disable_device(const Glib::RefPtr& device) + * void on_my_%disable_device(const Glib::RefPtr& device) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_disable_device(); @@ -169,10 +175,13 @@ public: namespace Glib { - /** @relates Gtk::InputDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::InputDialog */ Gtk::InputDialog* wrap(GtkInputDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/invisible.cc b/libs/gtkmm2/gtk/gtkmm/invisible.cc index b237050cbf..96eb2adf07 100644 --- a/libs/gtkmm2/gtk/gtkmm/invisible.cc +++ b/libs/gtkmm2/gtk/gtkmm/invisible.cc @@ -136,15 +136,17 @@ GType Invisible::get_base_type() Invisible::Invisible() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(invisible_class_.init())) { } Invisible::Invisible(const Glib::RefPtr& screen) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Widget(Glib::ConstructParams(invisible_class_.init(), "screen", Glib::unwrap(screen), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Widget(Glib::ConstructParams(invisible_class_.init(), "screen", Glib::unwrap(screen), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/invisible.h b/libs/gtkmm2/gtk/gtkmm/invisible.h index 5c6112d21e..be138d0a38 100644 --- a/libs/gtkmm2/gtk/gtkmm/invisible.h +++ b/libs/gtkmm2/gtk/gtkmm/invisible.h @@ -109,14 +109,14 @@ public: explicit Invisible(const Glib::RefPtr& screen); - /** Returns the Gdk::Screen object associated with @a invisible + /** Return value: the associated Gdk::Screen. * @return The associated Gdk::Screen. * * @newin2p2. */ Glib::RefPtr get_screen(); - /** Returns the Gdk::Screen object associated with @a invisible + /** Return value: the associated Gdk::Screen. * @return The associated Gdk::Screen. * * @newin2p2. @@ -138,10 +138,13 @@ public: namespace Glib { - /** @relates Gtk::Invisible - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Invisible */ Gtk::Invisible* wrap(GtkInvisible* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/item.cc b/libs/gtkmm2/gtk/gtkmm/item.cc index 0a8f2b122b..34bd6200ce 100644 --- a/libs/gtkmm2/gtk/gtkmm/item.cc +++ b/libs/gtkmm2/gtk/gtkmm/item.cc @@ -117,7 +117,7 @@ void Item_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Item_Class::select_callback(GtkItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -125,36 +125,39 @@ void Item_Class::select_callback(GtkItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_select(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_select(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->select) - (*base->select)(self); - } + // Call the original underlying C function: + if(base && base->select) + (*base->select)(self); } void Item_Class::deselect_callback(GtkItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -162,36 +165,39 @@ void Item_Class::deselect_callback(GtkItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_deselect(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_deselect(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->deselect) - (*base->deselect)(self); - } + // Call the original underlying C function: + if(base && base->deselect) + (*base->deselect)(self); } void Item_Class::toggle_callback(GtkItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -199,32 +205,35 @@ void Item_Class::toggle_callback(GtkItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_toggle(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_toggle(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->toggle) - (*base->toggle)(self); - } + // Call the original underlying C function: + if(base && base->toggle) + (*base->toggle)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -285,7 +294,8 @@ gtk_item_toggle(gobj()); Item::Item() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(item_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/item.h b/libs/gtkmm2/gtk/gtkmm/item.h index 73f33101d8..24c0c0bc7e 100644 --- a/libs/gtkmm2/gtk/gtkmm/item.h +++ b/libs/gtkmm2/gtk/gtkmm/item.h @@ -114,9 +114,9 @@ public: void select(); -/** + /** * @par Prototype: - * void %select() + * void on_my_%select() */ Glib::SignalProxy0< void > signal_select(); @@ -124,9 +124,9 @@ public: void deselect(); -/** + /** * @par Prototype: - * void %deselect() + * void on_my_%deselect() */ Glib::SignalProxy0< void > signal_deselect(); @@ -134,9 +134,9 @@ public: void toggle(); -/** + /** * @par Prototype: - * void %toggle() + * void on_my_%toggle() */ Glib::SignalProxy0< void > signal_toggle(); @@ -153,10 +153,13 @@ protected: namespace Glib { - /** @relates Gtk::Item - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Item */ Gtk::Item* wrap(GtkItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/label.cc b/libs/gtkmm2/gtk/gtkmm/label.cc index a594b621c4..e1965b6b8c 100644 --- a/libs/gtkmm2/gtk/gtkmm/label.cc +++ b/libs/gtkmm2/gtk/gtkmm/label.cc @@ -32,28 +32,32 @@ namespace Gtk Label::Label() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(label_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(label_class_.init())) {} Label::Label(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(label_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(label_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) {} Label::Label(const Glib::ustring& label, float xalign, float yalign, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(label_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(label_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) { set_alignment(xalign, yalign); } Label::Label(const Glib::ustring& label, AlignmentEnum xalign, AlignmentEnum yalign, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Misc(Glib::ConstructParams(label_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Misc(Glib::ConstructParams(label_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) { set_alignment(xalign, yalign); } @@ -161,7 +165,7 @@ void Label_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Label_Class::populate_popup_callback(GtkLabel* self, GtkMenu* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -169,33 +173,36 @@ void Label_Class::populate_popup_callback(GtkLabel* self, GtkMenu* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_populate_popup(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_populate_popup(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->populate_popup) - (*base->populate_popup)(self, p0); - } + // Call the original underlying C function: + if(base && base->populate_popup) + (*base->populate_popup)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/label.h b/libs/gtkmm2/gtk/gtkmm/label.h index 1536fe73c2..aed29daa53 100644 --- a/libs/gtkmm2/gtk/gtkmm/label.h +++ b/libs/gtkmm2/gtk/gtkmm/label.h @@ -144,7 +144,7 @@ public: /// Doesn't use markup. - /** Sets the text within the Gtk::Label widget. It overwrites any text that + /** Sets the text within the Gtk::Label widget. It overwrites any text that * was there before. * * This will also clear any previously set mnemonic accelerators. @@ -162,8 +162,8 @@ public: /** Sets a Pango::AttrList; the attributes in the list are applied to the * label text. The attributes set with this function will be ignored - * if the "use_underline" property or the "use_markup" property - * is true. + * if the Gtk::Label:use-underline" or Gtk::Label:use-markup properties + * are set to true. * @param attrs A Pango::AttrList. */ void set_attributes(Pango::AttrList& attrs); @@ -181,7 +181,8 @@ public: /** Sets the text of the label. The label is interpreted as * including embedded underlines and/or Pango markup depending - * on the values of label->use_underline and label->use_markup. + * on the values of the Gtk::Label:use-underline" and + * Gtk::Label:use-markup properties. * @param str The new text to set for the label. */ void set_label(const Glib::ustring& str); @@ -194,7 +195,7 @@ public: Glib::ustring get_label() const; /** Parses @a str which is marked up with the Pango text markup language, setting the - * label's text and attribute list based on the parse results. If the @a str is + * label's text and attribute list based on the parse results. If the @a str is * external data, you may need to escape it with Glib::markup_escape_text() or * Glib::markup_printf_escaped()<!-- -->: * @code @@ -214,9 +215,7 @@ public: */ void set_use_markup(bool setting = true); - /** Returns whether the label's text is interpreted as marked up with - * the Pango text markup - * language. See set_use_markup(). + /** Return value: true if the label's text will be parsed for markup. * @return true if the label's text will be parsed for markup. */ bool get_use_markup() const; @@ -227,8 +226,7 @@ public: */ void set_use_underline(bool setting = true); - /** Returns whether an embedded underline in the label indicates a - * mnemonic. See set_use_underline(). + /** Return value: true whether an embedded underline in the label indicates * @return true whether an embedded underline in the label indicates * the mnemonic accelerator keys. */ @@ -240,21 +238,20 @@ public: * If characters in @a str are preceded by an underscore, they are underlined * indicating that they represent a keyboard accelerator called a mnemonic. * - * The mnemonic key can be used to activate another widget, chosen automatically, - * or explicitly using set_mnemonic_widget(). + * The mnemonic key can be used to activate another widget, chosen + * automatically, or explicitly using set_mnemonic_widget(). * @param str A markup string (see Pango markup format). */ void set_markup_with_mnemonic(const Glib::ustring& str); /** If the label has been set so that it has an mnemonic key this function - * returns the keyval used for the mnemonic accelerator. If there is no - * mnemonic set up it returns #GDK_VoidSymbol. + * Returns: GDK keyval usable for accelerators, or #GDK_VoidSymbol * @return GDK keyval usable for accelerators, or #GDK_VoidSymbol. */ guint get_mnemonic_keyval() const; /** If the label has been set so that it has an mnemonic key (using - * i.e.\ set_markup_with_mnemonic(), + * i.e.\ set_markup_with_mnemonic(), * set_text_with_mnemonic(), new_with_mnemonic() * or the "use_underline" property) the label can be associated with a * widget that is the target of the mnemonic. When the label is inside @@ -263,9 +260,10 @@ public: * (i.e. when the target is a Gtk::Entry next to the label) you need to * set it explicitly using this function. * - * The target widget will be accelerated by emitting "mnemonic_activate" on it. - * The default handler for this signal will activate the widget if there are no - * mnemonic collisions and toggle focus between the colliding widgets otherwise. + * The target widget will be accelerated by emitting the + * GtkWidget::mnemonic-activate signal on it. The default handler for + * this signal will activate the widget if there are no mnemonic collisions + * and toggle focus between the colliding widgets otherwise. * @param widget The target Gtk::Widget. */ void set_mnemonic_widget(Widget& widget); @@ -287,14 +285,14 @@ public: /** Sets the label's text from the string @a str . * If characters in @a str are preceded by an underscore, they are underlined * indicating that they represent a keyboard accelerator called a mnemonic. - * The mnemonic key can be used to activate another widget, chosen automatically, - * or explicitly using set_mnemonic_widget(). + * The mnemonic key can be used to activate another widget, chosen + * automatically, or explicitly using set_mnemonic_widget(). * @param str A string. */ void set_text_with_mnemonic(const Glib::ustring& str); /** Sets the alignment of the lines in the text of the label relative to - * each other. Gtk::JUSTIFY_LEFT is the default value when the + * each other. Gtk::JUSTIFY_LEFT is the default value when the * widget is first created with new(). If you instead want * to set the alignment of the label as a whole, use * Gtk::Misc::set_alignment() instead. set_justify() has no @@ -303,22 +301,21 @@ public: */ void set_justify(Justification jtype); - /** Returns the justification of the label. See set_justify(). + /** Return value: Gtk::Justification * @return Gtk::Justification. */ Justification get_justify() const; -//TODO: Default value?: - /** Sets the mode used to ellipsize (add an ellipsis: "...") to the text if there - * is not enough space to render the entire string. + /** Sets the mode used to ellipsize (add an ellipsis: "...") to the text + * if there is not enough space to render the entire string. * * @newin2p6 * @param mode A Pango::EllipsizeMode. */ void set_ellipsize(Pango::EllipsizeMode mode); - /** Returns the ellipsizing position of the label. See set_ellipsize(). + /** Return value: Pango::EllipsizeMode * @return Pango::EllipsizeMode * * @newin2p6. @@ -360,20 +357,38 @@ public: void set_pattern(const Glib::ustring& pattern); - /** Toggles line wrapping within the Gtk::Label widget. true makes it break - * lines if text exceeds the widget's size. false lets the text get cut off + /** Toggles line wrapping within the Gtk::Label widget. true makes it break + * lines if text exceeds the widget's size. false lets the text get cut off * by the edge of the widget if it exceeds the widget size. + * + * Note that setting line wrapping to true does not make the label + * wrap at its parent container's width, because GTK+ widgets + * conceptually can't make their requisition depend on the parent + * container's size. For a label that wraps at a specific position, + * set the label's width using Gtk::Widget::set_size_request(). * @param wrap The setting. */ void set_line_wrap(bool wrap = true); - /** Returns whether lines in the label are automatically wrapped. See set_line_wrap(). + /** Return value: true if the lines of the label are automatically wrapped. * @return true if the lines of the label are automatically wrapped. */ bool get_line_wrap() const; + /** If line wrapping is on (see set_line_wrap()) this controls how + * the line wrapping is done. The default is Pango::WRAP_WORD which means + * wrap on word boundaries. + * + * @newin2p10 + * @param wrap_mode The line wrapping mode. + */ void set_line_wrap_mode(Pango::WrapMode wrap_mode); + /** Return value: true if the lines of the label are automatically wrapped. + * @return true if the lines of the label are automatically wrapped. + * + * @newin2p10. + */ Pango::WrapMode get_line_wrap_mode() const; /** Selectable labels allow the user to select text from the label, for @@ -399,7 +414,7 @@ public: void set_angle(double angle); /** Gets the angle of rotation for the label. See - * gtk_label_set_angle. + * set_angle(). * @return The angle of rotation for the label * * @newin2p6. @@ -469,7 +484,7 @@ public: */ void set_single_line_mode(bool single_line_mode = true); - /** Returns whether the label is in single line mode. + /** Return value: true when the label is in single line mode. * @return true when the label is in single line mode. * * @newin2p6. @@ -477,9 +492,9 @@ public: bool get_single_line_mode() const; -/** + /** * @par Prototype: - * void %populate_popup(Menu* menu) + * void on_my_%populate_popup(Menu* menu) */ Glib::SignalProxy1< void,Menu* > signal_populate_popup(); @@ -529,7 +544,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The text of the label includes XML markup. See pango_parse_markup. +/** The text of the label includes XML markup. See pango_parse_markup(). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -539,7 +554,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The text of the label includes XML markup. See pango_parse_markup. +/** The text of the label includes XML markup. See pango_parse_markup(). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -820,10 +835,13 @@ public: namespace Glib { - /** @relates Gtk::Label - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Label */ Gtk::Label* wrap(GtkLabel* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/layout.cc b/libs/gtkmm2/gtk/gtkmm/layout.cc index ef96a49e85..2f6c67c719 100644 --- a/libs/gtkmm2/gtk/gtkmm/layout.cc +++ b/libs/gtkmm2/gtk/gtkmm/layout.cc @@ -53,8 +53,9 @@ namespace Gtk Layout::Layout() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Container(Glib::ConstructParams(layout_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Container(Glib::ConstructParams(layout_class_.init())) { set_hadjustment(); set_vadjustment(); @@ -62,8 +63,9 @@ Layout::Layout() Layout::Layout(Adjustment& hadjustment, Adjustment& vadjustment) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Container(Glib::ConstructParams(layout_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Container(Glib::ConstructParams(layout_class_.init())) { set_hadjustment(hadjustment); set_vadjustment(vadjustment); @@ -178,7 +180,7 @@ void Layout_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Layout_Class::set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustment* p0, GtkAdjustment* p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -186,34 +188,37 @@ void Layout_Class::set_scroll_adjustments_callback(GtkLayout* self, GtkAdjustmen // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_set_scroll_adjustments(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_set_scroll_adjustments(Glib::wrap(p0) , Glib::wrap(p1) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->set_scroll_adjustments) - (*base->set_scroll_adjustments)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->set_scroll_adjustments) + (*base->set_scroll_adjustments)(self, p0, p1); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/layout.h b/libs/gtkmm2/gtk/gtkmm/layout.h index 76dd9c2739..6bd95f9c79 100644 --- a/libs/gtkmm2/gtk/gtkmm/layout.h +++ b/libs/gtkmm2/gtk/gtkmm/layout.h @@ -220,9 +220,9 @@ public: // See Gtk::Widget::set_scroll_adjustments() -/** + /** * @par Prototype: - * void %set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj) + * void on_my_%set_scroll_adjustments(Adjustment* hadj, Adjustment* vadj) */ Glib::SignalProxy2< void,Adjustment*,Adjustment* > signal_set_scroll_adjustments(); @@ -316,10 +316,13 @@ public: namespace Glib { - /** @relates Gtk::Layout - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Layout */ Gtk::Layout* wrap(GtkLayout* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/linkbutton.cc b/libs/gtkmm2/gtk/gtkmm/linkbutton.cc index 6f24067e31..3d6b6341c6 100644 --- a/libs/gtkmm2/gtk/gtkmm/linkbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/linkbutton.cc @@ -28,9 +28,56 @@ #include + +static void SignalProxy_UriHook_gtk_callback(GtkLinkButton *button, const gchar *link, gpointer user_data) +{ + Gtk::LinkButton::SlotUri* the_slot = static_cast(user_data); + + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLE + // use Slot::operator() + (*the_slot)(Glib::wrap(button), Glib::convert_const_gchar_ptr_to_ustring(link)); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLE +} + +static void SignalProxy_UriHook_gtk_callback_destroy(void* data) +{ + delete static_cast(data); +} + + namespace Gtk { +LinkButton::LinkButton(const Glib::ustring& uri) +: + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Button(Glib::ConstructParams(linkbutton_class_.init(), "uri",uri.c_str(),"label",uri.c_str(), static_cast(0))) //Note that the uri is used for the label too, as in the C _new() function. +{} + +void LinkButton::set_uri_hook(const SlotUri& slot) +{ + //Create a copy of the slot. A pointer to this will be passed through the callback's data parameter. + //It will be deleted when TreeView_Private::SignalProxy_CellData_gtk_callback_destroy() is called. + SlotUri* slot_copy = new SlotUri(slot); + + gtk_link_button_set_uri_hook (&SignalProxy_UriHook_gtk_callback, slot_copy, &SignalProxy_UriHook_gtk_callback_destroy); +} + +void LinkButton::unset_uri_hook() +{ + gtk_link_button_set_uri_hook (0, 0, 0); +} + } // namespace Gtk @@ -136,22 +183,17 @@ GType LinkButton::get_base_type() LinkButton::LinkButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Button(Glib::ConstructParams(linkbutton_class_.init())) { } -LinkButton::LinkButton(const Glib::ustring& uri) -: - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Button(Glib::ConstructParams(linkbutton_class_.init(), "uri", uri.c_str(), (char*) 0)) -{ - } - LinkButton::LinkButton(const Glib::ustring& uri, const Glib::ustring& label) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Button(Glib::ConstructParams(linkbutton_class_.init(), "uri", uri.c_str(), "label", label.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Button(Glib::ConstructParams(linkbutton_class_.init(), "uri", uri.c_str(), "label", label.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/linkbutton.h b/libs/gtkmm2/gtk/gtkmm/linkbutton.h index 093b60dfc1..31ae93cadf 100644 --- a/libs/gtkmm2/gtk/gtkmm/linkbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/linkbutton.h @@ -41,7 +41,15 @@ namespace Gtk namespace Gtk { -/** TODO +/** Create buttons bound to a URL. + * + * A Gtk::LinkButton is a Gtk::Button with a hyperlink, similar to the one + * used by web browsers, which triggers an action when clicked. It is useful + * to show quick links to resources. + * + * The URI bound to a Gtk::LinkButton can be set specifically using set_uri(), + * and retrieved using get_uri(). + * Gtk::LinkButton offers a global hook, which is called when the used clicks on it: see set_uri_hook(). * * @newin2p10 * @ingroup Widgets @@ -108,15 +116,47 @@ private: public: LinkButton(); explicit LinkButton(const Glib::ustring& uri); + explicit LinkButton(const Glib::ustring& uri, const Glib::ustring& label); + /** Retrieves the URI set using set_uri(). + * @return A valid URI. The returned string is owned by the link button + * and should not be modified or freed. + * + * @newin2p10. + */ Glib::ustring get_uri() const; + /** Sets @a uri as the URI where the Gtk::LinkButton points. + * + * @newin2p10 + * @param uri A valid URI. + */ void set_uri(const Glib::ustring& uri); + /** For instance, + * void on_linkbutton_uri(Gtk::LinkButton *button, const Glib::ustring& uri); + * + * @see set_uri_hook(). + */ + typedef sigc::slot SlotUri; + + /** Sets slot as the function that should be invoked every time a user clicks a LinkButton. + * This function is called before every signal handler registered for the "clicked" signal. + * + * @param slot A function called each time a LinkButton is clicked. + * @newin2p12 + */ + static void set_uri_hook(const SlotUri& slot); + + + /** Unsets any previously set slot as the function that should be invoked every time a user clicks a LinkButton. + * @see set_uri_hook(). + * @newin2p12 + */ + static void unset_uri_hook(); - //TODO: GtkLinkButtonUriFunc gtk_link_button_set_uri_hook(GtkLinkButtonUriFunc func, gpointer data, GDestroyNotify destroy); #ifdef GLIBMM_PROPERTIES_ENABLED /** The URI bound to this button. @@ -147,10 +187,13 @@ public: namespace Glib { - /** @relates Gtk::LinkButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::LinkButton */ Gtk::LinkButton* wrap(GtkLinkButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/liststore.cc b/libs/gtkmm2/gtk/gtkmm/liststore.cc index e79dbd3a02..2199c14be5 100644 --- a/libs/gtkmm2/gtk/gtkmm/liststore.cc +++ b/libs/gtkmm2/gtk/gtkmm/liststore.cc @@ -32,8 +32,9 @@ namespace Gtk ListStore::ListStore(const TreeModelColumnRecord& columns) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(liststore_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(liststore_class_.init())) { gtk_list_store_set_column_types(gobj(), columns.size(), const_cast(columns.types())); } @@ -246,7 +247,8 @@ GType ListStore::get_base_type() ListStore::ListStore() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(liststore_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/liststore.h b/libs/gtkmm2/gtk/gtkmm/liststore.h index b0065ea51a..c1f45a3327 100644 --- a/libs/gtkmm2/gtk/gtkmm/liststore.h +++ b/libs/gtkmm2/gtk/gtkmm/liststore.h @@ -240,10 +240,13 @@ protected: namespace Glib { - /** @relates Gtk::ListStore - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ListStore */ Glib::RefPtr wrap(GtkListStore* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/menu.cc b/libs/gtkmm2/gtk/gtkmm/menu.cc index c8bd5b3e47..36f186375a 100644 --- a/libs/gtkmm2/gtk/gtkmm/menu.cc +++ b/libs/gtkmm2/gtk/gtkmm/menu.cc @@ -206,7 +206,8 @@ GType Menu::get_base_type() Menu::Menu() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::MenuShell(Glib::ConstructParams(menu_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/menu.h b/libs/gtkmm2/gtk/gtkmm/menu.h index a9f48ce3ee..0005b025fc 100644 --- a/libs/gtkmm2/gtk/gtkmm/menu.h +++ b/libs/gtkmm2/gtk/gtkmm/menu.h @@ -202,21 +202,22 @@ public: void set_tearoff_state(bool torn_off = true); - /** Returns whether the menu is torn off. See - * set_tearoff_state(). + /** Return value: true if the menu is currently torn off. * @return true if the menu is currently torn off. */ bool get_tearoff_state() const; /** Sets the title string for the menu. The title is displayed when the menu - * is shown as a tearoff menu. + * is shown as a tearoff menu. If @a title is 0, the menu will see if it is + * attached to a parent menu item, and if so it will try to use the same text as + * that menu item's label. * @param title A string containing the title for the menu. */ void set_title(const Glib::ustring& title); void unset_title(); - /** Returns the title of the menu. See set_title(). + /** Return value: the title of the menu, or 0 if the menu has no * @return The title of the menu, or 0 if the menu has no * title set on it. This string is owned by the widget and should * not be modified or freed. @@ -313,10 +314,13 @@ protected: namespace Glib { - /** @relates Gtk::Menu - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Menu */ Gtk::Menu* wrap(GtkMenu* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/menubar.cc b/libs/gtkmm2/gtk/gtkmm/menubar.cc index fc7e849af0..9df2739b9f 100644 --- a/libs/gtkmm2/gtk/gtkmm/menubar.cc +++ b/libs/gtkmm2/gtk/gtkmm/menubar.cc @@ -31,8 +31,9 @@ namespace Gtk MenuBar::MenuBar() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::MenuShell(Glib::ConstructParams(menubar_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::MenuShell(Glib::ConstructParams(menubar_class_.init())) { // Connect to the signal instead of overriding the on_hierarchy_changed() // method because invocation of C++ default signal handlers is skipped diff --git a/libs/gtkmm2/gtk/gtkmm/menubar.h b/libs/gtkmm2/gtk/gtkmm/menubar.h index c636a12e93..a091283830 100644 --- a/libs/gtkmm2/gtk/gtkmm/menubar.h +++ b/libs/gtkmm2/gtk/gtkmm/menubar.h @@ -124,10 +124,13 @@ private: namespace Glib { - /** @relates Gtk::MenuBar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::MenuBar */ Gtk::MenuBar* wrap(GtkMenuBar* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/menuitem.cc b/libs/gtkmm2/gtk/gtkmm/menuitem.cc index 8a7892a6fa..24e6a16f66 100644 --- a/libs/gtkmm2/gtk/gtkmm/menuitem.cc +++ b/libs/gtkmm2/gtk/gtkmm/menuitem.cc @@ -45,16 +45,18 @@ namespace Gtk MenuItem::MenuItem(Widget& widget) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Item(Glib::ConstructParams(menuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Item(Glib::ConstructParams(menuitem_class_.init())) { add(widget); } MenuItem::MenuItem(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Item(Glib::ConstructParams(menuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Item(Glib::ConstructParams(menuitem_class_.init())) { add_accel_label(label, mnemonic); /* Left-aligned label */ } @@ -140,7 +142,7 @@ static const Glib::SignalProxyInfo MenuItem_signal_activate_item_info = }; -static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int* p0,void* data) +static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, gint* p0,void* data) { using namespace Gtk; typedef sigc::slot< void,int* > SlotType; @@ -153,7 +155,8 @@ static void MenuItem_signal_toggle_size_request_callback(GtkMenuItem* self, int* { #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) - (*static_cast(slot))(p0); + (*static_cast(slot))(p0 +); #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) @@ -266,7 +269,7 @@ void MenuItem_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void MenuItem_Class::activate_callback(GtkMenuItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -274,36 +277,39 @@ void MenuItem_Class::activate_callback(GtkMenuItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_activate(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_activate(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->activate) - (*base->activate)(self); - } + // Call the original underlying C function: + if(base && base->activate) + (*base->activate)(self); } void MenuItem_Class::activate_item_callback(GtkMenuItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -311,36 +317,39 @@ void MenuItem_Class::activate_item_callback(GtkMenuItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_activate_item(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_activate_item(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->activate_item) - (*base->activate_item)(self); - } + // Call the original underlying C function: + if(base && base->activate_item) + (*base->activate_item)(self); } -void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0) +void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, gint* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -348,36 +357,40 @@ void MenuItem_Class::toggle_size_request_callback(GtkMenuItem* self, int* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_toggle_size_request(p0); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_toggle_size_request(p0 +); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->toggle_size_request) - (*base->toggle_size_request)(self, p0); - } + // Call the original underlying C function: + if(base && base->toggle_size_request) + (*base->toggle_size_request)(self, p0); } void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -385,33 +398,36 @@ void MenuItem_Class::toggle_size_allocate_callback(GtkMenuItem* self, gint p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_toggle_size_allocate(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_toggle_size_allocate(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->toggle_size_allocate) - (*base->toggle_size_allocate)(self, p0); - } + // Call the original underlying C function: + if(base && base->toggle_size_allocate) + (*base->toggle_size_allocate)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -457,7 +473,8 @@ GType MenuItem::get_base_type() MenuItem::MenuItem() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Item(Glib::ConstructParams(menuitem_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/menuitem.h b/libs/gtkmm2/gtk/gtkmm/menuitem.h index 1e5bb18c6a..1165c64b1a 100644 --- a/libs/gtkmm2/gtk/gtkmm/menuitem.h +++ b/libs/gtkmm2/gtk/gtkmm/menuitem.h @@ -128,6 +128,10 @@ public: explicit MenuItem(const Glib::ustring& label, bool mnemonic = false); + /** Sets or replaces the menu item's submenu, or removes it when a 0 + * submenu is passed. + * @param submenu The submenu, or 0. + */ void set_submenu(Menu& submenu); /** Gets the submenu underneath this menu item, if any. See @@ -144,6 +148,12 @@ public: bool has_submenu() const; + /** Removes the widget's submenu. + * + * Deprecated: 2.12: remove_submenu() is deprecated and + * should not be used in newly written code. Use + * set_submenu() instead. + */ void remove_submenu(); void select(); @@ -194,33 +204,33 @@ public: void unset_accel_path(); -/** + /** * @par Prototype: - * void %activate() + * void on_my_%activate() */ Glib::SignalProxy0< void > signal_activate(); -/** + /** * @par Prototype: - * void %activate_item() + * void on_my_%activate_item() */ Glib::SignalProxy0< void > signal_activate_item(); -/** + /** * @par Prototype: - * void %toggle_size_request(int* requisition) + * void on_my_%toggle_size_request(int* requisition) */ Glib::SignalProxy1< void,int* > signal_toggle_size_request(); -/** + /** * @par Prototype: - * void %toggle_size_allocate(int allocation) + * void on_my_%toggle_size_allocate(int allocation) */ Glib::SignalProxy1< void,int > signal_toggle_size_allocate(); @@ -249,10 +259,13 @@ private: namespace Glib { - /** @relates Gtk::MenuItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::MenuItem */ Gtk::MenuItem* wrap(GtkMenuItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/menushell.cc b/libs/gtkmm2/gtk/gtkmm/menushell.cc index 3eb5a103d5..127e0608ca 100644 --- a/libs/gtkmm2/gtk/gtkmm/menushell.cc +++ b/libs/gtkmm2/gtk/gtkmm/menushell.cc @@ -35,8 +35,9 @@ namespace Gtk MenuShell::MenuShell() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Container(Glib::ConstructParams(menushell_class_.init(), (char*) 0)), + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Container(Glib::ConstructParams(menushell_class_.init())), items_proxy_ (gobj()), accel_window_ (0) {} @@ -227,6 +228,70 @@ static const Glib::SignalProxyInfo MenuShell_signal_selection_done_info = }; +static gboolean MenuShell_signal_move_selected_callback(GtkMenuShell* self, gint p0,void* data) +{ + using namespace Gtk; + typedef sigc::slot< gboolean,int > SlotType; + + // Do not try to call a signal on a disassociated wrapper. + if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + return (*static_cast(slot))(p0 +); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } + + typedef gboolean RType; + return RType(); +} + +static gboolean MenuShell_signal_move_selected_notify_callback(GtkMenuShell* self, gint p0, void* data) +{ + using namespace Gtk; + typedef sigc::slot< void,int > SlotType; + + // Do not try to call a signal on a disassociated wrapper. + if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + (*static_cast(slot))(p0 +); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } + + typedef gboolean RType; + return RType(); +} + +static const Glib::SignalProxyInfo MenuShell_signal_move_selected_info = +{ + "move-selected", + (GCallback) &MenuShell_signal_move_selected_callback, + (GCallback) &MenuShell_signal_move_selected_notify_callback +}; + + } // anonymous namespace @@ -287,7 +352,7 @@ void MenuShell_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void MenuShell_Class::deactivate_callback(GtkMenuShell* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -295,36 +360,39 @@ void MenuShell_Class::deactivate_callback(GtkMenuShell* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_deactivate(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_deactivate(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->deactivate) - (*base->deactivate)(self); - } + // Call the original underlying C function: + if(base && base->deactivate) + (*base->deactivate)(self); } void MenuShell_Class::selection_done_callback(GtkMenuShell* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -332,32 +400,35 @@ void MenuShell_Class::selection_done_callback(GtkMenuShell* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_selection_done(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_selection_done(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->selection_done) - (*base->selection_done)(self); - } + // Call the original underlying C function: + if(base && base->selection_done) + (*base->selection_done)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -500,6 +571,12 @@ Glib::SignalProxy0< void > MenuShell::signal_selection_done() } +Glib::SignalProxy1< gboolean,int > MenuShell::signal_move_selected() +{ + return Glib::SignalProxy1< gboolean,int >(this, &MenuShell_signal_move_selected_info); +} + + #ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy MenuShell::property_take_focus() { diff --git a/libs/gtkmm2/gtk/gtkmm/menushell.h b/libs/gtkmm2/gtk/gtkmm/menushell.h index 8a69512bf6..5cfe56d45e 100644 --- a/libs/gtkmm2/gtk/gtkmm/menushell.h +++ b/libs/gtkmm2/gtk/gtkmm/menushell.h @@ -217,21 +217,29 @@ public: void cancel(); -/** + /** * @par Prototype: - * void %deactivate() + * void on_my_%deactivate() */ Glib::SignalProxy0< void > signal_deactivate(); -/** + /** * @par Prototype: - * void %selection_done() + * void on_my_%selection_done() */ Glib::SignalProxy0< void > signal_selection_done(); + + /** + * @par Prototype: + * gboolean on_my_%move_selected(int distance) + */ + + Glib::SignalProxy1< gboolean,int > signal_move_selected(); + //Keybinding signals: @@ -277,7 +285,7 @@ public: void accelerate(Widget& parent); - /** Returns true if the menu shell will take the keyboard focus on popup. + /** Returns: true if the menu shell will take the keyboard focus on popup. * @return true if the menu shell will take the keyboard focus on popup. * * @newin2p8. @@ -354,10 +362,13 @@ private: namespace Glib { - /** @relates Gtk::MenuShell - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::MenuShell */ Gtk::MenuShell* wrap(GtkMenuShell* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc index 718dfdfb6a..76a1dbe59c 100644 --- a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.cc @@ -118,7 +118,7 @@ void MenuToolButton_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void MenuToolButton_Class::show_menu_callback(GtkMenuToolButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -126,32 +126,35 @@ void MenuToolButton_Class::show_menu_callback(GtkMenuToolButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_show_menu(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_show_menu(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->show_menu) - (*base->show_menu)(self); - } + // Call the original underlying C function: + if(base && base->show_menu) + (*base->show_menu)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -197,15 +200,17 @@ GType MenuToolButton::get_base_type() MenuToolButton::MenuToolButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::ToolButton(Glib::ConstructParams(menutoolbutton_class_.init())) { } MenuToolButton::MenuToolButton(const Gtk::StockID& stock_id) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::ToolButton(Glib::ConstructParams(menutoolbutton_class_.init(), "stock_id", (stock_id).get_c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::ToolButton(Glib::ConstructParams(menutoolbutton_class_.init(), "stock_id", (stock_id).get_c_str(), static_cast(0))) { } @@ -224,11 +229,25 @@ const Menu* MenuToolButton::get_menu() const return const_cast(this)->get_menu(); } +#ifndef GTKMM_DISABLE_DEPRECATED + void MenuToolButton::set_arrow_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private) { gtk_menu_tool_button_set_arrow_tooltip(gobj(), (tooltips).gobj(), tip_text.c_str(), tip_private.c_str()); } +#endif // GTKMM_DISABLE_DEPRECATED + +void MenuToolButton::set_arrow_tooltip_text(const Glib::ustring& text) +{ +gtk_menu_tool_button_set_arrow_tooltip_text(gobj(), text.c_str()); +} + +void MenuToolButton::set_arrow_tooltip_markup(const Glib::ustring& markup) +{ +gtk_menu_tool_button_set_arrow_tooltip_markup(gobj(), markup.c_str()); +} + Glib::SignalProxy0< void > MenuToolButton::signal_show_menu() { diff --git a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h index 94ecc13dd4..fd24506d5e 100644 --- a/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/menutoolbutton.h @@ -163,21 +163,47 @@ public: const Menu* get_menu() const; +#ifndef GTKMM_DISABLE_DEPRECATED + /** Sets the Gtk::Tooltips object to be used for arrow button which * pops up the menu. See Gtk::ToolItem::set_tooltip() for setting * a tooltip on the whole Gtk::MenuToolButton. * * @newin2p6 + * + * Deprecated: 2.12: Use set_arrow_tooltip_text() + * instead. + * @deprecated Use set_arrow_tooltip_text() or set_arrow_tooltip_markup() instead * @param tooltips The Gtk::Tooltips object to be used. * @param tip_text Text to be used as tooltip text for tool_item. * @param tip_private Text to be used as private tooltip text. */ void set_arrow_tooltip(Tooltips& tooltips, const Glib::ustring& tip_text, const Glib::ustring& tip_private); +#endif // GTKMM_DISABLE_DEPRECATED + + + /** Sets the tooltip text to be used as tooltip for the arrow button which + * pops up the menu. See Gtk::ToolItem::set_tooltip() for setting a tooltip + * on the whole Gtk::MenuToolButton. + * + * @newin2p12 + * @param text Text to be used as tooltip text for button's arrow button. + */ + void set_arrow_tooltip_text(const Glib::ustring& text); + + /** Sets the tooltip markup text to be used as tooltip for the arrow button + * which pops up the menu. See Gtk::ToolItem::set_tooltip() for setting a + * tooltip on the whole Gtk::MenuToolButton. + * + * @newin2p12 + * @param markup Markup text to be used as tooltip text for button's arrow button. + */ + void set_arrow_tooltip_markup(const Glib::ustring& markup); -/** + /** * @par Prototype: - * void %show_menu() + * void on_my_%show_menu() */ Glib::SignalProxy0< void > signal_show_menu(); @@ -210,10 +236,13 @@ public: namespace Glib { - /** @relates Gtk::MenuToolButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::MenuToolButton */ Gtk::MenuToolButton* wrap(GtkMenuToolButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/messagedialog.cc b/libs/gtkmm2/gtk/gtkmm/messagedialog.cc index cb40c6a920..c4e415f795 100644 --- a/libs/gtkmm2/gtk/gtkmm/messagedialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/messagedialog.cc @@ -38,8 +38,9 @@ MessageDialog::MessageDialog(const Glib::ustring& message, bool use_markup, MessageType type, ButtonsType buttons, bool modal) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(messagedialog_class_.init(), "message_type",(GtkMessageType)type,"buttons",(GtkButtonsType)buttons, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(messagedialog_class_.init(), "message_type",(GtkMessageType)type,"buttons",(GtkButtonsType)buttons, static_cast(0))) { set_modal(modal); set_message(message, use_markup); @@ -49,8 +50,9 @@ MessageDialog::MessageDialog(Gtk::Window& parent, const Glib::ustring& message, MessageType type, ButtonsType buttons, bool modal) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(messagedialog_class_.init(), "message_type",(GtkMessageType)type,"buttons",(GtkButtonsType)buttons, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(messagedialog_class_.init(), "message_type",(GtkMessageType)type,"buttons",(GtkButtonsType)buttons, static_cast(0))) { set_modal(modal); set_transient_for(parent); diff --git a/libs/gtkmm2/gtk/gtkmm/messagedialog.h b/libs/gtkmm2/gtk/gtkmm/messagedialog.h index 154d24b942..dd7b1b44d6 100644 --- a/libs/gtkmm2/gtk/gtkmm/messagedialog.h +++ b/libs/gtkmm2/gtk/gtkmm/messagedialog.h @@ -187,6 +187,11 @@ public: MessageDialog(Gtk::Window& parent, const Glib::ustring& message, bool use_markup = false, MessageType type = MESSAGE_INFO, ButtonsType buttons = BUTTONS_OK, bool modal = false); + /** Sets the dialog's image to @a image . + * + * @newin2p10 + * @param image The image. + */ void set_image(Widget& image); @@ -362,10 +367,13 @@ public: namespace Glib { - /** @relates Gtk::MessageDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::MessageDialog */ Gtk::MessageDialog* wrap(GtkMessageDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/misc.cc b/libs/gtkmm2/gtk/gtkmm/misc.cc index 0d8743510c..a0dcea971d 100644 --- a/libs/gtkmm2/gtk/gtkmm/misc.cc +++ b/libs/gtkmm2/gtk/gtkmm/misc.cc @@ -135,7 +135,8 @@ GType Misc::get_base_type() Misc::Misc() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(misc_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/misc.h b/libs/gtkmm2/gtk/gtkmm/misc.h index 2edfe51010..bab59813b6 100644 --- a/libs/gtkmm2/gtk/gtkmm/misc.h +++ b/libs/gtkmm2/gtk/gtkmm/misc.h @@ -120,8 +120,8 @@ public: void set_alignment(AlignmentEnum xalign = Gtk::ALIGN_LEFT, AlignmentEnum yalign = Gtk::ALIGN_CENTER); - /** Gets the X and Y alignment of the widget within its allocation. See - * set_alignment(). + /** Gets the X and Y alignment of the widget within its allocation. + * See set_alignment(). * @param xalign Location to store X alignment of @a misc , or 0. * @param yalign Location to store Y alignment of @a misc , or 0. */ @@ -130,7 +130,8 @@ public: void set_padding(int xpad, int ypad); - /** Gets the padding in the X and Y directions of the widget. See set_padding(). + /** Gets the padding in the X and Y directions of the widget. + * See set_padding(). * @param xpad Location to store padding in the X direction, or 0. * @param ypad Location to store padding in the Y direction, or 0. */ @@ -224,10 +225,13 @@ public: namespace Glib { - /** @relates Gtk::Misc - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Misc */ Gtk::Misc* wrap(GtkMisc* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/notebook.cc b/libs/gtkmm2/gtk/gtkmm/notebook.cc index 8ba16a6d38..a580f8e4e1 100644 --- a/libs/gtkmm2/gtk/gtkmm/notebook.cc +++ b/libs/gtkmm2/gtk/gtkmm/notebook.cc @@ -466,16 +466,11 @@ int Notebook::insert_page(Widget& child, int position) return gtk_notebook_insert_page(gobj(), child.gobj(), 0 /* see GTK+ docs */, position); } - /** For instance, - * Notebook* on_window_creation(Widget* page, int x, int y); - */ - typedef sigc::slot SlotWindowCreation; +typedef sigc::slot SlotWindowCreation; void Notebook::set_window_creation_hook(const SlotWindowCreation& slot) { SlotWindowCreation* slot_copy = new SlotWindowCreation(slot); - //TODO: GTK+ needs a destroy callback so we can delete the slot later. - //See bug 344209 gtk_notebook_set_window_creation_hook(&SignalProxy_WindowCreation_gtk_callback, slot_copy, &SignalProxy_WindowCreation_gtk_callback_destroy); } @@ -681,7 +676,7 @@ void Notebook_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Notebook_Class::switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0, guint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -689,32 +684,35 @@ void Notebook_Class::switch_page_callback(GtkNotebook* self, GtkNotebookPage* p0 // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_switch_page(p0, p1); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_switch_page(p0, p1); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->switch_page) - (*base->switch_page)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->switch_page) + (*base->switch_page)(self, p0, p1); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -760,7 +758,8 @@ GType Notebook::get_base_type() Notebook::Notebook() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(notebook_class_.init())) { } @@ -800,16 +799,39 @@ void Notebook::remove_page(int page_num) gtk_notebook_remove_page(gobj(), page_num); } +#ifndef GTKMM_DISABLE_DEPRECATED + void Notebook::set_group_id(int group_id) { gtk_notebook_set_group_id(gobj(), group_id); } +#endif // GTKMM_DISABLE_DEPRECATED + +#ifndef GTKMM_DISABLE_DEPRECATED + int Notebook::get_group_id() const { return gtk_notebook_get_group_id(const_cast(gobj())); } +#endif // GTKMM_DISABLE_DEPRECATED + +void Notebook::set_group(void* group) +{ +gtk_notebook_set_group(gobj(), group); +} + +void* Notebook::get_group() +{ + return gtk_notebook_get_group(gobj()); +} + +const void* Notebook::get_group() const +{ + return const_cast(this)->get_group(); +} + int Notebook::get_current_page() const { return gtk_notebook_get_current_page(const_cast(gobj())); @@ -825,16 +847,34 @@ const Widget* Notebook::get_nth_page(int page_num) const return const_cast(this)->get_nth_page(page_num); } +#ifndef GTKMM_DISABLE_DEPRECATED + int Notebook::get_n_pages() { return gtk_notebook_get_n_pages(gobj()); } +#endif // GTKMM_DISABLE_DEPRECATED + +int Notebook::get_n_pages() const +{ + return gtk_notebook_get_n_pages(const_cast(gobj())); +} + +#ifndef GTKMM_DISABLE_DEPRECATED + int Notebook::page_num(const Widget& child) { return gtk_notebook_page_num(gobj(), const_cast((child).gobj())); } +#endif // GTKMM_DISABLE_DEPRECATED + +int Notebook::page_num(const Widget& child) const +{ + return gtk_notebook_page_num(const_cast(gobj()), const_cast((child).gobj())); +} + void Notebook::set_current_page(int page_num) { gtk_notebook_set_current_page(gobj(), page_num); diff --git a/libs/gtkmm2/gtk/gtkmm/notebook.h b/libs/gtkmm2/gtk/gtkmm/notebook.h index cb90d44ffc..5585be713e 100644 --- a/libs/gtkmm2/gtk/gtkmm/notebook.h +++ b/libs/gtkmm2/gtk/gtkmm/notebook.h @@ -479,52 +479,131 @@ public: static void set_window_creation_hook(const SlotWindowCreation& slot); +#ifndef GTKMM_DISABLE_DEPRECATED + + /** Sets an group identificator for @a notebook , notebooks sharing + * the same group identificator will be able to exchange tabs + * via drag and drop. A notebook with group identificator -1 will + * not be able to exchange tabs with any other notebook. + * + * @newin2p10 + * Deprecated:2.12: use set_group() instead. + * @param group_id A group identificator, or -1 to unset it. + */ void set_group_id(int group_id); - +#endif // GTKMM_DISABLE_DEPRECATED + + +#ifndef GTKMM_DISABLE_DEPRECATED + + /** Gets the current group identificator for @a notebook . + * @return The group identificator, or -1 if none is set. + * + * @newin2p10 + * Deprecated:2.12: use get_group() instead. + */ int get_group_id() const; +#endif // GTKMM_DISABLE_DEPRECATED + + + //TODO: Use something nicer than void*/gpointer? + + /** Sets a group identificator pointer for @a notebook , notebooks sharing + * the same group identificator pointer will be able to exchange tabs + * via drag and drop. A notebook with a 0 group identificator will + * not be able to exchange tabs with any other notebook. + * + * @newin2p12 + * @param group A pointer to identify the notebook group, or 0 to unset it. + */ + void set_group(void* group); + + /** Gets the current group identificator pointer for @a notebook . + * @return The group identificator, or 0 if none is set. + * + * @newin2p12. + */ + void* get_group(); + + /** Gets the current group identificator pointer for @a notebook . + * @return The group identificator, or 0 if none is set. + * + * @newin2p12. + */ + const void* get_group() const; - /** Returns the page number of the current page. + /** Return value: the index (starting from 0) of the current * @return The index (starting from 0) of the current * page in the notebook. If the notebook has no pages, then * -1 will be returned. */ int get_current_page() const; - /** Returns the child widget contained in page number @a page_num . - * @param page_num The index of a page in the noteobok, or -1 + /** Return value: the child widget, or 0 if @a page_num is + * @param page_num The index of a page in the notebook, or -1 * to get the last page. * @return The child widget, or 0 if @a page_num is * out of bounds. */ Widget* get_nth_page(int page_num); - /** Returns the child widget contained in page number @a page_num . - * @param page_num The index of a page in the noteobok, or -1 + /** Return value: the child widget, or 0 if @a page_num is + * @param page_num The index of a page in the notebook, or -1 * to get the last page. * @return The child widget, or 0 if @a page_num is * out of bounds. */ const Widget* get_nth_page(int page_num) const; +#ifndef GTKMM_DISABLE_DEPRECATED + /** Gets the number of pages in a notebook. + * @deprecated Use the const method. * @return The number of pages in the notebook. * * @newin2p2. */ int get_n_pages(); +#endif // GTKMM_DISABLE_DEPRECATED + + + /** Gets the number of pages in a notebook. + * @return The number of pages in the notebook. + * + * @newin2p2. + */ + int get_n_pages() const; /*Widget* get_current_page();*/ /*inconsistency with set_current_page*/ +#ifndef GTKMM_DISABLE_DEPRECATED + + /** Finds the index of the page which contains the given child + * widget. + * @deprecated Use the const method. + * @param child A Gtk::Widget. + * @return The index of the page containing @a child , or + * -1 if @a child is not in the notebook. + */ + int page_num(const Widget& child); +#endif // GTKMM_DISABLE_DEPRECATED + + /** Finds the index of the page which contains the given child * widget. * @param child A Gtk::Widget. * @return The index of the page containing @a child , or * -1 if @a child is not in the notebook. */ - int page_num(const Widget& child); + int page_num(const Widget& child) const; - /** Switches to the page number @a page_num . + /** Switches to the page number @a page_num . + * + * Note that due to historical reasons, GtkNotebook refuses + * to switch to a page unless the child widget is visible. + * Therefore, it is recommended to show child widgets before + * adding them to a notebook. * @param page_num Index of the page to switch to, starting from 0. * If negative, the last page will be used. If greater * than the number of pages in the notebook, nothing @@ -551,8 +630,7 @@ public: void set_show_border(bool show_border = true); - /** Returns whether a bevel will be drawn around the notebook pages. See - * set_show_border(). + /** Return value: true if the bevel is drawn * @return true if the bevel is drawn. */ bool get_show_border() const; @@ -562,8 +640,7 @@ public: */ void set_show_tabs(bool show_tabs = true); - /** Returns whether the tabs of the notebook are shown. See - * set_show_tabs(). + /** Return value: true if the tabs are shown * @return true if the tabs are shown. */ bool get_show_tabs() const; @@ -588,8 +665,7 @@ public: */ void set_scrollable(bool scrollable = true); - /** Returns whether the tab label area has arrows for scrolling. See - * set_scrollable(). + /** Return value: true if arrows for scrolling are present * @return true if arrows for scrolling are present. */ bool get_scrollable() const; @@ -606,17 +682,13 @@ public: void popup_disable(); - /** Returns the tab label widget for the page @a child . 0 is returned - * if @a child is not in @a notebook or if no tab label has specifically - * been set for @a child . + /** Return value: the tab label * @param child The page. * @return The tab label. */ Widget* get_tab_label(Widget& child); - /** Returns the tab label widget for the page @a child . 0 is returned - * if @a child is not in @a notebook or if no tab label has specifically - * been set for @a child . + /** Return value: the tab label * @param child The page. * @return The tab label. */ @@ -701,12 +773,73 @@ public: void reorder_child(Widget& child, int position); + /** Gets whether the tab can be reordered via drag and drop or not. + * @param child A child Gtk::Widget. + * @return true if the tab is reorderable. + * + * @newin2p10. + */ bool get_tab_reorderable(Widget& child) const; + /** Sets whether the notebook tab can be reordered + * via drag and drop or not. + * + * @newin2p10 + * @param child A child Gtk::Widget. + * @param reorderable Whether the tab is reorderable or not. + */ void set_tab_reorderable(Widget& child, bool reorderable = true); + /** Return Value: true if the tab is detachable. + * @param child A child Gtk::Widget. + * @return true if the tab is detachable. + * + * @newin2p10. + */ bool get_tab_detachable(Widget& child) const; + /** Sets whether the tab can be detached from @a notebook to another + * notebook or widget. + * + * Note that 2 notebooks must share a common group identificator + * (see set_group_id()) to allow automatic tabs + * interchange between them. + * + * If you want a widget to interact with a notebook through DnD + * (i.e.: accept dragged tabs from it) it must be set as a drop + * destination and accept the target "GTK_NOTEBOOK_TAB". The notebook + * will fill the selection with a GtkWidget** pointing to the child + * widget that corresponds to the dropped tab. + * + * @code + * static void + * on_drop_zone_drag_data_received (GtkWidget *widget, + * GdkDragContext *context, + * int x, + * int y, + * GtkSelectionData *selection_data, + * unsigned int info, + * unsigned int time, + * gpointer user_data) + * { + * GtkWidget *notebook; + * GtkWidget **child; + * + * notebook = gtk_drag_get_source_widget (context); + * child = (void*) selection_data->data; + * + * process_widget (*child); + * gtk_container_remove (GTK_CONTAINER (notebook), *child); + * } + * @endcode + * + * If you want a notebook to accept drags from other widgets, + * you will have to set your own DnD code to do it. + * + * @newin2p10 + * @param child A child Gtk::Widget. + * @param detachable Whether the tab is detachable or not. + */ void set_tab_detachable(Widget& child, bool detachable = true); @@ -716,33 +849,33 @@ public: const PageList& pages() const; -/** + /** * @par Prototype: - * void %switch_page(GtkNotebookPage* page, guint page_num) + * void on_my_%switch_page(GtkNotebookPage* page, guint page_num) */ Glib::SignalProxy2< void,GtkNotebookPage*,guint > signal_switch_page(); -/** + /** * @par Prototype: - * void %page_reordered(Widget* page, guint page_num) + * void on_my_%page_reordered(Widget* page, guint page_num) */ Glib::SignalProxy2< void,Widget*,guint > signal_page_reordered(); -/** + /** * @par Prototype: - * void %page_removed(Widget* page, guint page_num) + * void on_my_%page_removed(Widget* page, guint page_num) */ Glib::SignalProxy2< void,Widget*,guint > signal_page_removed(); -/** + /** * @par Prototype: - * void %page_added(Widget* page, guint page_num) + * void on_my_%page_added(Widget* page, guint page_num) */ Glib::SignalProxy2< void,Widget*,guint > signal_page_added(); @@ -751,6 +884,9 @@ public: //Key-binding signals: + //This doesn't seem generally useful: + + #ifdef GLIBMM_PROPERTIES_ENABLED /** Which side of the notebook holds the tabs. * @@ -980,10 +1116,13 @@ PageIterator::pointer PageIterator::operator->() const namespace Glib { - /** @relates Gtk::Notebook - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Notebook */ Gtk::Notebook* wrap(GtkNotebook* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/object.h b/libs/gtkmm2/gtk/gtkmm/object.h index 2f7f07c263..dfdee15908 100644 --- a/libs/gtkmm2/gtk/gtkmm/object.h +++ b/libs/gtkmm2/gtk/gtkmm/object.h @@ -200,10 +200,13 @@ protected: namespace Glib { - /** @relates Gtk::Object - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Object */ Gtk::Object* wrap(GtkObject* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/optionmenu.cc b/libs/gtkmm2/gtk/gtkmm/optionmenu.cc index bf845e5833..4a9a5ea17e 100644 --- a/libs/gtkmm2/gtk/gtkmm/optionmenu.cc +++ b/libs/gtkmm2/gtk/gtkmm/optionmenu.cc @@ -38,8 +38,9 @@ namespace Gtk OptionMenu::OptionMenu() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Button(Glib::ConstructParams(optionmenu_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Button(Glib::ConstructParams(optionmenu_class_.init())) { // Connect to the signal instead of overriding the on_hierarchy_changed() // method because invocation of C++ default signal handlers is skipped @@ -145,7 +146,7 @@ void OptionMenu_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void OptionMenu_Class::changed_callback(GtkOptionMenu* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -153,32 +154,35 @@ void OptionMenu_Class::changed_callback(GtkOptionMenu* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/optionmenu.h b/libs/gtkmm2/gtk/gtkmm/optionmenu.h index bd88612a02..ea6f27d2cd 100644 --- a/libs/gtkmm2/gtk/gtkmm/optionmenu.h +++ b/libs/gtkmm2/gtk/gtkmm/optionmenu.h @@ -3,6 +3,8 @@ #ifndef _GTKMM_OPTIONMENU_H #define _GTKMM_OPTIONMENU_H +#include + #ifndef GTKMM_DISABLE_DEPRECATED @@ -29,6 +31,10 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// This is for including the config header before any code (such as +// the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated: + + #include @@ -131,16 +137,16 @@ public: /** Retrieves the index of the currently selected menu item. The menu * items are numbered from top to bottom, starting with 0. * @return Index of the selected menu item, or -1 if there are no menu items - * Deprecated: Use Gtk::ComboBox instead. + * Deprecated: 2.4: Use Gtk::ComboBox instead. */ int get_history() const; void set_history(guint index); -/** + /** * @par Prototype: - * void %changed() + * void on_my_%changed() */ Glib::SignalProxy0< void > signal_changed(); @@ -157,10 +163,13 @@ private: namespace Glib { - /** @relates Gtk::OptionMenu - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::OptionMenu */ Gtk::OptionMenu* wrap(GtkOptionMenu* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/pagesetup.cc b/libs/gtkmm2/gtk/gtkmm/pagesetup.cc index 1fd7f16493..66d05be03e 100644 --- a/libs/gtkmm2/gtk/gtkmm/pagesetup.cc +++ b/libs/gtkmm2/gtk/gtkmm/pagesetup.cc @@ -24,6 +24,16 @@ #include #include +namespace Gtk +{ + +void PageSetup::save_to_key_file(Glib::KeyFile& key_file) +{ + gtk_page_setup_to_key_file(gobj(), (key_file).gobj(), 0); +} + +} //namespace + namespace { } // anonymous namespace @@ -129,7 +139,8 @@ GType PageSetup::get_base_type() PageSetup::PageSetup() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(pagesetup_class_.init())) { } @@ -228,6 +239,31 @@ double PageSetup::get_page_height(Unit unit) const return gtk_page_setup_get_page_height(const_cast(gobj()), ((GtkUnit)(unit))); } +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool PageSetup::save_to_file(const std::string& file_name) const +#else +bool PageSetup::save_to_file(const std::string& file_name, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = gtk_page_setup_to_file(const_cast(gobj()), file_name.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +void PageSetup::save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) +{ +gtk_page_setup_to_key_file(gobj(), (key_file).gobj(), group_name.c_str()); +} + #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/pagesetup.h b/libs/gtkmm2/gtk/gtkmm/pagesetup.h index 5ff810ca76..e4e1a8c05f 100644 --- a/libs/gtkmm2/gtk/gtkmm/pagesetup.h +++ b/libs/gtkmm2/gtk/gtkmm/pagesetup.h @@ -102,55 +102,200 @@ private: protected: PageSetup(); +#if 0 //TODO: Reimplement, or add _construct_from_* functions in GTK+. See bug #475565 . +GtkPageSetup *gtk_page_setup_new_from_file (const gchar *file_name, + GError **error); +GtkPageSetup *gtk_page_setup_new_from_key_file (GKeyFile *key_file, + const gchar *group_name, + GError **error); +#endif + public: static Glib::RefPtr create(); + /** Gets the page orientation of the Gtk::PageSetup. + * @return The page orientation + * + * @newin2p10. + */ PageOrientation get_orientation() const; + /** Sets the page orientation of the Gtk::PageSetup. + * + * @newin2p10 + * @param orientation A Gtk::PageOrientation value. + */ void set_orientation(PageOrientation orientation); + /** Gets the paper size of the Gtk::PageSetup. + * @return The paper size + * + * @newin2p10. + */ PaperSize get_paper_size(); + /** Gets the paper size of the Gtk::PageSetup. + * @return The paper size + * + * @newin2p10. + */ const PaperSize get_paper_size() const; + /** Sets the paper size of the Gtk::PageSetup without + * changing the margins. See + * gtk_page_setup_set_paper_size_and_default_margins(). + * + * @newin2p10 + * @param size A Gtk::PaperSize. + */ void set_paper_size(const PaperSize& paper_size); + /** Gets the top margin in units of @a unit . + * @param unit The unit for the return value. + * @return The top margin + * + * @newin2p10. + */ double get_top_margin(Unit unit) const; + /** Sets the top margin of the Gtk::PageSetup. + * + * @newin2p10 + * @param margin The new top margin in units of @a unit . + * @param unit The units for @a margin . + */ void set_top_margin(double margin, Unit unit); + /** Gets the bottom margin in units of @a unit . + * @param unit The unit for the return value. + * @return The bottom margin + * + * @newin2p10. + */ double get_bottom_margin(Unit unit) const; + /** Sets the bottom margin of the Gtk::PageSetup. + * + * @newin2p10 + * @param margin The new bottom margin in units of @a unit . + * @param unit The units for @a margin . + */ void set_bottom_margin(double margin, Unit unit); + /** Gets the left margin in units of @a unit . + * @param unit The unit for the return value. + * @return The left margin + * + * @newin2p10. + */ double get_left_margin(Unit unit) const; + /** Sets the left margin of the Gtk::PageSetup. + * + * @newin2p10 + * @param margin The new left margin in units of @a unit . + * @param unit The units for @a margin . + */ void set_left_margin(double margin, Unit unit); + /** Gets the right margin in units of @a unit . + * @param unit The unit for the return value. + * @return The right margin + * + * @newin2p10. + */ double get_right_margin(Unit unit) const; + /** Sets the right margin of the Gtk::PageSetup. + * + * @newin2p10 + * @param margin The new right margin in units of @a unit . + * @param unit The units for @a margin . + */ void set_right_margin(double margin, Unit unit); + /** Sets the paper size of the Gtk::PageSetup and modifies + * the margins according to the new paper size. + * + * @newin2p10 + * @param size A Gtk::PaperSize. + */ void set_paper_size_and_default_margins(const PaperSize& paper_size); + /** Return value: the paper width. + * @param unit The unit for the return value. + * @return The paper width. + * + * @newin2p10. + */ double get_paper_width(Unit unit) const; + /** Return value: the paper height. + * @param unit The unit for the return value. + * @return The paper height. + * + * @newin2p10. + */ double get_paper_height(Unit unit) const; + /** Return value: the page width. + * @param unit The unit for the return value. + * @return The page width. + * + * @newin2p10. + */ double get_page_width(Unit unit) const; + /** Return value: the page height. + * @param unit The unit for the return value. + * @return The page height. + * + * @newin2p10. + */ double get_page_height(Unit unit) const; + //The save_ prefix was added to these functions to make them clearer. GTK+ didn't want to change them. + + /** This function saves the information from @a setup to @a file_name . + * @a throws Glib::FileError + * @param file_name The file to save to. + * @return true on success + * + * @newin2p12. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool save_to_file(const std::string& file_name) const; +#else + bool save_to_file(const std::string& file_name, std::auto_ptr& error) const; +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** This function adds the page setup from @a setup to @a key_file . + * + * @newin2p12 + * @param key_file The Glib::KeyFile to save the page setup to. + * @param group_name The group to add the settings to in @a key_file . + */ + void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name); + + /** This function adds the page setup from @a setup to @a key_file, + * in the group "Page Setup" + * + * @newin2p12 + * @param key_file The G::KeyFile to save the page setup to. + */ + void save_to_key_file(Glib::KeyFile& key_file); + public: @@ -176,10 +321,13 @@ protected: namespace Glib { - /** @relates Gtk::PageSetup - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PageSetup */ Glib::RefPtr wrap(GtkPageSetup* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.cc b/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.cc index 0c37d00aab..170ab9b2c8 100644 --- a/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.cc @@ -29,16 +29,18 @@ namespace Gtk PageSetupUnixDialog::PageSetupUnixDialog(Gtk::Window& parent, const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(pagesetupunixdialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(pagesetupunixdialog_class_.init(), "title",title.c_str(), static_cast(0))) { set_transient_for(parent); } PageSetupUnixDialog::PageSetupUnixDialog(const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(pagesetupunixdialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(pagesetupunixdialog_class_.init(), "title",title.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.h b/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.h index 3177c56517..5c82ad7c6f 100644 --- a/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.h +++ b/libs/gtkmm2/gtk/gtkmm/pagesetupunixdialog.h @@ -118,17 +118,49 @@ public: explicit PageSetupUnixDialog(const Glib::ustring& title); + /** Sets the Gtk::PageSetup from which the page setup + * dialog takes its values. + * + * @newin2p10 + * @param page_setup A Gtk::PageSetup. + */ void set_page_setup(const Glib::RefPtr& page_setup); + /** Gets the currently selected page setup from the dialog. + * @return The current page setup + * + * @newin2p10. + */ Glib::RefPtr get_page_setup(); + /** Gets the currently selected page setup from the dialog. + * @return The current page setup + * + * @newin2p10. + */ Glib::RefPtr get_page_setup() const; + /** Sets the Gtk::PrintSettings from which the page setup dialog + * takes its values. + * + * @newin2p10 + * @param print_settings A Gtk::PrintSettings. + */ void set_print_settings(const Glib::RefPtr& print_settings); + /** Gets the current print settings from the dialog. + * @return The current print settings + * + * @newin2p10. + */ Glib::RefPtr get_print_settings(); + /** Gets the current print settings from the dialog. + * @return The current print settings + * + * @newin2p10. + */ Glib::RefPtr get_print_settings() const; @@ -139,10 +171,13 @@ public: namespace Glib { - /** @relates Gtk::PageSetupUnixDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PageSetupUnixDialog */ Gtk::PageSetupUnixDialog* wrap(GtkPageSetupUnixDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/paned.cc b/libs/gtkmm2/gtk/gtkmm/paned.cc index 94a884ce16..8b323ac5bf 100644 --- a/libs/gtkmm2/gtk/gtkmm/paned.cc +++ b/libs/gtkmm2/gtk/gtkmm/paned.cc @@ -153,7 +153,8 @@ GType Paned::get_base_type() Paned::Paned() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(paned_class_.init())) { } @@ -357,7 +358,8 @@ GType HPaned::get_base_type() HPaned::HPaned() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Paned(Glib::ConstructParams(hpaned_class_.init())) { } @@ -468,7 +470,8 @@ GType VPaned::get_base_type() VPaned::VPaned() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Paned(Glib::ConstructParams(vpaned_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/paned.h b/libs/gtkmm2/gtk/gtkmm/paned.h index 45298ae9b5..75c30fb3a8 100644 --- a/libs/gtkmm2/gtk/gtkmm/paned.h +++ b/libs/gtkmm2/gtk/gtkmm/paned.h @@ -419,10 +419,13 @@ public: namespace Glib { - /** @relates Gtk::Paned - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Paned */ Gtk::Paned* wrap(GtkPaned* object, bool take_copy = false); } //namespace Glib @@ -430,10 +433,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HPaned - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HPaned */ Gtk::HPaned* wrap(GtkHPaned* object, bool take_copy = false); } //namespace Glib @@ -441,10 +447,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VPaned - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VPaned */ Gtk::VPaned* wrap(GtkVPaned* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/papersize.cc b/libs/gtkmm2/gtk/gtkmm/papersize.cc index 68606cfdce..6f23559537 100644 --- a/libs/gtkmm2/gtk/gtkmm/papersize.cc +++ b/libs/gtkmm2/gtk/gtkmm/papersize.cc @@ -54,12 +54,29 @@ PaperSize::PaperSize(const Glib::ustring& name, const Glib::ustring& display_nam GtkUnit(unit))) {} +//TODO: Add an operator bool() so we can detect if this succeeded: +PaperSize::PaperSize(const Glib::KeyFile& key_file, const Glib::ustring& group_name) +: + gobject_(gtk_paper_size_new_from_key_file(const_cast(key_file.gobj()), (group_name.empty() ? NULL : group_name.c_str()) , NULL /* GError */)) +{} + bool PaperSize::equal(const PaperSize& other) const { return (static_cast(gtk_paper_size_is_equal(const_cast(this->gobj()), const_cast(other.gobj())))); } +PaperSize::operator bool() const +{ + return (gobj() != NULL); +} + +void PaperSize::save_to_key_file(Glib::KeyFile& key_file) +{ + gtk_paper_size_to_key_file( gobj(), (key_file).gobj(), 0); +} + + } // namespace Gtk namespace @@ -199,6 +216,12 @@ Glib::ustring PaperSize::get_default() } +void PaperSize::save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) +{ +gtk_paper_size_to_key_file(gobj(), (key_file).gobj(), group_name.c_str()); +} + + } // namespace Gtk diff --git a/libs/gtkmm2/gtk/gtkmm/papersize.h b/libs/gtkmm2/gtk/gtkmm/papersize.h index d1e38bf18f..a965ddbf9d 100644 --- a/libs/gtkmm2/gtk/gtkmm/papersize.h +++ b/libs/gtkmm2/gtk/gtkmm/papersize.h @@ -132,37 +132,135 @@ public: explicit PaperSize(const Glib::ustring& ppd_name, const Glib::ustring& ppd_display_name, double width, double height); explicit PaperSize(const Glib::ustring& name, const Glib::ustring& display_name, double width, double height, Unit unit); + explicit PaperSize(const Glib::KeyFile& key_file, const Glib::ustring& group_name = Glib::ustring()); + bool equal(const PaperSize& other) const; + /** Returns true if the PaperSize is a valid object. + * @newin2p12 + */ + operator bool() const; + + //TODO: Check this conversion and type: + + + //TODO: _WRAP_METHOD(static Glib::ListHandle get_paper_sizes(bool include_custom = true) const, gtk_paper_size_get_paper_sizes) + + /** Gets the name of the Gtk::PaperSize. + * @return The name of @a size + * + * @newin2p10. + */ Glib::ustring get_name() const; + /** Gets the human-readable name of the Gtk::PaperSize. + * @return The human-readable name of @a size + * + * @newin2p10. + */ Glib::ustring get_display_name() const; + /** Gets the PPD name of the Gtk::PaperSize, which + * may be 0. + * @return The PPD name of @a size + * + * @newin2p10. + */ Glib::ustring get_ppd_name() const; + /** Gets the paper width of the Gtk::PaperSize, in + * units of @a unit . + * @param unit The unit for the return value. + * @return The paper width + * + * @newin2p10. + */ double get_width(Unit unit) const; + /** Gets the paper height of the Gtk::PaperSize, in + * units of @a unit . + * @param unit The unit for the return value. + * @return The paper height + * + * @newin2p10. + */ double get_height(Unit unit) const; + /** Return value: whether @a size is a custom paper size. + * @return Whether @a size is a custom paper size. + */ bool is_custom() const; + /** Changes the dimensions of a @a size to @a width x @a height . + * + * @newin2p10 + * @param width The new width in units of @a unit . + * @param height The new height in units of @a unit . + * @param unit The unit for @a width and @a height . + */ void set_size(double width, double height, Unit unit); + /** Gets the default top margin for the Gtk::PaperSize. + * @param unit The unit for the return value. + * @return The default top margin + * + * @newin2p10. + */ double get_default_top_margin(Unit unit) const; + /** Gets the default bottom margin for the Gtk::PaperSize. + * @param unit The unit for the return value. + * @return The default bottom margin + * + * @newin2p10. + */ double get_default_bottom_margin(Unit unit) const; + /** Gets the default left margin for the Gtk::PaperSize. + * @param unit The unit for the return value. + * @return The default left margin + * + * @newin2p10. + */ double get_default_left_margin(Unit unit) const; + /** Gets the default right margin for the Gtk::PaperSize. + * @param unit The unit for the return value. + * @return The default right margin + * + * @newin2p10. + */ double get_default_right_margin(Unit unit) const; + /** Return value: the name of the default paper size. The string + * @return The name of the default paper size. The string + * is owned by GTK+ and should not be modified. + * + * @newin2p10. + */ static Glib::ustring get_default(); + + /** This function adds the paper size from @a size to @a key_file . + * + * @newin2p12 + * @param key_file The G::KeyFile to save the paper size to. + * @param group_name The group to add the settings to in @a key_file . + */ + void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name); + + /** This function adds the paper size to @a key_file in the first group. + * + * @newin2p12 + * @param key_file The Glib::KeyFile to save the paper size to. + */ + void save_to_key_file(Glib::KeyFile& key_file); + }; @@ -192,10 +290,13 @@ inline void swap(PaperSize& lhs, PaperSize& rhs) namespace Glib { -/** @relates Gtk::PaperSize - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PaperSize */ Gtk::PaperSize wrap(GtkPaperSize* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/plug.cc b/libs/gtkmm2/gtk/gtkmm/plug.cc index c11c8df831..bf602c9e0e 100644 --- a/libs/gtkmm2/gtk/gtkmm/plug.cc +++ b/libs/gtkmm2/gtk/gtkmm/plug.cc @@ -33,24 +33,27 @@ namespace Gtk Plug::Plug() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Window(Glib::ConstructParams(plug_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Window(Glib::ConstructParams(plug_class_.init())) { gtk_plug_construct(gobj(), 0); } Plug::Plug(GdkNativeWindow socket_id) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Window(Glib::ConstructParams(plug_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Window(Glib::ConstructParams(plug_class_.init())) { gtk_plug_construct(gobj(), socket_id); } Plug::Plug(const Glib::RefPtr& display, GdkNativeWindow socket_id) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Window(Glib::ConstructParams(plug_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Window(Glib::ConstructParams(plug_class_.init())) { gtk_plug_construct_for_display(gobj(), Glib::unwrap(display), socket_id); } @@ -128,7 +131,7 @@ void Plug_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Plug_Class::embedded_callback(GtkPlug* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -136,32 +139,35 @@ void Plug_Class::embedded_callback(GtkPlug* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_embedded(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_embedded(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->embedded) - (*base->embedded)(self); - } + // Call the original underlying C function: + if(base && base->embedded) + (*base->embedded)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/plug.h b/libs/gtkmm2/gtk/gtkmm/plug.h index 7877848e10..1cb54462a7 100644 --- a/libs/gtkmm2/gtk/gtkmm/plug.h +++ b/libs/gtkmm2/gtk/gtkmm/plug.h @@ -118,9 +118,9 @@ public: GdkNativeWindow get_id() const; -/** + /** * @par Prototype: - * void %embedded() + * void on_my_%embedded() */ Glib::SignalProxy0< void > signal_embedded(); @@ -133,10 +133,13 @@ public: namespace Glib { - /** @relates Gtk::Plug - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Plug */ Gtk::Plug* wrap(GtkPlug* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/printcontext.h b/libs/gtkmm2/gtk/gtkmm/printcontext.h index 662a86b3f2..c36d93c4ba 100644 --- a/libs/gtkmm2/gtk/gtkmm/printcontext.h +++ b/libs/gtkmm2/gtk/gtkmm/printcontext.h @@ -107,36 +107,116 @@ private: public: + /** Obtains the cairo context that is associated with the + * Gtk::PrintContext. + * @return The cairo context of @a context + * + * @newin2p10. + */ Cairo::RefPtr get_cairo_context(); + /** Obtains the cairo context that is associated with the + * Gtk::PrintContext. + * @return The cairo context of @a context + * + * @newin2p10. + */ Cairo::RefPtr get_cairo_context() const; + /** Obtains the Gtk::PageSetup that determines the page + * dimensions of the Gtk::PrintContext. + * @return The page setup of @a context + * + * @newin2p10. + */ Glib::RefPtr get_page_setup(); + /** Obtains the Gtk::PageSetup that determines the page + * dimensions of the Gtk::PrintContext. + * @return The page setup of @a context + * + * @newin2p10. + */ Glib::RefPtr get_page_setup() const; + /** Obtains the width of the Gtk::PrintContext, in pixels. + * @return The width of @a context + * + * @newin2p10. + */ double get_width() const; + /** Obtains the height of the Gtk::PrintContext, in pixels. + * @return The height of @a context + * + * @newin2p10. + */ double get_height() const; + /** Obtains the horizontal resolution of the Gtk::PrintContext, + * in dots per inch. + * @return The horizontal resolution of @a context + * + * @newin2p10. + */ double get_dpi_x() const; + /** Obtains the vertical resolution of the Gtk::PrintContext, + * in dots per inch. + * @return The vertical resolution of @a context + * + * @newin2p10. + */ double get_dpi_y() const; + /** Return value: the font map of @a context + * @return The font map of @a context + * + * @newin2p10. + */ Glib::RefPtr get_pango_fontmap(); + /** Return value: the font map of @a context + * @return The font map of @a context + * + * @newin2p10. + */ Glib::RefPtr get_pango_fontmap() const; + /** Creates a new Pango::Context that can be used with the + * Gtk::PrintContext. + * @return A new Pango context for @a context + * + * @newin2p10. + */ Glib::RefPtr create_pango_context(); + /** Creates a new Pango::Layout that is suitable for use + * with the Gtk::PrintContext. + * @return A new Pango layout for @a context + * + * @newin2p10. + */ Glib::RefPtr create_pango_layout(); + /** Sets a new cairo context on a print context. + * + * This function is intended to be used when implementing + * an internal print preview, it is not needed for printing, + * since GTK+ itself creates a suitable cairo context in that + * case. + * + * @newin2p10 + * @param cr The cairo context. + * @param dpi_x The horizontal resolution to use with @a cr . + * @param dpi_y The vertical resolution to use with @a cr . + */ void set_cairo_context(const Cairo::RefPtr& cr, double dpi_x, double dpi_y); @@ -164,10 +244,13 @@ protected: namespace Glib { - /** @relates Gtk::PrintContext - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PrintContext */ Glib::RefPtr wrap(GtkPrintContext* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/printer.cc b/libs/gtkmm2/gtk/gtkmm/printer.cc index b9f049c9b3..4c1d9bf28a 100644 --- a/libs/gtkmm2/gtk/gtkmm/printer.cc +++ b/libs/gtkmm2/gtk/gtkmm/printer.cc @@ -115,6 +115,12 @@ static const Glib::SignalProxyInfo Printer_signal_details_acquired_info = } // anonymous namespace +// static +GType Glib::Value::value_type() +{ + return gtk_print_capabilities_get_type(); +} + namespace Glib { @@ -173,7 +179,7 @@ void Printer_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Printer_Class::details_acquired_callback(GtkPrinter* self, gboolean p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -181,33 +187,36 @@ void Printer_Class::details_acquired_callback(GtkPrinter* self, gboolean p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_details_acquired(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_details_acquired(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->details_acquired) - (*base->details_acquired)(self, p0); - } + // Call the original underlying C function: + if(base && base->details_acquired) + (*base->details_acquired)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -308,6 +317,31 @@ bool Printer::accepts_ps() const return gtk_printer_accepts_ps(const_cast(gobj())); } +Glib::ListHandle< Glib::RefPtr > Printer::list_papers() +{ + return Glib::ListHandle< Glib::RefPtr >(gtk_printer_list_papers(gobj()), Glib::OWNERSHIP_DEEP); +} + +Glib::ListHandle< Glib::RefPtr > Printer::list_papers() const +{ + return Glib::ListHandle< Glib::RefPtr >(gtk_printer_list_papers(const_cast(gobj())), Glib::OWNERSHIP_DEEP); +} + +bool Printer::has_details() const +{ + return gtk_printer_has_details(const_cast(gobj())); +} + +void Printer::request_details() +{ +gtk_printer_request_details(gobj()); +} + +PrintCapabilities Printer::get_capabilities() const +{ + return (PrintCapabilities)gtk_printer_get_capabilities(const_cast(gobj())); +} + Glib::SignalProxy1< void,bool > Printer::signal_details_acquired() { diff --git a/libs/gtkmm2/gtk/gtkmm/printer.h b/libs/gtkmm2/gtk/gtkmm/printer.h index 1ca588d020..0c696ccf81 100644 --- a/libs/gtkmm2/gtk/gtkmm/printer.h +++ b/libs/gtkmm2/gtk/gtkmm/printer.h @@ -23,7 +23,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -37,6 +37,82 @@ namespace Gtk namespace Gtk { +/** @addtogroup gtkmmEnums Enums and Flags */ + +/** + * @ingroup gtkmmEnums + * @par Bitwise operators: + * %PrintCapabilities operator|(PrintCapabilities, PrintCapabilities)
+ * %PrintCapabilities operator&(PrintCapabilities, PrintCapabilities)
+ * %PrintCapabilities operator^(PrintCapabilities, PrintCapabilities)
+ * %PrintCapabilities operator~(PrintCapabilities)
+ * %PrintCapabilities& operator|=(PrintCapabilities&, PrintCapabilities)
+ * %PrintCapabilities& operator&=(PrintCapabilities&, PrintCapabilities)
+ * %PrintCapabilities& operator^=(PrintCapabilities&, PrintCapabilities)
+ */ +enum PrintCapabilities +{ + PRINT_CAPABILITY_PAGE_SET = 1 << 0, + PRINT_CAPABILITY_COPIES = 1 << 1, + PRINT_CAPABILITY_COLLATE = 1 << 2, + PRINT_CAPABILITY_REVERSE = 1 << 3, + PRINT_CAPABILITY_SCALE = 1 << 4, + PRINT_CAPABILITY_GENERATE_PDF = 1 << 5, + PRINT_CAPABILITY_GENERATE_PS = 1 << 6, + PRINT_CAPABILITY_PREVIEW = 1 << 7, + PRINT_CAPABILITY_NUMBER_UP = 1 << 8 +}; + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities operator|(PrintCapabilities lhs, PrintCapabilities rhs) + { return static_cast(static_cast(lhs) | static_cast(rhs)); } + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities operator&(PrintCapabilities lhs, PrintCapabilities rhs) + { return static_cast(static_cast(lhs) & static_cast(rhs)); } + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities operator^(PrintCapabilities lhs, PrintCapabilities rhs) + { return static_cast(static_cast(lhs) ^ static_cast(rhs)); } + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities operator~(PrintCapabilities flags) + { return static_cast(~static_cast(flags)); } + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities& operator|=(PrintCapabilities& lhs, PrintCapabilities rhs) + { return (lhs = static_cast(static_cast(lhs) | static_cast(rhs))); } + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities& operator&=(PrintCapabilities& lhs, PrintCapabilities rhs) + { return (lhs = static_cast(static_cast(lhs) & static_cast(rhs))); } + +/** @ingroup gtkmmEnums */ +inline PrintCapabilities& operator^=(PrintCapabilities& lhs, PrintCapabilities rhs) + { return (lhs = static_cast(static_cast(lhs) ^ static_cast(rhs))); } + +} // namespace Gtk + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +namespace Glib +{ + +template <> +class Value : public Glib::Value_Flags +{ +public: + static GType value_type() G_GNUC_CONST; +}; + +} // namespace Glib +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gtk +{ + + /** A Printer object represents a printer. You only need to deal directly with printers if you use the * non-portable PrintUnixDialog API. * @@ -100,41 +176,139 @@ private: public: //TODO: _WRAP_CREATE() - probably not, it's only accessible through PrintUnixDialog + GtkPrintBackend should be ignored - //TODO: I think these are not needed as well, and that Printer should generally be read-only - marko. bool equal(const Glib::RefPtr& other) const; - //TODO: _WRAP_METHOD(Glib::RefPtr get_backend(), gtk_printer_get_backend. refreturn) + //GtkPrintBackend is in a "semi-private" header. + //_WRAP_METHOD(Glib::RefPtr get_backend(), gtk_printer_get_backend, refreturn) //_WRAP_METHOD(Glib::RefPtr get_backend() const, gtk_printer_get_backend, refreturn, constversion) + + /** Return value: the name of @a printer + * @return The name of @a printer + * + * @newin2p10. + */ Glib::ustring get_name() const; + /** Return value: the state message of @a printer + * @return The state message of @a printer + * + * @newin2p10. + */ Glib::ustring get_state_message() const; + /** Gets the description of the printer. + * @return The description of @a printer + * + * @newin2p10. + */ Glib::ustring get_description() const; + /** Return value: the location of @a printer + * @return The location of @a printer + * + * @newin2p10. + */ Glib::ustring get_location() const; + /** Gets the name of the icon to use for the printer. + * @return The icon name for @a printer + * + * @newin2p10. + */ Glib::ustring get_icon_name() const; + /** Gets the number of jobs currently queued on the printer. + * @return The number of jobs on @a printer + * + * @newin2p10. + */ int get_job_count() const; + /** Return value: true if @a printer is active + * @return true if @a printer is active + * + * @newin2p10. + */ bool is_active() const; + /** Return value: true if @a printer is virtual + * @return true if @a printer is virtual + * + * @newin2p10. + */ bool is_virtual() const; + /** Return value: true if @a printer is the default + * @return true if @a printer is the default + * + * @newin2p10. + */ bool is_default() const; + /** Return value: true if @a printer accepts PDF + * @return true if @a printer accepts PDF + * + * @newin2p10. + */ bool accepts_pdf() const; + /** Return value: true if @a printer accepts PostScript + * @return true if @a printer accepts PostScript + * + * @newin2p10. + */ bool accepts_ps() const; + + + /** Lists all the paper sizes @a printer supports. + * This will return an empty list unless the printer's details are + * available. See has_details() and request_details(). + * @return A newly allocated list of newly allocated Gtk::PageSetup s. + * + * @newin2p12. + */ + Glib::ListHandle< Glib::RefPtr > list_papers(); + + + /** Lists all the paper sizes @a printer supports. + * This will return an empty list unless the printer's details are + * available. See has_details() and request_details(). + * @return A newly allocated list of newly allocated Gtk::PageSetup s. + * + * @newin2p12. + */ + Glib::ListHandle< Glib::RefPtr > list_papers() const; + + /** Return value: true if @a printer details are available + * @return true if @a printer details are available + * + * @newin2p12. + */ + bool has_details() const; -/** + /** Requests the printer details. When the details are available, + * the details_acquired signal will be emitted. + * + * @newin2p12 + */ + void request_details(); + + /** Return value: the printer's capabilities + * @return The printer's capabilities + * + * @newin2p12. + */ + PrintCapabilities get_capabilities() const; + + + /** * @par Prototype: - * void %details_acquired(bool success) + * void on_my_%details_acquired(bool success) */ Glib::SignalProxy1< void,bool > signal_details_acquired(); @@ -151,7 +325,9 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED - //TODO: _WRAP_PROPERTY("backend", Glib::RefPtr) + //GtkPrintBackend is in a "semi-private" header: + //_WRAP_PROPERTY("backend", Glib::RefPtr) + #ifdef GLIBMM_PROPERTIES_ENABLED /** FALSE if this represents a real hardware printer. * @@ -259,14 +435,16 @@ inline bool operator!=(const Glib::RefPtr& lhs, const Glib::RefPtr& printer); - * - * TODO: document return value. + * @param printer A printer. + * @param result true to stop the enumeration, false to continue. * * @relates Gtk::Printer */ typedef sigc::slot< bool, const Glib::RefPtr& > SlotPrinterEnumerator; -/** TODO: document this +/** Calls a function for all Printers. If the callback returns true, the enumeration is stopped. + * @slot A function to call for each printer + * @parm wait If true, wait in a recursive mainloop until all printers are enumerated; otherwise return early. * * @relates Gtk::Printer */ @@ -277,10 +455,13 @@ void enumerate_printers(const SlotPrinterEnumerator& slot, bool wait = true); namespace Glib { - /** @relates Gtk::Printer - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Printer */ Glib::RefPtr wrap(GtkPrinter* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/printjob.cc b/libs/gtkmm2/gtk/gtkmm/printjob.cc index 89894d7006..413a60b404 100644 --- a/libs/gtkmm2/gtk/gtkmm/printjob.cc +++ b/libs/gtkmm2/gtk/gtkmm/printjob.cc @@ -89,12 +89,6 @@ static const Glib::SignalProxyInfo PrintJob_signal_status_changed_info = } // anonymous namespace -// static -GType Glib::Value::value_type() -{ - return gtk_print_capabilities_get_type(); -} - namespace Glib { @@ -153,7 +147,7 @@ void PrintJob_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void PrintJob_Class::status_changed_callback(GtkPrintJob* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -161,32 +155,35 @@ void PrintJob_Class::status_changed_callback(GtkPrintJob* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_status_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_status_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->status_changed) - (*base->status_changed)(self); - } + // Call the original underlying C function: + if(base && base->status_changed) + (*base->status_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -234,8 +231,9 @@ GType PrintJob::get_base_type() PrintJob::PrintJob(const Glib::ustring& title, const Glib::RefPtr& printer, const Glib::RefPtr& settings, const Glib::RefPtr& page_setup) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(printjob_class_.init(), "title", title.c_str(), "printer", Glib::unwrap(printer), "settings", Glib::unwrap(settings), "page_setup", Glib::unwrap(page_setup), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(printjob_class_.init(), "title", title.c_str(), "printer", Glib::unwrap(printer), "settings", Glib::unwrap(settings), "page_setup", Glib::unwrap(page_setup), static_cast(0))) { } @@ -322,6 +320,15 @@ Cairo::RefPtr PrintJob::get_surface(std::auto_ptr& } +#ifdef GLIBMM_EXCEPTIONS_ENABLED +Cairo::RefPtr PrintJob::get_surface() const +#else +Cairo::RefPtr PrintJob::get_surface(std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + return const_cast(this)->get_surface(); +} + void PrintJob::set_track_print_status(bool track_status) { gtk_print_job_set_track_print_status(gobj(), static_cast(track_status)); diff --git a/libs/gtkmm2/gtk/gtkmm/printjob.h b/libs/gtkmm2/gtk/gtkmm/printjob.h index 9da6a9e565..35291b4649 100644 --- a/libs/gtkmm2/gtk/gtkmm/printjob.h +++ b/libs/gtkmm2/gtk/gtkmm/printjob.h @@ -42,80 +42,6 @@ namespace Gtk namespace Gtk { -/** @addtogroup gtkmmEnums Enums and Flags */ - -/** - * @ingroup gtkmmEnums - * @par Bitwise operators: - * %PrintCapabilities operator|(PrintCapabilities, PrintCapabilities)
- * %PrintCapabilities operator&(PrintCapabilities, PrintCapabilities)
- * %PrintCapabilities operator^(PrintCapabilities, PrintCapabilities)
- * %PrintCapabilities operator~(PrintCapabilities)
- * %PrintCapabilities& operator|=(PrintCapabilities&, PrintCapabilities)
- * %PrintCapabilities& operator&=(PrintCapabilities&, PrintCapabilities)
- * %PrintCapabilities& operator^=(PrintCapabilities&, PrintCapabilities)
- */ -enum PrintCapabilities -{ - PRINT_CAPABILITY_PAGE_SET = 1 << 0, - PRINT_CAPABILITY_COPIES = 1 << 1, - PRINT_CAPABILITY_COLLATE = 1 << 2, - PRINT_CAPABILITY_REVERSE = 1 << 3, - PRINT_CAPABILITY_SCALE = 1 << 4, - PRINT_CAPABILITY_GENERATE_PDF = 1 << 5, - PRINT_CAPABILITY_GENERATE_PS = 1 << 6 -}; - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities operator|(PrintCapabilities lhs, PrintCapabilities rhs) - { return static_cast(static_cast(lhs) | static_cast(rhs)); } - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities operator&(PrintCapabilities lhs, PrintCapabilities rhs) - { return static_cast(static_cast(lhs) & static_cast(rhs)); } - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities operator^(PrintCapabilities lhs, PrintCapabilities rhs) - { return static_cast(static_cast(lhs) ^ static_cast(rhs)); } - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities operator~(PrintCapabilities flags) - { return static_cast(~static_cast(flags)); } - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities& operator|=(PrintCapabilities& lhs, PrintCapabilities rhs) - { return (lhs = static_cast(static_cast(lhs) | static_cast(rhs))); } - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities& operator&=(PrintCapabilities& lhs, PrintCapabilities rhs) - { return (lhs = static_cast(static_cast(lhs) & static_cast(rhs))); } - -/** @ingroup gtkmmEnums */ -inline PrintCapabilities& operator^=(PrintCapabilities& lhs, PrintCapabilities rhs) - { return (lhs = static_cast(static_cast(lhs) ^ static_cast(rhs))); } - -} // namespace Gtk - - -#ifndef DOXYGEN_SHOULD_SKIP_THIS -namespace Glib -{ - -template <> -class Value : public Glib::Value_Flags -{ -public: - static GType value_type() G_GNUC_CONST; -}; - -} // namespace Glib -#endif /* DOXYGEN_SHOULD_SKIP_THIS */ - - -namespace Gtk -{ - - /** A PrintJob object represents a job that is sent to a printer. You only need to deal * directly with print jobs if you use the non-portable PrintUnixDialog API. * @@ -185,21 +111,62 @@ public: static Glib::RefPtr create(const Glib::ustring& title, const Glib::RefPtr& printer, const Glib::RefPtr& settings, const Glib::RefPtr& page_setup); + /** Gets the Gtk::PrintSettings of the print job. + * @return The settings of @a job + * + * @newin2p10. + */ Glib::RefPtr get_settings(); + /** Gets the Gtk::PrintSettings of the print job. + * @return The settings of @a job + * + * @newin2p10. + */ Glib::RefPtr get_settings() const; + /** Gets the Gtk::Printer of the print job. + * @return The printer of @a job + * + * @newin2p10. + */ Glib::RefPtr get_printer(); + /** Gets the Gtk::Printer of the print job. + * @return The printer of @a job + * + * @newin2p10. + */ Glib::RefPtr get_printer() const; + /** Gets the job title. + * @return The title of @a job + * + * @newin2p10. + */ Glib::ustring get_title() const; + /** Gets the status of the print job. + * @return The status of @a job + * + * @newin2p10. + */ PrintStatus get_status() const; // this appears in gtkprinter-private.h + /** Make the Gtk::PrintJob send an existing document to the + * printing system. The file can be in any format understood + * by the platforms printing system (typically PostScript, + * but on many platforms PDF may work too). See + * Gtk::Printer::accepts_pdf() and Gtk::Printer::accepts_ps(). + * @param filename The file to be printed. + * @param error Return location for errors. + * @return false if an error occurred + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED void set_source_file(const std::string& filename); #else @@ -207,17 +174,52 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Gets a cairo surface onto which the pages of + * the print job should be rendered. + * @param error Return location for errors, or 0. + * @return The cairo surface of @a job + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED Cairo::RefPtr get_surface(); #else Cairo::RefPtr get_surface(std::auto_ptr& error); #endif //GLIBMM_EXCEPTIONS_ENABLED - //TODO: _WRAP_METHOD(Cairo::RefPtr get_surface() const, gtk_print_job_get_surface, constversion, errthrow) - + /** Gets a cairo surface onto which the pages of + * the print job should be rendered. + * @param error Return location for errors, or 0. + * @return The cairo surface of @a job + * + * @newin2p10. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + Cairo::RefPtr get_surface() const; +#else + Cairo::RefPtr get_surface(std::auto_ptr& error) const; +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** If track_status is true, the print job will try to continue report + * on the status of the print job in the printer queues and printer. This + * can allow your application to show things like "out of paper" issues, + * and when the print job actually reaches the printer. + * + * This function is often implemented using some form of polling, so it should + * not be enabled unless needed. + * + * @newin2p10 + * @param track_status true to track status after printing. + */ void set_track_print_status(bool track_status = true); + /** Return value: true if print job status will be reported after printing + * @return true if print job status will be reported after printing + * + * @newin2p10. + */ bool get_track_print_status() const; @@ -235,15 +237,15 @@ public: typedef sigc::slot< void, const Glib::RefPtr&, std::auto_ptr& > SlotPrintJobComplete; #endif - /** TODO: document this - * + /** Sends the print job off to the printer. + * @param slot A function to call when the job completes or an error occurs. */ void send(const SlotPrintJobComplete& slot); -/** + /** * @par Prototype: - * void %status_changed() + * void on_my_%status_changed() */ Glib::SignalProxy0< void > signal_status_changed(); @@ -318,10 +320,13 @@ protected: namespace Glib { - /** @relates Gtk::PrintJob - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PrintJob */ Glib::RefPtr wrap(GtkPrintJob* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/printoperation.cc b/libs/gtkmm2/gtk/gtkmm/printoperation.cc index b3181b3a62..01d3b2239a 100644 --- a/libs/gtkmm2/gtk/gtkmm/printoperation.cc +++ b/libs/gtkmm2/gtk/gtkmm/printoperation.cc @@ -648,7 +648,7 @@ void PrintOperation_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void PrintOperation_Class::done_callback(GtkPrintOperation* self, GtkPrintOperationResult p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -656,37 +656,40 @@ void PrintOperation_Class::done_callback(GtkPrintOperation* self, GtkPrintOperat // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_done((PrintOperationResult)p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_done((PrintOperationResult)p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->done) - (*base->done)(self, p0); - } + // Call the original underlying C function: + if(base && base->done) + (*base->done)(self, p0); } void PrintOperation_Class::begin_print_callback(GtkPrintOperation* self, GtkPrintContext* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -694,37 +697,40 @@ void PrintOperation_Class::begin_print_callback(GtkPrintOperation* self, GtkPrin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_begin_print(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_begin_print(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->begin_print) - (*base->begin_print)(self, p0); - } + // Call the original underlying C function: + if(base && base->begin_print) + (*base->begin_print)(self, p0); } gboolean PrintOperation_Class::paginate_callback(GtkPrintOperation* self, GtkPrintContext* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -732,40 +738,42 @@ gboolean PrintOperation_Class::paginate_callback(GtkPrintOperation* self, GtkPri // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->on_paginate(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->on_paginate(Glib::wrap(p0, true) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->paginate) - return (*base->paginate)(self, p0); - } + // Call the original underlying C function: + if(base && base->paginate) + return (*base->paginate)(self, p0); typedef gboolean RType; return RType(); } void PrintOperation_Class::request_page_setup_callback(GtkPrintOperation* self, GtkPrintContext* p0, gint p1, GtkPageSetup* p2) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -773,39 +781,42 @@ void PrintOperation_Class::request_page_setup_callback(GtkPrintOperation* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_request_page_setup(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_request_page_setup(Glib::wrap(p0, true) , p1 , Glib::wrap(p2, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->request_page_setup) - (*base->request_page_setup)(self, p0, p1, p2); - } + // Call the original underlying C function: + if(base && base->request_page_setup) + (*base->request_page_setup)(self, p0, p1, p2); } void PrintOperation_Class::draw_page_callback(GtkPrintOperation* self, GtkPrintContext* p0, gint p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -813,38 +824,41 @@ void PrintOperation_Class::draw_page_callback(GtkPrintOperation* self, GtkPrintC // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_draw_page(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_draw_page(Glib::wrap(p0, true) , p1 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->draw_page) - (*base->draw_page)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->draw_page) + (*base->draw_page)(self, p0, p1); } void PrintOperation_Class::end_print_callback(GtkPrintOperation* self, GtkPrintContext* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -852,37 +866,40 @@ void PrintOperation_Class::end_print_callback(GtkPrintOperation* self, GtkPrintC // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_end_print(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_end_print(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->end_print) - (*base->end_print)(self, p0); - } + // Call the original underlying C function: + if(base && base->end_print) + (*base->end_print)(self, p0); } void PrintOperation_Class::status_changed_callback(GtkPrintOperation* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -890,36 +907,39 @@ void PrintOperation_Class::status_changed_callback(GtkPrintOperation* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_status_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_status_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->status_changed) - (*base->status_changed)(self); - } + // Call the original underlying C function: + if(base && base->status_changed) + (*base->status_changed)(self); } GtkWidget* PrintOperation_Class::create_custom_widget_callback(GtkPrintOperation* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -927,39 +947,41 @@ GtkWidget* PrintOperation_Class::create_custom_widget_callback(GtkPrintOperation // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return (GtkWidget*)Glib::unwrap(obj->on_create_custom_widget()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return (GtkWidget*)Glib::unwrap(obj->on_create_custom_widget()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->create_custom_widget) - return (*base->create_custom_widget)(self); - } + // Call the original underlying C function: + if(base && base->create_custom_widget) + return (*base->create_custom_widget)(self); typedef GtkWidget* RType; return RType(); } void PrintOperation_Class::custom_widget_apply_callback(GtkPrintOperation* self, GtkWidget* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -967,37 +989,40 @@ void PrintOperation_Class::custom_widget_apply_callback(GtkPrintOperation* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_custom_widget_apply(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_custom_widget_apply(Glib::wrap(p0) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->custom_widget_apply) - (*base->custom_widget_apply)(self, p0); - } + // Call the original underlying C function: + if(base && base->custom_widget_apply) + (*base->custom_widget_apply)(self, p0); } gboolean PrintOperation_Class::preview_callback(GtkPrintOperation* self, GtkPrintOperationPreview* p0, GtkPrintContext* p1, GtkWindow* p2) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1005,35 +1030,37 @@ gboolean PrintOperation_Class::preview_callback(GtkPrintOperation* self, GtkPrin // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->on_preview(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->on_preview(Glib::wrap(p0, true) , Glib::wrap(p1, true) , Glib::wrap(p2) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->preview) - return (*base->preview)(self, p0, p1, p2); - } + // Call the original underlying C function: + if(base && base->preview) + return (*base->preview)(self, p0, p1, p2); typedef gboolean RType; return RType(); @@ -1084,7 +1111,8 @@ GType PrintOperation::get_base_type() PrintOperation::PrintOperation() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(printoperation_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/printoperation.h b/libs/gtkmm2/gtk/gtkmm/printoperation.h index 54888c775d..2a342dd59e 100644 --- a/libs/gtkmm2/gtk/gtkmm/printoperation.h +++ b/libs/gtkmm2/gtk/gtkmm/printoperation.h @@ -153,7 +153,8 @@ public: { GENERAL, INTERNAL_ERROR, - NOMEM + NOMEM, + INVALID_FILE }; PrintError(Code error_code, const Glib::ustring& error_message); @@ -272,34 +273,152 @@ public: static Glib::RefPtr create(); + /** Makes @a default_page_setup the default page setup for @a op . + * + * This page setup will be used by run(), + * but it can be overridden on a per-page basis by connecting + * to the Gtk::PrintOperation::request-page-setup signal. + * + * @newin2p10 + * @param default_page_setup A Gtk::PageSetup, or 0. + */ void set_default_page_setup(const Glib::RefPtr& default_page_setup); + /** Returns: the default page setup + * @return The default page setup + * + * @newin2p10. + */ Glib::RefPtr get_default_page_setup() const; + /** Sets the print settings for @a op . This is typically used to + * re-establish print settings from a previous print operation, + * see run(). + * + * @newin2p10 + * @param print_settings Gtk::PrintSettings, or 0. + */ void set_print_settings(const Glib::RefPtr& print_settings); + /** Return value: the current print settings of @a op . + * @return The current print settings of @a op . + * + * @newin2p10. + */ Glib::RefPtr get_print_settings() const; + /** Sets the name of the print job. The name is used to identify + * the job (e.g. in monitoring applications like eggcups). + * + * If you don't set a job name, GTK+ picks a default one by + * numbering successive print jobs. + * + * @newin2p10 + * @param job_name A string that identifies the print job. + */ void set_job_name(const Glib::ustring& job_name); + /** Sets the number of pages in the document. + * + * This must be set to a positive number + * before the rendering starts. It may be set in a + * Gtk::PrintOperation::begin-print signal hander. + * + * Note that the page numbers passed to the + * Gtk::PrintOperation::request-page-setup + * and Gtk::PrintOperation::draw-page signals are 0-based, i.e. if + * the user chooses to print all pages, the last ::draw-page signal + * will be for page @a n_pages - 1. + * + * @newin2p10 + * @param n_pages The number of pages. + */ void set_n_pages(int n_pages); + /** Sets the current page. + * + * If this is called before run(), + * the user will be able to select to print only the current page. + * + * Note that this only makes sense for pre-paginated documents. + * + * @newin2p10 + * @param current_page The current page, 0-based. + */ void set_current_page(int current_page); + /** If @a full_page is true, the transformation for the cairo context + * obtained from Gtk::PrintContext puts the origin at the top left + * corner of the page (which may not be the top left corner of the + * sheet, depending on page orientation and the number of pages per + * sheet). Otherwise, the origin is at the top left corner of the + * imageable area (i.e. inside the margins). + * + * @newin2p10 + * @param full_page true to set up the Gtk::PrintContext for the full page. + */ void set_use_full_page(bool use_full_page = true); + /** Sets up the transformation for the cairo context obtained from + * Gtk::PrintContext in such a way that distances are measured in + * units of @a unit . + * + * @newin2p10 + * @param unit The unit to use. + */ void set_unit(Unit unit); + /** Sets up the Gtk::PrintOperation to generate a file instead + * of showing the print dialog. The indended use of this function + * is for implementing "Export to PDF" actions. Currently, PDF + * is the only supported format. + * + * "Print to PDF" support is independent of this and is done + * by letting the user pick the "Print to PDF" item from the list + * of printers in the print dialog. + * + * @newin2p10 + * @param filename The filename for the exported file. + */ void set_export_filename(const std::string& filename); + /** If track_status is true, the print operation will try to continue report + * on the status of the print job in the printer queues and printer. This + * can allow your application to show things like "out of paper" issues, + * and when the print job actually reaches the printer. + * + * This function is often implemented using some form of polling, so it should + * not be enabled unless needed. + * + * @newin2p10 + * @param track_status true to track status after printing. + */ void set_track_print_status(bool track_status = true); + /** If @a show_progress is true, the print operation will show a + * progress dialog during the print operation. + * + * @newin2p10 + * @param show_progress true to show a progress dialog. + */ void set_show_progress (bool show_progress = true); + /** Sets whether the run() may return + * before the print operation is completed. Note that + * some platforms may not allow asynchronous operation. + * + * @newin2p10 + * @param allow_async true to allow asynchronous operation. + */ void set_allow_async(bool allow_async = true); + /** Sets the label for the tab holding custom widgets. + * + * @newin2p10 + * @param label The label to use, or 0 to use the default label. + */ void set_custom_tab_label(const Glib::ustring& label); @@ -310,6 +429,71 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Runs the print operation, by first letting the user modify + * print settings in the print dialog, and then print the document. + * + * Normally that this function does not return until the rendering of all + * pages is complete. You can connect to the + * Gtk::PrintOperation::status-changed signal on @a op to obtain some + * information about the progress of the print operation. + * Furthermore, it may use a recursive mainloop to show the print dialog. + * + * If you call set_allow_async() or set the allow-async + * property the operation will run asyncronously if this is supported on the + * platform. The Gtk::PrintOperation::done signal will be emitted with the + * operation results when the operation is done (i.e. when the dialog is + * canceled, or when the print succeeds or fails). + * + * @code + * if (settings != 0) + * gtk_print_operation_set_print_settings (print, settings); + * + * if (page_setup != 0) + * gtk_print_operation_set_default_page_setup (print, page_setup); + * + * g_signal_connect (print, "begin-print", + * G_CALLBACK (begin_print), &data); + * g_signal_connect (print, "draw-page", + * G_CALLBACK (draw_page), &data); + * + * res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, parent, &error); + * + * if (res == GTK_PRINT_OPERATION_RESULT_ERROR) + * { + * error_dialog = gtk_message_dialog_new (GTK_WINDOW (parent), + * GTK_DIALOG_DESTROY_WITH_PARENT, + * GTK_MESSAGE_ERROR, + * GTK_BUTTONS_CLOSE, + * "Error printing file:\\n%s", + * error->message); + * g_signal_connect (error_dialog, "response", + * G_CALLBACK (gtk_widget_destroy), 0); + * gtk_widget_show (error_dialog); + * g_error_free (error); + * } + * else if (res == GTK_PRINT_OPERATION_RESULT_APPLY) + * { + * if (settings != 0) + * g_object_unref (settings); + * settings = g_object_ref (gtk_print_operation_get_print_settings (print)); + * } + * @endcode + * + * Note that run() can only be called once on a + * given Gtk::PrintOperation. + * @param action The action to start. + * @param parent Transient parent of the dialog, or 0. + * @param error Return location for errors, or 0. + * @return The result of the print operation. A return value of + * Gtk::PRINT_OPERATION_RESULT_APPLY indicates that the printing was + * completed successfully. In this case, it is a good idea to obtain + * the used print settings with get_print_settings() + * and store them for reuse with the next print operation. A value of + * Gtk::PRINT_OPERATION_RESULT_IN_PROGRESS means the operation is running + * asynchronously, and will emit the ::done signal when done. + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED PrintOperationResult run(PrintOperationAction action, Window& parent); #else @@ -317,95 +501,125 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Return value: the status of the print operation + * @return The status of the print operation + * + * @newin2p10. + */ PrintStatus get_status() const; + /** Return value: a string representation of the status + * @return A string representation of the status + * of the print operation + * + * @newin2p10. + */ Glib::ustring get_status_string() const; + /** Cancels a running print operation. This function may + * be called from a Gtk::PrintOperation::begin-print, + * Gtk::PrintOperation::paginate or Gtk::PrintOperation::draw-page + * signal handler to stop the currently running print + * operation. + * + * @newin2p10 + */ void cancel(); + /** A convenience function to find out if the print operation + * is finished, either successfully (Gtk::PRINT_STATUS_FINISHED) + * or unsuccessfully (Gtk::PRINT_STATUS_FINISHED_ABORTED). + * + * @note when you enable print status tracking the print operation + * can be in a non-finished state even after done has been called, as + * the operation status then tracks the print job status on the printer. + * @return true, if the print operation is finished. + * + * @newin2p10. + */ bool is_finished() const; //TODO: point out in the docs that the PrintOperationResult enum may also indicate // that an error occurred, and in that case it is up to him to handle it. -/** + /** * @par Prototype: - * void %done(PrintOperationResult result) + * void on_my_%done(PrintOperationResult result) */ Glib::SignalProxy1< void,PrintOperationResult > signal_done(); -/** + /** * @par Prototype: - * void %begin_print(const Glib::RefPtr& context) + * void on_my_%begin_print(const Glib::RefPtr& context) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_begin_print(); -/** + /** * @par Prototype: - * bool %paginate(const Glib::RefPtr& context) + * bool on_my_%paginate(const Glib::RefPtr& context) */ Glib::SignalProxy1< bool,const Glib::RefPtr& > signal_paginate(); -/** + /** * @par Prototype: - * void %request_page_setup(const Glib::RefPtr& context, int page_no, const Glib::RefPtr& setup) + * void on_my_%request_page_setup(const Glib::RefPtr& context, int page_no, const Glib::RefPtr& setup) */ Glib::SignalProxy3< void,const Glib::RefPtr&,int,const Glib::RefPtr& > signal_request_page_setup(); -/** + /** * @par Prototype: - * void %draw_page(const Glib::RefPtr& context, int page_nr) + * void on_my_%draw_page(const Glib::RefPtr& context, int page_nr) */ Glib::SignalProxy2< void,const Glib::RefPtr&,int > signal_draw_page(); -/** + /** * @par Prototype: - * void %end_print(const Glib::RefPtr& context) + * void on_my_%end_print(const Glib::RefPtr& context) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_end_print(); -/** + /** * @par Prototype: - * void %status_changed() + * void on_my_%status_changed() */ Glib::SignalProxy0< void > signal_status_changed(); -/** + /** * @par Prototype: - * Widget* %create_custom_widget() + * Widget* on_my_%create_custom_widget() */ Glib::SignalProxy0< Widget* > signal_create_custom_widget(); -/** + /** * @par Prototype: - * void %custom_widget_apply(Widget* widget) + * void on_my_%custom_widget_apply(Widget* widget) */ Glib::SignalProxy1< void,Widget* > signal_custom_widget_apply(); - //TODO: This is causing crashes: + //TODO: This is causing crashes. Is it still causing crashes? murrayc. -/** + /** * @par Prototype: - * bool %preview(const Glib::RefPtr& preview, const Glib::RefPtr& context, Window* parent) + * bool on_my_%preview(const Glib::RefPtr& preview, const Glib::RefPtr& context, Window* parent) */ Glib::SignalProxy3< bool,const Glib::RefPtr&,const Glib::RefPtr&,Window* > signal_preview(); @@ -512,7 +726,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** TRUE if the the origin of the context should be at the corner of the page and not the corner of the imageable area. +/** TRUE if the origin of the context should be at the corner of the page and not the corner of the imageable area. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -522,7 +736,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** TRUE if the the origin of the context should be at the corner of the page and not the corner of the imageable area. +/** TRUE if the origin of the context should be at the corner of the page and not the corner of the imageable area. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -736,10 +950,13 @@ protected: namespace Glib { - /** @relates Gtk::PrintOperation - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PrintOperation */ Glib::RefPtr wrap(GtkPrintOperation* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/printoperationpreview.cc b/libs/gtkmm2/gtk/gtkmm/printoperationpreview.cc index 222759c8ae..2429965f97 100644 --- a/libs/gtkmm2/gtk/gtkmm/printoperationpreview.cc +++ b/libs/gtkmm2/gtk/gtkmm/printoperationpreview.cc @@ -103,7 +103,7 @@ namespace Glib Glib::RefPtr wrap(GtkPrintOperationPreview* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -154,7 +154,7 @@ void PrintOperationPreview_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED void PrintOperationPreview_Class::render_page_vfunc_callback(GtkPrintOperationPreview* self, gint page_nr) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -162,38 +162,42 @@ void PrintOperationPreview_Class::render_page_vfunc_callback(GtkPrintOperationPr // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->render_page_vfunc(page_nr + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->render_page_vfunc(page_nr ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->render_page) + (*base->render_page)(self, page_nr); - // Call the original underlying C function: - if(base && base->render_page) - (*base->render_page)(self, page_nr); - } } void PrintOperationPreview_Class::end_preview_vfunc_callback(GtkPrintOperationPreview* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -201,37 +205,41 @@ void PrintOperationPreview_Class::end_preview_vfunc_callback(GtkPrintOperationPr // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->end_preview_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->end_preview_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->end_preview) + (*base->end_preview)(self); - // Call the original underlying C function: - if(base && base->end_preview) - (*base->end_preview)(self); - } } gboolean PrintOperationPreview_Class::is_selected_vfunc_callback(GtkPrintOperationPreview* self, gint page_nr) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -239,34 +247,37 @@ gboolean PrintOperationPreview_Class::is_selected_vfunc_callback(GtkPrintOperati // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->is_selected_vfunc(page_nr + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->is_selected_vfunc(page_nr )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->is_selected) + return (*base->is_selected)(self, page_nr); - // Call the original underlying C function: - if(base && base->is_selected) - return (*base->is_selected)(self, page_nr); - } typedef gboolean RType; return RType(); @@ -276,7 +287,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void PrintOperationPreview_Class::ready_callback(GtkPrintOperationPreview* self, GtkPrintContext* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -284,38 +295,41 @@ void PrintOperationPreview_Class::ready_callback(GtkPrintOperationPreview* self, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_ready(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_ready(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->ready) - (*base->ready)(self, p0); - } + // Call the original underlying C function: + if(base && base->ready) + (*base->ready)(self, p0); } void PrintOperationPreview_Class::got_page_size_callback(GtkPrintOperationPreview* self, GtkPrintContext* p0, GtkPageSetup* p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -323,35 +337,38 @@ void PrintOperationPreview_Class::got_page_size_callback(GtkPrintOperationPrevie // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_got_page_size(Glib::wrap(p0, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_got_page_size(Glib::wrap(p0, true) , Glib::wrap(p1, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. ) ); - // Call the original underlying C function: - if(base && base->got_page_size) - (*base->got_page_size)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->got_page_size) + (*base->got_page_size)(self, p0, p1); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/printoperationpreview.h b/libs/gtkmm2/gtk/gtkmm/printoperationpreview.h index 596a9a8010..2f42448b82 100644 --- a/libs/gtkmm2/gtk/gtkmm/printoperationpreview.h +++ b/libs/gtkmm2/gtk/gtkmm/printoperationpreview.h @@ -42,7 +42,8 @@ namespace Gtk namespace Gtk { -/** TODO: +//TODO: There is no GtkPrintOperationPreview documentation either. +/** * @newin2p10 * * @ingroup Printing @@ -69,8 +70,14 @@ private: protected: PrintOperationPreview(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit PrintOperationPreview(GtkPrintOperationPreview* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -94,10 +101,32 @@ private: public: + /** Renders a page to the preview, using the print context that + * was passed to the Gtk::PrintOperation::preview handler together + * with @a preview . + * + * Note that this function requires a suitable cairo context to + * be associated with the print context. + * + * @newin2p10 + * @param page_nr The page to render. + */ void render_page(int page_nr); + /** Ends a preview. + * + * This function must be called to finish a custom print preview. + * + * @newin2p10 + */ void end_preview(); + /** Returns: true if the page has been selected for printing + * @param page_nr A page number. + * @return true if the page has been selected for printing + * + * @newin2p10. + */ bool is_selected(int page_nr) const; #ifdef GLIBMM_VFUNCS_ENABLED @@ -113,17 +142,17 @@ public: #endif //GLIBMM_VFUNCS_ENABLED -/** + /** * @par Prototype: - * void %ready(const Glib::RefPtr& context) + * void on_my_%ready(const Glib::RefPtr& context) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_ready(); -/** + /** * @par Prototype: - * void %got_page_size(const Glib::RefPtr& context, const Glib::RefPtr& page_setup) + * void on_my_%got_page_size(const Glib::RefPtr& context, const Glib::RefPtr& page_setup) */ Glib::SignalProxy2< void,const Glib::RefPtr&,const Glib::RefPtr& > signal_got_page_size(); @@ -155,10 +184,13 @@ protected: namespace Glib { - /** @relates Gtk::PrintOperationPreview - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PrintOperationPreview */ Glib::RefPtr wrap(GtkPrintOperationPreview* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/printsettings.cc b/libs/gtkmm2/gtk/gtkmm/printsettings.cc index a802ebbef6..9488853171 100644 --- a/libs/gtkmm2/gtk/gtkmm/printsettings.cc +++ b/libs/gtkmm2/gtk/gtkmm/printsettings.cc @@ -40,10 +40,7 @@ static void proxy_foreach_callback(const gchar* key, const gchar* value, void* d try { #endif //GLIBMM_EXCEPTIONS_ENABLED - Glib::ustring k(key); - Glib::ustring v(value); - slot(k, v); - //slot(Glib::ustring(key), Glib::ustring(value)); // TODO: this won't work + slot(Glib::convert_const_gchar_ptr_to_ustring(key), Glib::convert_const_gchar_ptr_to_ustring(value)); #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) @@ -142,6 +139,11 @@ void PrintSettings::set_page_ranges(const Glib::ArrayHandle PrintSettings::create() { return Glib::RefPtr( new PrintSettings() ); } +#ifdef GLIBMM_EXCEPTIONS_ENABLED +bool PrintSettings::save_to_file(const std::string& file_name) const +#else +bool PrintSettings::save_to_file(const std::string& file_name, std::auto_ptr& error) const +#endif //GLIBMM_EXCEPTIONS_ENABLED +{ + GError* gerror = 0; + bool retvalue = gtk_print_settings_to_file(const_cast(gobj()), file_name.c_str(), &(gerror)); +#ifdef GLIBMM_EXCEPTIONS_ENABLED + if(gerror) + ::Glib::Error::throw_exception(gerror); +#else + if(gerror) + error = ::Glib::Error::throw_exception(gerror); +#endif //GLIBMM_EXCEPTIONS_ENABLED + + return retvalue; + +} + +void PrintSettings::save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const +{ +gtk_print_settings_to_key_file(const_cast(gobj()), (key_file).gobj(), group_name.c_str()); +} + bool PrintSettings::has_key(const Glib::ustring& key) const { return gtk_print_settings_has_key(const_cast(gobj()), key.c_str()); diff --git a/libs/gtkmm2/gtk/gtkmm/printsettings.h b/libs/gtkmm2/gtk/gtkmm/printsettings.h index f171d88153..3c6867d007 100644 --- a/libs/gtkmm2/gtk/gtkmm/printsettings.h +++ b/libs/gtkmm2/gtk/gtkmm/printsettings.h @@ -228,6 +228,14 @@ private: protected: PrintSettings(); +#if 0 //TODO: Reimplement, or add _construct_from_* functions in GTK+. +GtkPrintSettings *gtk_print_settings_new_from_file (const gchar *file_name, + GError **error); +GtkPrintSettings *gtk_print_settings_new_from_key_file (GKeyFile *key_file, + const gchar *group_name, + GError **error); +#endif + public: static Glib::RefPtr create(); @@ -269,22 +277,76 @@ public: }; + /** This function saves the print settings from @a settings to @a file_name . + * @a throws FileError + * @param file_name The file to save to. + * @return true on success + * + * @newin2p12. + */ +#ifdef GLIBMM_EXCEPTIONS_ENABLED + bool save_to_file(const std::string& file_name) const; +#else + bool save_to_file(const std::string& file_name, std::auto_ptr& error) const; +#endif //GLIBMM_EXCEPTIONS_ENABLED + + + /** This function adds the print settings from @a settings to @a key_file . + * + * @newin2p12 + * @param key_file The Glib::KeyFile to save the print settings to. + * @param group_name The group to add the settings to in @a key_file . + */ + void save_to_key_file(Glib::KeyFile& key_file, const Glib::ustring& group_name) const; + + /** This function adds the print settings from @a settings to @a key_file, + * in the "Print Settings" group. + * + * @newin2p12 + * @param key_file The Glib::KeyFile to save the print settings to. + */ + void save_to_key_file(Glib::KeyFile& key_file); + //TODO: add a @see link? + /** Return value: true, if @a key has a value + * @param key A key. + * @return true, if @a key has a value + * + * @newin2p10. + */ bool has_key(const Glib::ustring& key) const; + /** Looks up the string value associated with @a key . + * @param key A key. + * @return The string value for @a key + * + * @newin2p10. + */ Glib::ustring get(const Glib::ustring& key) const; + /** Associates @a value with @a key . + * + * @newin2p10 + * @param key A key. + * @param value A string value, or 0. + */ void set(const Glib::ustring& key, const Glib::ustring& value); + /** Removes any value associated with @a key . + * This has the same effect as setting the value to 0. + * + * @newin2p10 + * @param key A key. + */ void unset(const Glib::ustring& key); /** For example, * void on_foreach_setting(const Glib::ustring& key, const Glib::ustring& value); */ - typedef sigc::slot SlotForeach; + typedef sigc::slot SlotForeach; /** Calls a function for each print setting. * @param slot The callback to call for each print setting. @@ -292,108 +354,340 @@ public: void setting_foreach(const SlotForeach& slot); + /** Return value: true, if @a key maps to a true value. + * @param key A key. + * @return true, if @a key maps to a true value. + * + * @newin2p10. + */ bool get_bool(const Glib::ustring& key) const; + /** Sets @a key to a boolean value. + * + * @newin2p10 + * @param key A key. + * @param value A boolean. + */ void set_bool(const Glib::ustring& key, bool value = true); + /** Return value: the double value of @a key + * @param key A key. + * @return The double value of @a key + * + * @newin2p10. + */ double get_double(const Glib::ustring& key) const; + /** Return value: the floating point number associated with @a key + * @param key A key. + * @param def The default value. + * @return The floating point number associated with @a key + * + * @newin2p10. + */ double get_double_with_default(const Glib::ustring& key, double def) const; + /** Sets @a key to a double value. + * + * @newin2p10 + * @param key A key. + * @param value A double value. + */ void set_double(const Glib::ustring& key, double value); + /** Return value: the length value of @a key , converted to @a unit + * @param key A key. + * @param unit The unit of the return value. + * @return The length value of @a key , converted to @a unit + * + * @newin2p10. + */ double get_length(const Glib::ustring& key, Unit unit) const; + /** Associates a length in units of @a unit with @a key . + * + * @newin2p10 + * @param key A key. + * @param value A length. + * @param unit The unit of @a length . + */ void set_length(const Glib::ustring& key, double value, Unit unit); + /** Return value: the integer value of @a key + * @param key A key. + * @return The integer value of @a key + * + * @newin2p10. + */ int get_int(const Glib::ustring& key) const; + /** Return value: the integer value of @a key + * @param key A key. + * @param def The default value. + * @return The integer value of @a key + * + * @newin2p10. + */ int get_int_with_default(const Glib::ustring& key, int def) const; + /** Sets @a key to an integer value. + * + * @newin2p10 + * @param key A key. + * @param value An integer. + */ void set_int(const Glib::ustring& key, int value); // helpers: + /** Convenience function to obtain the value of + * Gtk::PRINT_SETTINGS_PRINTER. + * @return The printer name + * + * @newin2p10. + */ Glib::ustring get_printer() const; + /** Convenience function to set Gtk::PRINT_SETTINGS_PRINTER + * to @a printer . + * + * @newin2p10 + * @param printer The printer name. + */ void set_printer(const Glib::ustring& name); + /** Get the value of Gtk::PRINT_SETTINGS_ORIENTATION, + * converted to a Gtk::PageOrientation. + * @return The orientation + * + * @newin2p10. + */ PageOrientation get_orientation() const; + /** Sets the value of Gtk::PRINT_SETTINGS_ORIENTATION. + * + * @newin2p10 + * @param orientation A page orientation. + */ void set_orientation(PageOrientation orientation); + /** Gets the value of Gtk::PRINT_SETTINGS_PAPER_FORMAT, + * converted to a Gtk::PaperSize. + * @return The paper size + * + * @newin2p10. + */ PaperSize get_paper_size(); + /** Gets the value of Gtk::PRINT_SETTINGS_PAPER_FORMAT, + * converted to a Gtk::PaperSize. + * @return The paper size + * + * @newin2p10. + */ const PaperSize get_paper_size() const; + /** Sets the value of Gtk::PRINT_SETTINGS_PAPER_FORMAT, + * Gtk::PRINT_SETTINGS_PAPER_WIDTH and + * Gtk::PRINT_SETTINGS_PAPER_HEIGHT. + * + * @newin2p10 + * @param paper_size A paper size. + */ void set_paper_size(const PaperSize& paper_size); + /** Gets the value of Gtk::PRINT_SETTINGS_PAPER_WIDTH, + * converted to @a unit . + * @param unit The unit for the return value. + * @return The paper width, in units of @a unit + * + * @newin2p10. + */ double get_paper_width(Unit unit) const; + /** Sets the value of Gtk::PRINT_SETTINGS_PAPER_WIDTH. + * + * @newin2p10 + * @param width The paper width. + * @param unit The units of @a width . + */ void set_paper_width(double width, Unit unit); + /** Gets the value of Gtk::PRINT_SETTINGS_PAPER_HEIGHT, + * converted to @a unit . + * @param unit The unit for the return value. + * @return The paper height, in units of @a unit + * + * @newin2p10. + */ double get_paper_height(Unit unit) const; + /** Sets the value of Gtk::PRINT_SETTINGS_PAPER_HEIGHT. + * + * @newin2p10 + * @param height The paper height. + * @param unit The units of @a height . + */ void set_paper_height(double height, Unit unit); + /** Gets the value of Gtk::PRINT_SETTINGS_USE_COLOR. + * @return Whether to use color + * + * @newin2p10. + */ bool get_use_color() const; + /** Sets the value of Gtk::PRINT_SETTINGS_USE_COLOR. + * + * @newin2p10 + * @param use_color Whether to use color. + */ void set_use_color(bool use_color = true); + /** Gets the value of Gtk::PRINT_SETTINGS_COLLATE. + * @return Whether to collate the printed pages + * + * @newin2p10. + */ bool get_collate() const; + /** Sets the value of Gtk::PRINT_SETTINGS_COLLATE. + * + * @newin2p10 + * @param collate Whether to collate the output. + */ void set_collate(bool collate = true); + /** Gets the value of Gtk::PRINT_SETTINGS_REVERSE. + * @return Whether to reverse the order of the printed pages + * + * @newin2p10. + */ bool get_reverse() const; + /** Sets the value of Gtk::PRINT_SETTINGS_REVERSE. + * + * @newin2p10 + * @param reverse Whether to reverse the output. + */ void set_reverse(bool reverse = true); + /** Gets the value of Gtk::PRINT_SETTINGS_DUPLEX. + * @return Whether to print the output in duplex. + * + * @newin2p10. + */ PrintDuplex get_duplex() const; + /** Sets the value of Gtk::PRINT_SETTINGS_DUPLEX. + * + * @newin2p10 + * @param duplex A Gtk::PrintDuplex value. + */ void set_duplex(PrintDuplex duplex); + /** Gets the value of Gtk::PRINT_SETTINGS_QUALITY. + * @return The print quality + * + * @newin2p10. + */ PrintQuality get_quality() const; + /** Sets the value of Gtk::PRINT_SETTINGS_QUALITY. + * + * @newin2p10 + * @param quality A Gtk::PrintQuality value. + */ void set_quality(PrintQuality quality); + /** Gets the value of Gtk::PRINT_SETTINGS_N_COPIES. + * @return The number of copies to print + * + * @newin2p10. + */ int get_n_copies() const; + /** Sets the value of Gtk::PRINT_SETTINGS_N_COPIES. + * + * @newin2p10 + * @param num_copies The number of copies. + */ void set_n_copies(int num_copies); + /** Gets the value of Gtk::PRINT_SETTINGS_NUMBER_UP. + * @return The number of pages per sheet + * + * @newin2p10. + */ int get_number_up() const; + /** Sets the value of Gtk::PRINT_SETTINGS_NUMBER_UP. + * + * @newin2p10 + * @param number_up The number of pages per sheet. + */ void set_number_up(int number_up); + /** Gets the value of Gtk::PRINT_SETTINGS_RESOLUTION. + * @return The resolution in dpi + * + * @newin2p10. + */ int get_resolution() const; + /** Sets the value of Gtk::PRINT_SETTINGS_RESOLUTION. + * + * @newin2p10 + * @param resolution The resolution in dpi. + */ void set_resolution(int resolution); + /** Gets the value of Gtk::PRINT_SETTINGS_SCALE. + * @return The scale in percent + * + * @newin2p10. + */ double get_scale() const; + /** Sets the value of Gtk::PRINT_SETTINGS_SCALE. + * + * @newin2p10 + * @param scale The scale in percent. + */ void set_scale(double scale); + /** Gets the value of Gtk::PRINT_SETTINGS_PRINT_PAGES. + * @return Which pages to print + * + * @newin2p10. + */ PrintPages get_print_pages() const; + /** Sets the value of Gtk::PRINT_SETTINGS_PRINT_PAGES. + * + * @newin2p10 + * @param pages A Gtk::PrintPages value. + */ void set_print_pages(PrintPages print_pages); - //TODO: What part of the C API does this correspond to? + //This corresponds to GtkPageRange. class PageRange { public: @@ -408,36 +702,102 @@ public: void set_page_ranges(const Glib::ArrayHandle& page_ranges); + /** Gets the value of Gtk::PRINT_SETTINGS_PAGE_SET. + * @return The set of pages to print + * + * @newin2p10. + */ PageSet get_page_set() const; + /** Sets the value of Gtk::PRINT_SETTINGS_PAGE_SET. + * + * @newin2p10 + * @param page_set A Gtk::PageSet value. + */ void set_page_set(PageSet page_set); + /** Gets the value of Gtk::PRINT_SETTINGS_DEFAULT_SOURCE. + * @return The default source + * + * @newin2p10. + */ Glib::ustring get_default_source() const; + /** Sets the value of Gtk::PRINT_SETTINGS_DEFAULT_SOURCE. + * + * @newin2p10 + * @param default_source The default source. + */ void set_default_source(const Glib::ustring& default_source); + /** Gets the value of Gtk::PRINT_SETTINGS_MEDIA_TYPE. + * + * The set of media types is defined in PWG 5101.1-2002 PWG. + * <!-- FIXME link here --> + * @return The media type + * + * @newin2p10. + */ Glib::ustring get_media_type() const; + /** Sets the value of Gtk::PRINT_SETTINGS_MEDIA_TYPE. + * + * The set of media types is defined in PWG 5101.1-2002 PWG. + * <!-- FIXME link here --> + * + * @newin2p10 + * @param media_type The media type. + */ void set_media_type(const Glib::ustring& media_type); + /** Gets the value of Gtk::PRINT_SETTINGS_DITHER. + * @return The dithering that is used + * + * @newin2p10. + */ Glib::ustring get_dither() const; + /** Sets the value of Gtk::PRINT_SETTINGS_DITHER. + * + * @newin2p10 + * @param dither The dithering that is used. + */ void set_dither(const Glib::ustring& dither); + /** Gets the value of Gtk::PRINT_SETTINGS_FINISHINGS. + * @return The finishings + * + * @newin2p10. + */ Glib::ustring get_finishings() const; + /** Sets the value of Gtk::PRINT_SETTINGS_FINISHINGS. + * + * @newin2p10 + * @param finishings The finishings. + */ void set_finishings(const Glib::ustring& finishings); + /** Gets the value of Gtk::PRINT_SETTINGS_OUTPUT_BIN. + * @return The output bin + * + * @newin2p10. + */ Glib::ustring get_output_bin() const; + /** Sets the value of Gtk::PRINT_SETTINGS_OUTPUT_BIN. + * + * @newin2p10 + * @param output_bin The output bin. + */ void set_output_bin(const Glib::ustring& output_bin); - //TODO: Properties. + //There are no properties. public: @@ -464,10 +824,13 @@ protected: namespace Glib { - /** @relates Gtk::PrintSettings - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PrintSettings */ Glib::RefPtr wrap(GtkPrintSettings* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/printunixdialog.cc b/libs/gtkmm2/gtk/gtkmm/printunixdialog.cc index c71eede812..237e7ad565 100644 --- a/libs/gtkmm2/gtk/gtkmm/printunixdialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/printunixdialog.cc @@ -30,16 +30,18 @@ namespace Gtk PrintUnixDialog::PrintUnixDialog(Gtk::Window& parent, const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(printunixdialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(printunixdialog_class_.init(), "title",title.c_str(), static_cast(0))) { set_transient_for(parent); } PrintUnixDialog::PrintUnixDialog(const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(printunixdialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(printunixdialog_class_.init(), "title",title.c_str(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/printunixdialog.h b/libs/gtkmm2/gtk/gtkmm/printunixdialog.h index 89bc2d9638..341c6458d1 100644 --- a/libs/gtkmm2/gtk/gtkmm/printunixdialog.h +++ b/libs/gtkmm2/gtk/gtkmm/printunixdialog.h @@ -129,33 +129,107 @@ public: explicit PrintUnixDialog(const Glib::ustring& title); + /** Sets the page setup of the Gtk::PrintUnixDialog. + * + * @newin2p10 + * @param page_setup A Gtk::PageSetup. + */ void set_page_setup(const Glib::RefPtr& page_setup); + /** Gets the page setup that is used by the Gtk::PrintUnixDialog. + * @return The page setup of @a dialog . + * + * @newin2p10. + */ Glib::RefPtr get_page_setup(); + /** Gets the page setup that is used by the Gtk::PrintUnixDialog. + * @return The page setup of @a dialog . + * + * @newin2p10. + */ Glib::RefPtr get_page_setup() const; + /** Sets the current page number. If @a current_page is not -1, this enables + * the current page choice for the range of pages to print. + * + * @newin2p10 + * @param current_page The current page number. + */ void set_current_page(int current_page); + /** Gets the current page of the Gtk::PrintDialog. + * @return The current page of @a dialog + * + * @newin2p10. + */ int get_current_page() const; + /** Sets the Gtk::PrintSettings for the Gtk::PrintUnixDialog. Typically, + * this is used to restore saved print settings from a previous print + * operation before the print dialog is shown. + * + * @newin2p10 + * @param settings A Gtk::PrintSettings, or 0. + */ void set_settings(const Glib::RefPtr& print_settings); + /** Gets a new Gtk::PrintSettings object that represents the + * current values in the print dialog. Note that this creates a + * new object, and you need to unref it + * if don't want to keep it. + * @return A new Gtk::PrintSettings object with the values from @a dialog + * + * @newin2p10. + */ Glib::RefPtr get_settings(); + /** Gets a new Gtk::PrintSettings object that represents the + * current values in the print dialog. Note that this creates a + * new object, and you need to unref it + * if don't want to keep it. + * @return A new Gtk::PrintSettings object with the values from @a dialog + * + * @newin2p10. + */ Glib::RefPtr get_settings() const; + /** Gets the currently selected printer. + * @return The currently selected printer + * + * @newin2p10. + */ Glib::RefPtr get_selected_printer(); + /** Gets the currently selected printer. + * @return The currently selected printer + * + * @newin2p10. + */ Glib::RefPtr get_selected_printer() const; void add_custom_tab(const Widget& child, const Glib::ustring& tab_label); + /** Adds a custom tab to the print dialog. + * + * @newin2p10 + * @param child The widget to put in the custom tab. + * @param tab_label The widget to use as tab label. + */ void add_custom_tab(const Widget& child, const Widget& tab_label); + /** This lets you specify the printing capabilities your application + * supports. For instance, if you can handle scaling the output then + * you pass Gtk::PRINT_CAPABILITY_SCALE. If you don't pass that, then + * the dialog will only let you select the scale if the printing + * system automatically handles scaling. + * + * @newin2p10 + * @param capabilities The printing capabilities of your application. + */ void set_manual_capabilities(PrintCapabilities capabilities); #ifdef GLIBMM_PROPERTIES_ENABLED @@ -236,10 +310,13 @@ public: namespace Glib { - /** @relates Gtk::PrintUnixDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::PrintUnixDialog */ Gtk::PrintUnixDialog* wrap(GtkPrintUnixDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/private/Makefile.am b/libs/gtkmm2/gtk/gtkmm/private/Makefile.am new file mode 100644 index 0000000000..5a126716f1 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/private/Makefile.am @@ -0,0 +1,14 @@ +## Copyright (c) 2001 +## The gtkmm development team. + +include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment +files_built_p_h = $(files_all_hg:.hg=_p.h) + +private_includedir = $(includedir)/gtkmm-2.4/gtkmm/private +private_include_HEADERS = $(files_built_p_h) + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_built_p_h)) + + + diff --git a/libs/gtkmm2/gtk/gtkmm/private/Makefile.in b/libs/gtkmm2/gtk/gtkmm/private/Makefile.in new file mode 100644 index 0000000000..55c12d322d --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/private/Makefile.in @@ -0,0 +1,521 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# This file is include by other Makefile.am files, using the new automake include feature. +# The include happens in Makefile.am, not Makefile.in or Makefile, +# so it's like copy-and-pasting this into each of those Makefile.am files. + +# Built files + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = $(private_include_HEADERS) \ + $(srcdir)/../../src/Makefile_list_of_hg.am_fragment \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment +subdir = gtk/gtkmm/private +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/scripts/docgen.m4 \ + $(top_srcdir)/scripts/macros.m4 \ + $(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h \ + $(top_builddir)/gdk/gdkmmconfig.h \ + $(top_builddir)/gtk/gtkmmconfig.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(private_includedir)" +private_includeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(private_include_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +ATKMM_CFLAGS = @ATKMM_CFLAGS@ +ATKMM_LIBS = @ATKMM_LIBS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEMO_SUBDIR = @DEMO_SUBDIR@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@ +DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ +DLLTOOL = @DLLTOOL@ +DOCS_SUBDIR = @DOCS_SUBDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXAMPLE_SUBDIR = @EXAMPLE_SUBDIR@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GDKMM_CFLAGS = @GDKMM_CFLAGS@ +GDKMM_LIBS = @GDKMM_LIBS@ +GMMPROC = @GMMPROC@ +GMMPROC_DIR = @GMMPROC_DIR@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKMM_CFLAGS = @GTKMM_CFLAGS@ +GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@ +GTKMM_LIBS = @GTKMM_LIBS@ +GTKMM_MAJOR_VERSION = @GTKMM_MAJOR_VERSION@ +GTKMM_MICRO_VERSION = @GTKMM_MICRO_VERSION@ +GTKMM_MINOR_VERSION = @GTKMM_MINOR_VERSION@ +GTKMM_PC_ATKMM_DEP = @GTKMM_PC_ATKMM_DEP@ +GTKMM_RELEASE = @GTKMM_RELEASE@ +GTKMM_VERSION = @GTKMM_VERSION@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBGTKMM_SO_VERSION = @LIBGTKMM_SO_VERSION@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +M4 = @M4@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PANGOMM_CFLAGS = @PANGOMM_CFLAGS@ +PANGOMM_LIBS = @PANGOMM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL_PATH = @PERL_PATH@ +PKG_CONFIG = @PKG_CONFIG@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +files_posix_hg = pagesetupunixdialog.hg printunixdialog.hg \ + printer.hg printjob.hg + +files_win32_hg = +files_general_hg = aboutdialog.hg accelgroup.hg accellabel.hg action.hg actiongroup.hg adjustment.hg alignment.hg \ + arrow.hg aspectframe.hg assistant.hg \ + bin.hg box.hg builder.hg button.hg buttonbox.hg \ + calendar.hg celleditable.hg celllayout.hg cellview.hg \ + cellrenderer.hg cellrendereraccel.hg cellrenderercombo.hg cellrendererpixbuf.hg cellrendererprogress.hg cellrendererspin.hg cellrenderertext.hg cellrenderertoggle.hg \ + checkbutton.hg checkmenuitem.hg clipboard.hg colorselection.hg colorbutton.hg \ + combobox.hg comboboxentry.hg container.hg curve.hg \ + dialog.hg drawingarea.hg \ + editable.hg entry.hg entrycompletion.hg enums.hg eventbox.hg expander.hg \ + filechooser.hg filechooserbutton.hg filechooserwidget.hg filechooserdialog.hg filefilter.hg \ + fileselection.hg fixed.hg fontbutton.hg fontselection.hg frame.hg \ + handlebox.hg \ + iconfactory.hg iconset.hg iconsource.hg iconinfo.hg icontheme.hg iconview.hg image.hg imagemenuitem.hg inputdialog.hg invisible.hg item.hg \ + label.hg layout.hg linkbutton.hg liststore.hg \ + main.hg menu.hg menubar.hg menuitem.hg menushell.hg menutoolbutton.hg messagedialog.hg misc.hg \ + notebook.hg object.hg optionmenu.hg \ + paned.hg plug.hg progressbar.hg \ + papersize.hg pagesetup.hg printsettings.hg printcontext.hg printoperation.hg printoperationpreview.hg \ + radioaction.hg radiobutton.hg radiomenuitem.hg radiotoolbutton.hg range.hg rc.hg \ + recentaction.hg recentchooser.hg recentchooserdialog.hg recentchoosermenu.hg recentchooserwidget.hg \ + recentfilter.hg recentinfo.hg recentmanager.hg ruler.hg \ + scale.hg scalebutton.hg scrollbar.hg scrolledwindow.hg selectiondata.hg \ + separator.hg separatormenuitem.hg separatortoolitem.hg settings.hg sizegroup.hg socket.hg spinbutton.hg statusbar.hg statusicon.hg \ + stockitem.hg style.hg \ + table.hg targetlist.hg tearoffmenuitem.hg \ + textattributes.hg textbuffer.hg textchildanchor.hg textiter.hg textmark.hg texttag.hg texttagtable.hg textview.hg \ + toggleaction.hg \ + togglebutton.hg toggletoolbutton.hg toolbar.hg toolitem.hg toolbutton.hg tooltips.hg tooltip.hg \ + treedragdest.hg treedragsource.hg treepath.hg treerowreference.hg treeselection.hg treesortable.hg \ + treeiter.hg treemodel.hg treemodelfilter.hg treemodelsort.hg treestore.hg treeview.hg treeviewcolumn.hg \ + viewport.hg volumebutton.hg uimanager.hg \ + widget.hg window.hg + +files_general_deprecated_hg = combo.hg +files_all_hg = \ + $(files_posix_hg) \ + $(files_win32_hg) \ + $(files_general_hg) \ + $(files_general_deprecated_hg) + +@OS_WIN32_FALSE@files_hg = $(files_general_hg) $(files_posix_hg) $(files_general_deprecated_hg) +@OS_WIN32_TRUE@files_hg = $(files_general_hg) $(files_win32_hg) $(files_general_deprecated_hg) +files_built_cc = $(files_hg:.hg=.cc) wrap_init.cc +files_built_h = $(files_hg:.hg=.h) +files_all_built_cc = $(files_all_hg:.hg=.cc) wrap_init.cc +files_all_built_h = $(files_all_hg:.hg=.h) + +# Extra files +files_all_extra_cc = \ + $(sublib_files_extra_posix_cc) \ + $(sublib_files_extra_win32_cc) \ + $(sublib_files_extra_general_cc) \ + $(sublib_files_extra_general_deprecated_cc) + +files_all_extra_h = $(sublib_files_extra_posix_h) \ + $(sublib_files_extra_win32_h) $(sublib_files_extra_general_h) \ + $(sublib_files_extra_general_deprecated_h) wrap_init.h +@OS_WIN32_FALSE@files_extra_cc = \ +@OS_WIN32_FALSE@ $(sublib_files_extra_posix_cc) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_TRUE@files_extra_cc = \ +@OS_WIN32_TRUE@ $(sublib_files_extra_win32_cc) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_cc) + +@OS_WIN32_FALSE@files_extra_h = $(sublib_files_extra_posix_h) \ +@OS_WIN32_FALSE@ $(sublib_files_extra_general_h) wrap_init.h +@OS_WIN32_TRUE@files_extra_h = $(sublib_files_extra_win32_h) \ +@OS_WIN32_TRUE@ $(sublib_files_extra_general_h) wrap_init.h +files_built_p_h = $(files_all_hg:.hg=_p.h) +private_includedir = $(includedir)/gtkmm-2.4/gtkmm/private +private_include_HEADERS = $(files_built_p_h) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../src/Makefile_list_of_hg.am_fragment $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/gtkmm/private/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu gtk/gtkmm/private/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-private_includeHEADERS: $(private_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(private_includedir)" || $(MKDIR_P) "$(DESTDIR)$(private_includedir)" + @list='$(private_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(private_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(private_includedir)/$$f'"; \ + $(private_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(private_includedir)/$$f"; \ + done + +uninstall-private_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(private_include_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(private_includedir)/$$f'"; \ + rm -f "$(DESTDIR)$(private_includedir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(private_includedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-private_includeHEADERS + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-private_includeHEADERS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool ctags distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-private_includeHEADERS install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-private_includeHEADERS + + +maintainer-clean-local: + (cd $(srcdir) && rm -f $(files_built_p_h)) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/libs/libglademm/libglademm/private/xml_p.h b/libs/gtkmm2/gtk/gtkmm/private/builder_p.h similarity index 62% rename from libs/libglademm/libglademm/private/xml_p.h rename to libs/gtkmm2/gtk/gtkmm/private/builder_p.h index e69f6798cc..82efd7613a 100644 --- a/libs/libglademm/libglademm/private/xml_p.h +++ b/libs/gtkmm2/gtk/gtkmm/private/builder_p.h @@ -1,28 +1,27 @@ // -*- c++ -*- // Generated by gtkmmproc -- DO NOT MODIFY! -#ifndef _LIBGLADEMM_XML_P_H -#define _LIBGLADEMM_XML_P_H +#ifndef _GTKMM_BUILDER_P_H +#define _GTKMM_BUILDER_P_H + + #include #include -namespace Gnome +namespace Gtk { -namespace Glade -{ - -class Xml_Class : public Glib::Class +class Builder_Class : public Glib::Class { public: #ifndef DOXYGEN_SHOULD_SKIP_THIS - typedef Xml CppObjectType; - typedef GladeXML BaseObjectType; - typedef GladeXMLClass BaseClassType; + typedef Builder CppObjectType; + typedef GtkBuilder BaseObjectType; + typedef GtkBuilderClass BaseClassType; typedef Glib::Object_Class CppClassParent; typedef GObjectClass BaseClassParent; - friend class Xml; + friend class Builder; #endif /* DOXYGEN_SHOULD_SKIP_THIS */ const Glib::Class& init(); @@ -33,18 +32,20 @@ public: protected: +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED //Callbacks (default signal handlers): //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. //You could prevent the original default signal handlers being called by overriding the *_impl method. +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED //Callbacks (virtual functions): - static GType lookup_type_vfunc_callback(GladeXML* self, const char* classname); - }; +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED +}; -} // namespace Glade +} // namespace Gtk -} // namespace Gnome -#endif /* _LIBGLADEMM_XML_P_H */ +#endif /* _GTKMM_BUILDER_P_H */ diff --git a/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h b/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h index 176454115f..107a614be6 100644 --- a/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h +++ b/libs/gtkmm2/gtk/gtkmm/private/menuitem_p.h @@ -38,7 +38,7 @@ protected: //You could prevent the original default signal handlers being called by overriding the *_impl method. static void activate_callback(GtkMenuItem* self); static void activate_item_callback(GtkMenuItem* self); - static void toggle_size_request_callback(GtkMenuItem* self, int* p0); + static void toggle_size_request_callback(GtkMenuItem* self, gint* p0); static void toggle_size_allocate_callback(GtkMenuItem* self, gint p0); #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/private/recentaction_p.h b/libs/gtkmm2/gtk/gtkmm/private/recentaction_p.h new file mode 100644 index 0000000000..eea1ec1029 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/private/recentaction_p.h @@ -0,0 +1,51 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_RECENTACTION_P_H +#define _GTKMM_RECENTACTION_P_H + + +#include + +#include + +namespace Gtk +{ + +class RecentAction_Class : public Glib::Class +{ +public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + typedef RecentAction CppObjectType; + typedef GtkRecentAction BaseObjectType; + typedef GtkRecentActionClass BaseClassType; + typedef Gtk::Action_Class CppClassParent; + typedef GtkActionClass BaseClassParent; + + friend class RecentAction; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + const Glib::Class& init(); + + static void class_init_function(void* g_class, void* class_data); + + static Glib::ObjectBase* wrap_new(GObject*); + +protected: + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + //Callbacks (default signal handlers): + //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. + //You could prevent the original default signal handlers being called by overriding the *_impl method. +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED +}; + + +} // namespace Gtk + + +#endif /* _GTKMM_RECENTACTION_P_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/private/scalebutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/scalebutton_p.h new file mode 100644 index 0000000000..a488cdd4f7 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/private/scalebutton_p.h @@ -0,0 +1,52 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_SCALEBUTTON_P_H +#define _GTKMM_SCALEBUTTON_P_H + + +#include + +#include + +namespace Gtk +{ + +class ScaleButton_Class : public Glib::Class +{ +public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + typedef ScaleButton CppObjectType; + typedef GtkScaleButton BaseObjectType; + typedef GtkScaleButtonClass BaseClassType; + typedef Gtk::Button_Class CppClassParent; + typedef GtkButtonClass BaseClassParent; + + friend class ScaleButton; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + const Glib::Class& init(); + + static void class_init_function(void* g_class, void* class_data); + + static Glib::ObjectBase* wrap_new(GObject*); + +protected: + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + //Callbacks (default signal handlers): + //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. + //You could prevent the original default signal handlers being called by overriding the *_impl method. + static void value_changed_callback(GtkScaleButton* self, gdouble p0); +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED +}; + + +} // namespace Gtk + + +#endif /* _GTKMM_SCALEBUTTON_P_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h index 8c1fd3d490..b7bfe6e000 100644 --- a/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h +++ b/libs/gtkmm2/gtk/gtkmm/private/spinbutton_p.h @@ -36,7 +36,7 @@ protected: //Callbacks (default signal handlers): //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. //You could prevent the original default signal handlers being called by overriding the *_impl method. - static gint input_callback(GtkSpinButton* self, double* p0); + static gint input_callback(GtkSpinButton* self, gdouble* p0); static gboolean output_callback(GtkSpinButton* self); static void value_changed_callback(GtkSpinButton* self); #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/private/tooltip_p.h b/libs/gtkmm2/gtk/gtkmm/private/tooltip_p.h new file mode 100644 index 0000000000..65029406d2 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/private/tooltip_p.h @@ -0,0 +1,51 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_TOOLTIP_P_H +#define _GTKMM_TOOLTIP_P_H + + +#include + +#include + +namespace Gtk +{ + +class Tooltip_Class : public Glib::Class +{ +public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + typedef Tooltip CppObjectType; + typedef GtkTooltip BaseObjectType; + typedef GtkTooltipClass BaseClassType; + typedef Glib::Object_Class CppClassParent; + typedef GObjectClass BaseClassParent; + + friend class Tooltip; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + const Glib::Class& init(); + + static void class_init_function(void* g_class, void* class_data); + + static Glib::ObjectBase* wrap_new(GObject*); + +protected: + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + //Callbacks (default signal handlers): + //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. + //You could prevent the original default signal handlers being called by overriding the *_impl method. +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED +}; + + +} // namespace Gtk + + +#endif /* _GTKMM_TOOLTIP_P_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h b/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h index f59792fdf8..515e1b6070 100644 --- a/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h +++ b/libs/gtkmm2/gtk/gtkmm/private/tooltips_p.h @@ -2,6 +2,7 @@ // Generated by gtkmmproc -- DO NOT MODIFY! #ifndef _GTKMM_TOOLTIPS_P_H #define _GTKMM_TOOLTIPS_P_H +#ifndef GTKMM_DISABLE_DEPRECATED #include @@ -46,6 +47,8 @@ protected: } // namespace Gtk +#endif // GTKMM_DISABLE_DEPRECATED + #endif /* _GTKMM_TOOLTIPS_P_H */ diff --git a/libs/gtkmm2/gtk/gtkmm/private/volumebutton_p.h b/libs/gtkmm2/gtk/gtkmm/private/volumebutton_p.h new file mode 100644 index 0000000000..f10f1d9fe8 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/private/volumebutton_p.h @@ -0,0 +1,51 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_VOLUMEBUTTON_P_H +#define _GTKMM_VOLUMEBUTTON_P_H + + +#include + +#include + +namespace Gtk +{ + +class VolumeButton_Class : public Glib::Class +{ +public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + typedef VolumeButton CppObjectType; + typedef GtkVolumeButton BaseObjectType; + typedef GtkVolumeButtonClass BaseClassType; + typedef Gtk::ScaleButton_Class CppClassParent; + typedef GtkScaleButtonClass BaseClassParent; + + friend class VolumeButton; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + const Glib::Class& init(); + + static void class_init_function(void* g_class, void* class_data); + + static Glib::ObjectBase* wrap_new(GObject*); + +protected: + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + //Callbacks (default signal handlers): + //These will call the *_impl member methods, which will then call the existing default signal callbacks, if any. + //You could prevent the original default signal handlers being called by overriding the *_impl method. +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + //Callbacks (virtual functions): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED +}; + + +} // namespace Gtk + + +#endif /* _GTKMM_VOLUMEBUTTON_P_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/progressbar.cc b/libs/gtkmm2/gtk/gtkmm/progressbar.cc index e5ec87dfea..639e521c3b 100644 --- a/libs/gtkmm2/gtk/gtkmm/progressbar.cc +++ b/libs/gtkmm2/gtk/gtkmm/progressbar.cc @@ -143,7 +143,8 @@ GType ProgressBar::get_base_type() ProgressBar::ProgressBar() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(progressbar_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/progressbar.h b/libs/gtkmm2/gtk/gtkmm/progressbar.h index 1a2401a63e..a3c7df5615 100644 --- a/libs/gtkmm2/gtk/gtkmm/progressbar.h +++ b/libs/gtkmm2/gtk/gtkmm/progressbar.h @@ -214,12 +214,12 @@ public: Glib::ustring get_text() const; /** Causes the given @a text to appear superimposed on the progress bar. - * @param text A UTF-8 string. + * @param text A UTF-8 string, or 0. */ void set_text(const Glib::ustring& text); - /** Returns the current fraction of the task that's been completed. + /** Return value: a fraction from 0.0 to 1.0 * @return A fraction from 0.0 to 1.0. */ double get_fraction() const; @@ -264,8 +264,7 @@ public: */ void set_ellipsize(Pango::EllipsizeMode mode); - /** Returns the ellipsizing position of the progressbar. - * See set_ellipsize(). + /** Return value: Pango::EllipsizeMode * @return Pango::EllipsizeMode * * @newin2p6. @@ -380,10 +379,13 @@ public: namespace Glib { - /** @relates Gtk::ProgressBar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ProgressBar */ Gtk::ProgressBar* wrap(GtkProgressBar* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/radioaction.cc b/libs/gtkmm2/gtk/gtkmm/radioaction.cc index 8d20b23fe6..6d0c0ab666 100644 --- a/libs/gtkmm2/gtk/gtkmm/radioaction.cc +++ b/libs/gtkmm2/gtk/gtkmm/radioaction.cc @@ -34,8 +34,9 @@ namespace Gtk RadioAction::RadioAction(Group& group, const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::ToggleAction(Glib::ConstructParams(radioaction_class_.init(), "name",name.c_str(),"stock_id",stock_id.get_c_str(),"label",(label.empty() ? 0 : label.c_str()),"tooltip",(tooltip.empty() ? 0 : tooltip.c_str()), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::ToggleAction(Glib::ConstructParams(radioaction_class_.init(), "name",name.c_str(),"stock_id",stock_id.get_c_str(),"label",(label.empty() ? 0 : label.c_str()),"tooltip",(tooltip.empty() ? 0 : tooltip.c_str()), static_cast(0))) { set_group(group); } @@ -79,7 +80,7 @@ static void RadioAction_signal_changed_callback(GtkRadioAction* self, GtkRadioAc { #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) - (*static_cast(slot))(Glib::wrap(p0) + (*static_cast(slot))(Glib::wrap(p0, true) ); #ifdef GLIBMM_EXCEPTIONS_ENABLED } @@ -159,7 +160,7 @@ void RadioAction_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void RadioAction_Class::changed_callback(GtkRadioAction* self, GtkRadioAction* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -167,33 +168,36 @@ void RadioAction_Class::changed_callback(GtkRadioAction* self, GtkRadioAction* p // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(Glib::wrap(p0) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(Glib::wrap(p0, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self, p0); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -241,7 +245,8 @@ GType RadioAction::get_base_type() RadioAction::RadioAction() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::ToggleAction(Glib::ConstructParams(radioaction_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/radioaction.h b/libs/gtkmm2/gtk/gtkmm/radioaction.h index 20673cf1de..ed8418c644 100644 --- a/libs/gtkmm2/gtk/gtkmm/radioaction.h +++ b/libs/gtkmm2/gtk/gtkmm/radioaction.h @@ -40,6 +40,12 @@ namespace Gtk namespace Gtk { +/** An action of which only one in a group can be active. + * + * A Gtk::RadioAction is similar to Gtk::RadioMenuItem. A number of + * radio actions can be linked together so that only one may be active + * at any one time. + */ class RadioAction : public Gtk::ToggleAction { @@ -89,34 +95,22 @@ public: typedef RadioButtonGroup Group; protected: + //TODO: Remove the default constructor, because name may not be NULL. RadioAction(); - explicit RadioAction(Group& group, const Glib::ustring& name, const StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + explicit RadioAction(Group& group, const Glib::ustring& name, const StockID& stock_id = StockID(), const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); public: + //Note that gtk_recent_action_new() does not allow name to be NULL, which suggests that we should not have a default constructor, + //but it's OK to set the name later: static Glib::RefPtr create(); + static Glib::RefPtr create(Group& group, const Glib::ustring& name, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); static Glib::RefPtr create(Group& group, const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); - /** Returns the list representing the radio group for this object. - * Note that the returned list is only valid until the next change - * to the group. - * - * A common way to set up a group of radio group is the following: - * @code - * GSList *group = 0; - * GtkRadioAction *action; - * - * while (/<!-- -->* more actions to add *<!-- -->/) - * { - * action = gtk_radio_action_new (...); - * - * gtk_radio_action_set_group (action, group); - * group = gtk_radio_action_get_group (action); - * } - * @endcode + /** Returns: the list representing the radio group for this object * @return The list representing the radio group for this object * * @newin2p4. @@ -133,25 +127,30 @@ public: */ int get_current_value() const; + /** Sets the currently active group member to the member with value + * property @a current_value . + * + * @newin2p10 + * @param current_value The new value. + */ void set_current_value(int current_value); + /** The changed signal is emitted on every member of a radio group when the * active member is changed. The signal is emitted after the activate signals * for the previous and current active members. * * @param current the member of this action's group which has just been activated. - */ - -/** + * * @par Prototype: - * void %changed(const Glib::RefPtr& current) + * void on_my_%changed(const Glib::RefPtr& current) */ Glib::SignalProxy1< void,const Glib::RefPtr& > signal_changed(); #ifdef GLIBMM_PROPERTIES_ENABLED -/** The value returned by gtk_radio_action_get_current_value when this action is the current action of its group. +/** The value returned by gtk_radio_action_get_current_value() when this action is the current action of its group. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -161,7 +160,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The value returned by gtk_radio_action_get_current_value when this action is the current action of its group. +/** The value returned by gtk_radio_action_get_current_value() when this action is the current action of its group. * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -216,10 +215,13 @@ protected: namespace Glib { - /** @relates Gtk::RadioAction - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RadioAction */ Glib::RefPtr wrap(GtkRadioAction* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/radiobutton.cc b/libs/gtkmm2/gtk/gtkmm/radiobutton.cc index 6883e36fd8..908ea12199 100644 --- a/libs/gtkmm2/gtk/gtkmm/radiobutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/radiobutton.cc @@ -35,28 +35,32 @@ namespace Gtk RadioButton::RadioButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init())) {} RadioButton::RadioButton(const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) {} RadioButton::RadioButton(Group& group) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init())) { group.add(*this); } RadioButton::RadioButton(Group& group, const Glib::ustring& label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::CheckButton(Glib::ConstructParams(radiobutton_class_.init(), "label",label.c_str(),"use_underline",gboolean(mnemonic), static_cast(0))) { group.add(*this); } @@ -147,7 +151,7 @@ void RadioButton_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void RadioButton_Class::group_changed_callback(GtkRadioButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -155,32 +159,35 @@ void RadioButton_Class::group_changed_callback(GtkRadioButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_group_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_group_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->group_changed) - (*base->group_changed)(self); - } + // Call the original underlying C function: + if(base && base->group_changed) + (*base->group_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/radiobutton.h b/libs/gtkmm2/gtk/gtkmm/radiobutton.h index 19d5ae323f..a91af54439 100644 --- a/libs/gtkmm2/gtk/gtkmm/radiobutton.h +++ b/libs/gtkmm2/gtk/gtkmm/radiobutton.h @@ -152,9 +152,9 @@ public: void reset_group(); -/** + /** * @par Prototype: - * void %group_changed() + * void on_my_%group_changed() */ Glib::SignalProxy0< void > signal_group_changed(); @@ -167,10 +167,13 @@ public: namespace Glib { - /** @relates Gtk::RadioButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RadioButton */ Gtk::RadioButton* wrap(GtkRadioButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc index ecbbd8ca96..c065afa88b 100644 --- a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc +++ b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.cc @@ -37,16 +37,18 @@ namespace Gtk RadioMenuItem::RadioMenuItem(Group& groupx) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::CheckMenuItem(Glib::ConstructParams(radiomenuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::CheckMenuItem(Glib::ConstructParams(radiomenuitem_class_.init())) { groupx.add(*this); } RadioMenuItem::RadioMenuItem(Group& groupx, const Glib::ustring &label, bool mnemonic) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::CheckMenuItem(Glib::ConstructParams(radiomenuitem_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::CheckMenuItem(Glib::ConstructParams(radiomenuitem_class_.init())) { groupx.add(*this); add_accel_label(label, mnemonic); @@ -139,7 +141,7 @@ void RadioMenuItem_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void RadioMenuItem_Class::group_changed_callback(GtkRadioMenuItem* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -147,32 +149,35 @@ void RadioMenuItem_Class::group_changed_callback(GtkRadioMenuItem* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_group_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_group_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->group_changed) - (*base->group_changed)(self); - } + // Call the original underlying C function: + if(base && base->group_changed) + (*base->group_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h index c8ea9078c0..38b3c80396 100644 --- a/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h +++ b/libs/gtkmm2/gtk/gtkmm/radiomenuitem.h @@ -132,11 +132,9 @@ public: * vice-versa, and when a buttton is moved from one group of 2 or * more menu items to a different one, but not when the composition * of the group that a menu item belongs to changes. - */ - -/** + * * @par Prototype: - * void %group_changed() + * void on_my_%group_changed() */ Glib::SignalProxy0< void > signal_group_changed(); @@ -153,10 +151,13 @@ protected: namespace Glib { - /** @relates Gtk::RadioMenuItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RadioMenuItem */ Gtk::RadioMenuItem* wrap(GtkRadioMenuItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc index 24c358810e..0c9c8aee32 100644 --- a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.cc @@ -174,7 +174,8 @@ GType RadioToolButton::get_base_type() RadioToolButton::RadioToolButton() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::ToggleToolButton(Glib::ConstructParams(radiotoolbutton_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h index 38200eede3..96ff04fb52 100644 --- a/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/radiotoolbutton.h @@ -169,7 +169,7 @@ public: explicit RadioToolButton(Widget& icon_widget, const Glib::ustring& label = Glib::ustring()); - /** Returns the radio button group @a button belongs to. + /** Return value: The group @a button belongs to. * @return The group @a button belongs to. * * @newin2p4. @@ -191,10 +191,13 @@ public: namespace Glib { - /** @relates Gtk::RadioToolButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RadioToolButton */ Gtk::RadioToolButton* wrap(GtkRadioToolButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/range.cc b/libs/gtkmm2/gtk/gtkmm/range.cc index b6a1f2cf41..9bc10cf1d6 100644 --- a/libs/gtkmm2/gtk/gtkmm/range.cc +++ b/libs/gtkmm2/gtk/gtkmm/range.cc @@ -246,7 +246,7 @@ void Range_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* border) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -254,39 +254,43 @@ void Range_Class::get_range_border_vfunc_callback(GtkRange* self, GtkBorder* bor // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->get_range_border_vfunc(border); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->get_range_border_vfunc(border); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->get_range_border) + (*base->get_range_border)(self, border); - // Call the original underlying C function: - if(base && base->get_range_border) - (*base->get_range_border)(self, border); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Range_Class::value_changed_callback(GtkRange* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -294,36 +298,39 @@ void Range_Class::value_changed_callback(GtkRange* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_value_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_value_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->value_changed) - (*base->value_changed)(self); - } + // Call the original underlying C function: + if(base && base->value_changed) + (*base->value_changed)(self); } void Range_Class::adjust_bounds_callback(GtkRange* self, gdouble p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -331,37 +338,40 @@ void Range_Class::adjust_bounds_callback(GtkRange* self, gdouble p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_adjust_bounds(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_adjust_bounds(p0 ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->adjust_bounds) - (*base->adjust_bounds)(self, p0); - } + // Call the original underlying C function: + if(base && base->adjust_bounds) + (*base->adjust_bounds)(self, p0); } void Range_Class::move_slider_callback(GtkRange* self, GtkScrollType p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -369,33 +379,36 @@ void Range_Class::move_slider_callback(GtkRange* self, GtkScrollType p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_move_slider(((ScrollType)(p0)) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_move_slider(((ScrollType)(p0)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->move_slider) - (*base->move_slider)(self, p0); - } + // Call the original underlying C function: + if(base && base->move_slider) + (*base->move_slider)(self, p0); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -441,7 +454,8 @@ GType Range::get_base_type() Range::Range() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(range_class_.init())) { } @@ -521,6 +535,36 @@ double Range::get_value() const return gtk_range_get_value(const_cast(gobj())); } +void Range::set_show_fill_level(bool show_fill_level) +{ +gtk_range_set_show_fill_level(gobj(), static_cast(show_fill_level)); +} + +bool Range::get_show_fill_level() const +{ + return gtk_range_get_show_fill_level(const_cast(gobj())); +} + +void Range::set_restrict_to_fill_level(bool restrict_to_fill_level) +{ +gtk_range_set_restrict_to_fill_level(gobj(), static_cast(restrict_to_fill_level)); +} + +bool Range::get_restrict_to_fill_level() const +{ + return gtk_range_get_restrict_to_fill_level(const_cast(gobj())); +} + +void Range::set_fill_level(double fill_level) +{ +gtk_range_set_fill_level(gobj(), fill_level); +} + +double Range::get_fill_level() const +{ + return gtk_range_get_fill_level(const_cast(gobj())); +} + Glib::SignalProxy0< void > Range::signal_value_changed() { @@ -616,6 +660,48 @@ Glib::PropertyProxy_ReadOnly Range::property_upper_stepper_sens } #endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Range::property_show_fill_level() +{ + return Glib::PropertyProxy(this, "show-fill-level"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Range::property_show_fill_level() const +{ + return Glib::PropertyProxy_ReadOnly(this, "show-fill-level"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Range::property_restrict_to_fill_level() +{ + return Glib::PropertyProxy(this, "restrict-to-fill-level"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Range::property_restrict_to_fill_level() const +{ + return Glib::PropertyProxy_ReadOnly(this, "restrict-to-fill-level"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Range::property_fill_level() +{ + return Glib::PropertyProxy(this, "fill-level"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Range::property_fill_level() const +{ + return Glib::PropertyProxy_ReadOnly(this, "fill-level"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Gtk::Range::on_value_changed() diff --git a/libs/gtkmm2/gtk/gtkmm/range.h b/libs/gtkmm2/gtk/gtkmm/range.h index ec67da392c..fa995961fc 100644 --- a/libs/gtkmm2/gtk/gtkmm/range.h +++ b/libs/gtkmm2/gtk/gtkmm/range.h @@ -206,12 +206,36 @@ public: bool get_inverted() const; + /** Sets the sensitivity policy for the stepper that points to the + * 'lower' end of the GtkRange's adjustment. + * + * @newin2p10 + * @param sensitivity The lower stepper's sensitivity policy. + */ void set_lower_stepper_sensitivity(SensitivityType sensitivity); + /** Gets the sensitivity policy for the stepper that points to the + * 'lower' end of the GtkRange's adjustment. + * @return The lower stepper's sensitivity policy. + * + * @newin2p10. + */ SensitivityType get_lower_stepper_sensitivity() const; + /** Sets the sensitivity policy for the stepper that points to the + * 'upper' end of the GtkRange's adjustment. + * + * @newin2p10 + * @param sensitivity The upper stepper's sensitivity policy. + */ void set_upper_stepper_sensitivity(SensitivityType sensitivity); + /** Gets the sensitivity policy for the stepper that points to the + * 'upper' end of the GtkRange's adjustment. + * @return The upper stepper's sensitivity policy. + * + * @newin2p10. + */ SensitivityType get_upper_stepper_sensitivity() const; @@ -234,8 +258,8 @@ public: /** Sets the current value of the range; if the value is outside the * minimum or maximum range values, it will be clamped to fit inside - * them. The range emits the "value_changed" signal if the value - * changes. + * them. The range emits the Gtk::Range::value-changed signal if the + * value changes. * @param value New value of the range. */ void set_value(double value); @@ -246,25 +270,88 @@ public: double get_value() const; -/** + /** Sets whether a graphical fill level is show on the trough. See + * set_fill_level() for a general description of the fill + * level concept. + * + * @newin2p12 + * @param show_fill_level Whether a fill level indicator graphics is shown. + */ + void set_show_fill_level(bool show_fill_level = true); + + /** Gets whether the range displays the fill level graphically. + * @return true if @a range shows the fill level. + * + * @newin2p12. + */ + bool get_show_fill_level() const; + + /** Sets whether the slider is restricted to the fill level. See + * set_fill_level() for a general description of the fill + * level concept. + * + * @newin2p12 + * @param restrict_to_fill_level Whether the fill level restricts slider movement. + */ + void set_restrict_to_fill_level(bool restrict_to_fill_level = true); + + /** Gets whether the range is restricted to the fill level. + * @return true if @a range is restricted to the fill level. + * + * @newin2p12. + */ + bool get_restrict_to_fill_level() const; + + /** Set the new position of the fill level indicator. + * + * The "fill level" is probably best described by its most prominent + * use case, which is an indicator for the amount of pre-buffering in + * a streaming media player. In that use case, the value of the range + * would indicate the current play position, and the fill level would + * be the position up to which the file/stream has been downloaded. + * + * This amount of prebuffering can be displayed on the range's trough + * and is themeable separately from the trough. To enable fill level + * display, use set_show_fill_level(). The range defaults + * to not showing the fill level. + * + * Additionally, it's possible to restrict the range's slider position + * to values which are smaller than the fill level. This is controller + * by set_restrict_to_fill_level() and is by default + * enabled. + * + * @newin2p12 + * @param fill_level The new position of the fill level indicator. + */ + void set_fill_level(double fill_level); + + /** Gets the current position of the fill level indicator. + * @return The current fill level + * + * @newin2p12. + */ + double get_fill_level() const; + + + /** * @par Prototype: - * void %value_changed() + * void on_my_%value_changed() */ Glib::SignalProxy0< void > signal_value_changed(); -/** + /** * @par Prototype: - * void %adjust_bounds(double new_value) + * void on_my_%adjust_bounds(double new_value) */ Glib::SignalProxy1< void,double > signal_adjust_bounds(); -/** + /** * @par Prototype: - * void %move_slider(ScrollType scroll) + * void on_my_%move_slider(ScrollType scroll) */ Glib::SignalProxy1< void,ScrollType > signal_move_slider(); @@ -292,11 +379,9 @@ public: * @param new_value the new value resulting from the scroll action. * @result true to prevent other handlers from being invoked for the * signal, or false to propagate the signal further. - */ - -/** + * * @par Prototype: - * bool %change_value(ScrollType scroll, double new_value) + * bool on_my_%change_value(ScrollType scroll, double new_value) */ Glib::SignalProxy2< bool,ScrollType,double > signal_change_value(); @@ -402,6 +487,66 @@ public: Glib::PropertyProxy_ReadOnly property_upper_stepper_sensitivity() const; #endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to display a fill level indicator graphics on trough. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_show_fill_level() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to display a fill level indicator graphics on trough. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_show_fill_level() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to restrict the upper boundary to the fill level. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_restrict_to_fill_level() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to restrict the upper boundary to the fill level. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_restrict_to_fill_level() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The fill level. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_fill_level() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The fill level. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_fill_level() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + protected: #ifdef GLIBMM_VFUNCS_ENABLED @@ -416,10 +561,13 @@ protected: namespace Glib { - /** @relates Gtk::Range - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Range */ Gtk::Range* wrap(GtkRange* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/rc.cc b/libs/gtkmm2/gtk/gtkmm/rc.cc index e4e4a8c999..486ce509f9 100644 --- a/libs/gtkmm2/gtk/gtkmm/rc.cc +++ b/libs/gtkmm2/gtk/gtkmm/rc.cc @@ -294,7 +294,8 @@ GType RcStyle::get_base_type() RcStyle::RcStyle() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(rcstyle_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/rc.h b/libs/gtkmm2/gtk/gtkmm/rc.h index 778a4ed7c8..3abf3398ab 100644 --- a/libs/gtkmm2/gtk/gtkmm/rc.h +++ b/libs/gtkmm2/gtk/gtkmm/rc.h @@ -346,10 +346,13 @@ public: namespace Glib { - /** @relates Gtk::RcStyle - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RcStyle */ Glib::RefPtr wrap(GtkRcStyle* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/recentaction.cc b/libs/gtkmm2/gtk/gtkmm/recentaction.cc new file mode 100644 index 0000000000..34be407330 --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/recentaction.cc @@ -0,0 +1,216 @@ +// Generated by gtkmmproc -- DO NOT MODIFY! + + +#include +#include + +// -*- c++ -*- +/* $Id: recentaction.ccg,v 1.5 2004/03/27 00:30:38 murrayc Exp $ */ + +/* Copyright 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + + +namespace Gtk +{ + +Glib::RefPtr RecentAction::create(const Glib::ustring& name, const Glib::ustring& label, const Glib::ustring& tooltip) +{ + return Glib::RefPtr( new RecentAction(name, StockID(), label, tooltip) ); +} + + +} // namespace Gtk + + +namespace +{ +} // anonymous namespace + + +namespace Glib +{ + +Glib::RefPtr wrap(GtkRecentAction* object, bool take_copy) +{ + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + //We use dynamic_cast<> in case of multiple inheritance. +} + +} /* namespace Glib */ + + +namespace Gtk +{ + + +/* The *_Class implementation: */ + +const Glib::Class& RecentAction_Class::init() +{ + if(!gtype_) // create the GType if necessary + { + // Glib::Class has to know the class init function to clone custom types. + class_init_func_ = &RecentAction_Class::class_init_function; + + // This is actually just optimized away, apparently with no harm. + // Make sure that the parent type has been created. + //CppClassParent::CppObjectType::get_type(); + + // Create the wrapper type, with the same class/instance size as the base type. + register_derived_type(gtk_recent_action_get_type()); + + // Add derived versions of interfaces, if the C type implements any interfaces: + } + + return *this; +} + +void RecentAction_Class::class_init_function(void* g_class, void* class_data) +{ + BaseClassType *const klass = static_cast(g_class); + CppClassParent::class_init_function(klass, class_data); + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +} + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + +Glib::ObjectBase* RecentAction_Class::wrap_new(GObject* object) +{ + return new RecentAction((GtkRecentAction*)object); +} + + +/* The implementation: */ + +GtkRecentAction* RecentAction::gobj_copy() +{ + reference(); + return gobj(); +} + +RecentAction::RecentAction(const Glib::ConstructParams& construct_params) +: + Gtk::Action(construct_params) +{} + +RecentAction::RecentAction(GtkRecentAction* castitem) +: + Gtk::Action((GtkAction*)(castitem)) +{} + +RecentAction::~RecentAction() +{} + + +RecentAction::CppClassType RecentAction::recentaction_class_; // initialize static member + +GType RecentAction::get_type() +{ + return recentaction_class_.init().get_type(); +} + +GType RecentAction::get_base_type() +{ + return gtk_recent_action_get_type(); +} + + +RecentAction::RecentAction() +: + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Action(Glib::ConstructParams(recentaction_class_.init())) +{ + } + +RecentAction::RecentAction(const Glib::ustring& name, const StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip) +: + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Action(Glib::ConstructParams(recentaction_class_.init(), "name", name.empty() ? 0 : name.c_str(), "stock_id", (stock_id).get_c_str(), "label", label.empty() ? 0 : label.c_str(), "tooltip", tooltip.empty() ? 0 : tooltip.c_str(), static_cast(0))) +{ + } + +RecentAction::RecentAction(const Glib::ustring& name, const StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip, const Glib::RefPtr& manager) +: + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Action(Glib::ConstructParams(recentaction_class_.init(), "name", name.empty() ? 0 : name.c_str(), "stock_id", (stock_id).get_c_str(), "label", label.empty() ? 0 : label.c_str(), "tooltip", tooltip.empty() ? 0 : tooltip.c_str(), "manager", Glib::unwrap(manager), static_cast(0))) +{ + } + +Glib::RefPtr RecentAction::create() +{ + return Glib::RefPtr( new RecentAction() ); +} +Glib::RefPtr RecentAction::create(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip) +{ + return Glib::RefPtr( new RecentAction(name, stock_id, label, tooltip) ); +} +Glib::RefPtr RecentAction::create(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip, const Glib::RefPtr& manager) +{ + return Glib::RefPtr( new RecentAction(name, stock_id, label, tooltip, manager) ); +} +bool RecentAction::get_show_numbers() +{ + return gtk_recent_action_get_show_numbers(gobj()); +} + +void RecentAction::set_show_numbers(bool show_numbers) +{ +gtk_recent_action_set_show_numbers(gobj(), static_cast(show_numbers)); +} + + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy RecentAction::property_show_numbers() +{ + return Glib::PropertyProxy(this, "show-numbers"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly RecentAction::property_show_numbers() const +{ + return Glib::PropertyProxy_ReadOnly(this, "show-numbers"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + +} // namespace Gtk + + diff --git a/libs/gtkmm2/gtk/gtkmm/recentaction.h b/libs/gtkmm2/gtk/gtkmm/recentaction.h new file mode 100644 index 0000000000..7f2462deae --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/recentaction.h @@ -0,0 +1,206 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_RECENTACTION_H +#define _GTKMM_RECENTACTION_H + + +#include + +/* $Id: recentaction.hg,v 1.5 2004/07/01 08:55:45 murrayc Exp $ */ + +/* Copyright (C) 2003 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +typedef struct _GtkRecentAction GtkRecentAction; +typedef struct _GtkRecentActionClass GtkRecentActionClass; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gtk +{ class RecentAction_Class; } // namespace Gtk +namespace Gtk +{ + +/** An action of which represents a list of recently used files. + * + * A Gtk::RecentAction represents a list of recently used files, + * which can be shown by widgets such as Gtk::RecentChooserDialog or + * Gtk::RecentChooserMenu. + * To construct a submenu showing recently used files, use a + * Gtk::RecentAction as the action for a . To construct a menu + * toolbutton showing the recently used files in the popup menu, use a + * Gtk::RecentAction as the action for a element. + * + * @newin2p12 + * + * @ingroup RecentFiles + */ + +class RecentAction : public Gtk::Action +{ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS + +public: + typedef RecentAction CppObjectType; + typedef RecentAction_Class CppClassType; + typedef GtkRecentAction BaseObjectType; + typedef GtkRecentActionClass BaseClassType; + +private: friend class RecentAction_Class; + static CppClassType recentaction_class_; + +private: + // noncopyable + RecentAction(const RecentAction&); + RecentAction& operator=(const RecentAction&); + +protected: + explicit RecentAction(const Glib::ConstructParams& construct_params); + explicit RecentAction(GtkRecentAction* castitem); + +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +public: + virtual ~RecentAction(); + +#ifndef DOXYGEN_SHOULD_SKIP_THIS + static GType get_type() G_GNUC_CONST; + static GType get_base_type() G_GNUC_CONST; +#endif + + ///Provides access to the underlying C GObject. + GtkRecentAction* gobj() { return reinterpret_cast(gobject_); } + + ///Provides access to the underlying C GObject. + const GtkRecentAction* gobj() const { return reinterpret_cast(gobject_); } + + ///Provides access to the underlying C instance. The caller is responsible for unrefing it. Use when directly setting fields in structs. + GtkRecentAction* gobj_copy(); + +private: + + +protected: + RecentAction(); + +//Make sure that we use NULL instead of empty strings for the constructors: + + + //Note that the order of the parameters is not the same as gtk_recent_action_new(), because + //a) we want to be consistent with Action, ToggleAction, etc. + //b) this allows us to use the StockID parameter to distinguish the create() overloads. + explicit RecentAction(const Glib::ustring& name, const StockID& stock_id = StockID(), const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + explicit RecentAction(const Glib::ustring& name, const StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip, const Glib::RefPtr& manager); + +public: + //Note that gtk_recent_action_new() does not allow name to be NULL, which suggests that we should not have a default constructor, + //but it's OK to set the name later: + + static Glib::RefPtr create(); + + + static Glib::RefPtr create(const Glib::ustring& name, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + + static Glib::RefPtr create(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label = Glib::ustring(), const Glib::ustring& tooltip = Glib::ustring()); + + + static Glib::RefPtr create(const Glib::ustring& name, const Gtk::StockID& stock_id, const Glib::ustring& label, const Glib::ustring& tooltip, const Glib::RefPtr& manager); + + + /** Return value: true if numbers should be shown. + * @return true if numbers should be shown. + * + * @newin2p12. + */ + bool get_show_numbers(); + + /** Sets whether a number should be added to the items shown by the + * widgets representing @a action . The numbers are shown to provide + * a unique character for a mnemonic to be used inside the menu item's + * label. Only the first ten items get a number to avoid clashes. + * + * @newin2p12 + * @param show_numbers true if the shown items should be numbered. + */ + void set_show_numbers(bool show_numbers = true); + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the items should be displayed with a number. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_show_numbers() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the items should be displayed with a number. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_show_numbers() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + +public: + +public: + //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +protected: + //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + //Default Signal Handlers:: +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + +}; + +} // namespace Gtk + + +namespace Glib +{ + /** A Glib::wrap() method for this object. + * + * @param object The C instance. + * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. + * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentAction + */ + Glib::RefPtr wrap(GtkRecentAction* object, bool take_copy = false); +} + + +#endif /* _GTKMM_RECENTACTION_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/recentchooser.cc b/libs/gtkmm2/gtk/gtkmm/recentchooser.cc index c056ad3f98..546993d209 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchooser.cc +++ b/libs/gtkmm2/gtk/gtkmm/recentchooser.cc @@ -149,7 +149,7 @@ namespace Glib Glib::RefPtr wrap(GtkRecentChooser* object, bool take_copy) { - return Glib::RefPtr( dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)) ); + return Glib::RefPtr( dynamic_cast (Glib::wrap_auto_interface ((GObject*)(object), take_copy)) ); //We use dynamic_cast<> in case of multiple inheritance. } @@ -202,7 +202,7 @@ void RecentChooser_Class::iface_init_function(void* g_iface, void*) #ifdef GLIBMM_VFUNCS_ENABLED gchar* RecentChooser_Class::get_current_uri_vfunc_callback(GtkRecentChooser* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -210,40 +210,43 @@ gchar* RecentChooser_Class::get_current_uri_vfunc_callback(GtkRecentChooser* sel // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return g_strdup((obj->get_current_uri_vfunc()).c_str()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return g_strdup((obj->get_current_uri_vfunc()).c_str()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_current_uri) + return (*base->get_current_uri)(self); - // Call the original underlying C function: - if(base && base->get_current_uri) - return (*base->get_current_uri)(self); - } typedef gchar* RType; return RType(); } void RecentChooser_Class::unselect_uri_vfunc_callback(GtkRecentChooser* self, const gchar* uri) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -251,38 +254,42 @@ void RecentChooser_Class::unselect_uri_vfunc_callback(GtkRecentChooser* self, co // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->unselect_uri_vfunc(Glib::convert_const_gchar_ptr_to_ustring(uri) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->unselect_uri_vfunc(Glib::convert_const_gchar_ptr_to_ustring(uri) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->unselect_uri) + (*base->unselect_uri)(self, uri); - // Call the original underlying C function: - if(base && base->unselect_uri) - (*base->unselect_uri)(self, uri); - } } void RecentChooser_Class::select_all_vfunc_callback(GtkRecentChooser* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -290,37 +297,41 @@ void RecentChooser_Class::select_all_vfunc_callback(GtkRecentChooser* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->select_all_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->select_all_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->select_all) + (*base->select_all)(self); - // Call the original underlying C function: - if(base && base->select_all) - (*base->select_all)(self); - } } void RecentChooser_Class::unselect_all_vfunc_callback(GtkRecentChooser* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -328,37 +339,41 @@ void RecentChooser_Class::unselect_all_vfunc_callback(GtkRecentChooser* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->unselect_all_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->unselect_all_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->unselect_all) + (*base->unselect_all)(self); - // Call the original underlying C function: - if(base && base->unselect_all) - (*base->unselect_all)(self); - } } GtkRecentManager* RecentChooser_Class::get_recent_manager_vfunc_callback(GtkRecentChooser* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -366,40 +381,43 @@ GtkRecentManager* RecentChooser_Class::get_recent_manager_vfunc_callback(GtkRece // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->get_recent_manager_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->get_recent_manager_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->get_recent_manager) + return (*base->get_recent_manager)(self); - // Call the original underlying C function: - if(base && base->get_recent_manager) - return (*base->get_recent_manager)(self); - } typedef GtkRecentManager* RType; return RType(); } void RecentChooser_Class::add_filter_vfunc_callback(GtkRecentChooser* self, GtkRecentFilter* filter) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -407,38 +425,42 @@ void RecentChooser_Class::add_filter_vfunc_callback(GtkRecentChooser* self, GtkR // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->add_filter_vfunc(*Glib::wrap(filter) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->add_filter_vfunc(*Glib::wrap(filter) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->add_filter) + (*base->add_filter)(self, filter); - // Call the original underlying C function: - if(base && base->add_filter) - (*base->add_filter)(self, filter); - } } void RecentChooser_Class::remove_filter_vfunc_callback(GtkRecentChooser* self, GtkRecentFilter* filter) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -446,34 +468,38 @@ void RecentChooser_Class::remove_filter_vfunc_callback(GtkRecentChooser* self, G // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->remove_filter_vfunc(*Glib::wrap(filter) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->remove_filter_vfunc(*Glib::wrap(filter) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). + + BaseClassType *const base = static_cast( + g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface). g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Get the interface. -) ); +) ); + + // Call the original underlying C function: + if(base && base->remove_filter) + (*base->remove_filter)(self, filter); - // Call the original underlying C function: - if(base && base->remove_filter) - (*base->remove_filter)(self, filter); - } } #endif //GLIBMM_VFUNCS_ENABLED diff --git a/libs/gtkmm2/gtk/gtkmm/recentchooser.h b/libs/gtkmm2/gtk/gtkmm/recentchooser.h index 327c819b51..e2b50e8e84 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchooser.h +++ b/libs/gtkmm2/gtk/gtkmm/recentchooser.h @@ -157,8 +157,14 @@ private: protected: RecentChooser(); // you must derive from this class + +public: + // This is public so that C++ wrapper instances can be + // created for C instances of unwrapped types. + // For instance, if an unexpected C type implements the C interface. explicit RecentChooser(GtkRecentChooser* castitem); +protected: #endif /* DOXYGEN_SHOULD_SKIP_THIS */ public: @@ -182,46 +188,134 @@ private: public: + /** Whether to show recently used resources marked registered as private. + * + * @newin2p10 + * @param show_private true to show private items, false otherwise. + */ void set_show_private(bool show_private = true); + /** Return value: true if the recent chooser should show private items, + * @return true if the recent chooser should show private items, + * false otherwise. + * + * @newin2p10. + */ bool get_show_private() const; + /** Sets whether @a chooser should display the recently used resources that + * it didn't find. This only applies to local resources. + * + * @newin2p10 + * @param show_not_found Whether to show the local items we didn't find. + */ void set_show_not_found(bool show_not_found = true); + /** Retrieves whether @a chooser should show the recently used resources that + * were not found. + * @return true if the resources not found should be displayed, and + * false otheriwse. + * + * @newin2p10. + */ bool get_show_not_found() const; + /** Sets whether @a chooser can select multiple items. + * + * @newin2p10 + * @param select_multiple true if @a chooser can select more than one item. + */ void set_select_multiple(bool select_multiple = true); + /** Gets whether @a chooser can select multiple items. + * @return true if @a chooser can select more than one item. + * + * @newin2p10. + */ bool get_select_multiple() const; + /** Sets the number of items that should be returned by + * get_items() and get_uris(). + * + * @newin2p10 + * @param limit A positive integer, or -1 for all items. + */ void set_limit(int limit); void unset_limit(); + /** Gets the number of items returned by get_items() + * and get_uris(). + * @return A positive integer, or -1 meaning that all items are + * returned. + * + * @newin2p10. + */ int get_limit() const; + /** Sets whether only local resources, that is resources using the file:// URI + * scheme, should be shown in the recently used resources selector. If + * @a local_only is true (the default) then the shown resources are guaranteed + * to be accessible through the operating system native file system. + * + * @newin2p10 + * @param local_only true if only local files can be shown. + */ void set_local_only(bool local_only = true); + /** Gets whether only local resources should be shown in the recently used + * resources selector. See set_local_only() + * @return true if only local resources should be shown. + * + * @newin2p10. + */ bool get_local_only() const; + /** Sets whether to show a tooltips on the widget. + * + * @newin2p10 + * @param show_tips true if tooltips should be shown. + */ void set_show_tips(bool show_tips = true); + /** Gets whether @a chooser should display tooltips. + * @return true if the recent chooser should show tooltips, + * false otherwise. + * + * @newin2p10. + */ bool get_show_tips() const; - // TODO: These methods are declared in gtkrecentchooser.h but throw errors when - // using them on RecentChooserWidget or RecentChooserDialog. - // RecentChooserMenu reimplements them. - // In an email titled "GtkRecentChooser API glitch", Emmanuele Bassi said that these would be - // deprecated in GTK+ 2.12. murrayc. - //_WRAP_METHOD(void set_show_numbers(bool show_numbers = true), gtk_recent_chooser_set_show_numbers) - //_WRAP_METHOD(bool get_show_numbers() const, gtk_recent_chooser_get_show_numbers) + // Deprecated in GTK+ 2.12. murrayc: + /** Sets whether @a chooser should show an icon near the resource when + * displaying it. + * + * @newin2p10 + * @param show_icons Whether to show an icon near the resource. + */ void set_show_icons(bool show_icons = true); + /** Retrieves whether @a chooser should show an icon near the resource. + * @return true if the icons should be displayed, false otherwise. + * + * @newin2p10. + */ bool get_show_icons() const; + /** Changes the sorting order of the recently used resources list displayed by + * @a chooser . + * + * @newin2p10 + * @param sort_type Sort order that the chooser should use. + */ void set_sort_type(RecentSortType sort_type); + /** Gets the value set by set_sort_type(). + * @return The sorting order of the @a chooser . + * + * @newin2p10. + */ RecentSortType get_sort_type() const; @@ -240,6 +334,13 @@ public: // TODO: Return type should be void since it will never return false but // throwing RecentChooserError instead + /** Sets @a uri as the current URI for @a chooser . + * @param uri A URI. + * @param error Return location for a G::Error, or 0. + * @return true if the URI was found. + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED bool set_current_uri(const Glib::ustring& uri); #else @@ -247,13 +348,37 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Gets the URI currently selected by @a chooser . + * @return A newly allocated string holding a URI. + * + * @newin2p10. + */ Glib::ustring get_current_uri() const; + /** Gets the Gtk::RecentInfo currently selected by @a chooser . + * @return A Gtk::RecentInfo. Use gtk_recent_info_unref() when + * when you have finished using it. + * + * @newin2p10. + */ Glib::RefPtr get_current_item(); + /** Gets the Gtk::RecentInfo currently selected by @a chooser . + * @return A Gtk::RecentInfo. Use gtk_recent_info_unref() when + * when you have finished using it. + * + * @newin2p10. + */ Glib::RefPtr get_current_item() const; // TODO: Same here + /** Selects @a uri inside @a chooser . + * @param uri A URI. + * @param error Return location for a G::Error, or 0. + * @return true if @a uri was found. + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED bool select_uri(const Glib::ustring& uri); #else @@ -261,15 +386,39 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Unselects @a uri inside @a chooser . + * + * @newin2p10 + * @param uri A URI. + */ void unselect_uri(const Glib::ustring& uri); + /** Selects all the items inside @a chooser , if the @a chooser supports + * multiple selection. + * + * @newin2p10 + */ void select_all(); + /** Unselects all the items inside @a chooser . + * + * @newin2p10 + */ void unselect_all(); typedef Glib::ListHandle ListHandle_RecentInfos; + /** Gets the list of recently used resources in form of Gtk::RecentInfo objects. + * + * The return value of this function is affected by the "sort-type" and + * "limit" properties of @a chooser . + * @return A newly allocated list of Gtk::RecentInfo objects. You should + * use gtk_recent_info_unref() on every item of the list, and then free + * the list itself using Glib::list_free(). + * + * @newin2p10. + */ ListHandle_RecentInfos get_items() const; /** Gets the URI of the recently used resources. @@ -280,29 +429,70 @@ public: Glib::StringArrayHandle get_uris() const; + /** Adds @a filter to the list of Gtk::RecentFilter objects held by @a chooser . + * + * If no previous filter objects were defined, this function will call + * set_filter(). + * + * @newin2p10 + * @param filter A Gtk::RecentFilter. + */ void add_filter(const RecentFilter& filter); + /** Removes @a filter from the list of Gtk::RecentFilter objects held by @a chooser . + * + * @newin2p10 + * @param filter A Gtk::RecentFilter. + */ void remove_filter(const RecentFilter& filter); + /** Gets the Gtk::RecentFilter objects held by @a chooser . + * @return A singly linked list of Gtk::RecentFilter objects. You + * should just free the returned list using Glib::slist_free(). + * + * @newin2p10. + */ Glib::SListHandle list_filters(); + /** Gets the Gtk::RecentFilter objects held by @a chooser . + * @return A singly linked list of Gtk::RecentFilter objects. You + * should just free the returned list using Glib::slist_free(). + * + * @newin2p10. + */ Glib::SListHandle list_filters() const; + /** Sets @a filter as the current Gtk::RecentFilter object used by @a chooser + * to affect the displayed recently used resources. + * + * @newin2p10 + * @param filter A Gtk::RecentFilter. + */ void set_filter(const RecentFilter& filter); + /** Gets the Gtk::RecentFilter object currently used by @a chooser to affect + * the display of the recently used resources. + * @return A Gtk::RecentFilter object. + * + * @newin2p10. + */ RecentFilter* get_filter(); + /** Gets the Gtk::RecentFilter object currently used by @a chooser to affect + * the display of the recently used resources. + * @return A Gtk::RecentFilter object. + * + * @newin2p10. + */ const RecentFilter* get_filter() const; /** This signal is emitted when there is a change in the set of * selected recently used resources. This can happen when a user * modifies the selection with the mouse or the keyboard, or when * explicitely calling functions to change the selection. - */ - -/** + * * @par Prototype: - * void %selection_changed() + * void on_my_%selection_changed() */ Glib::SignalProxy0< void > signal_selection_changed(); @@ -312,11 +502,9 @@ public: * in the recent chooser. This can happen by double-clicking on an item * in the recently used resources list, or by pressing * Enter. - */ - -/** + * * @par Prototype: - * void %item_activated() + * void on_my_%item_activated() */ Glib::SignalProxy0< void > signal_item_activated(); @@ -583,10 +771,13 @@ protected: namespace Glib { - /** @relates Gtk::RecentChooser - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentChooser */ Glib::RefPtr wrap(GtkRecentChooser* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.cc b/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.cc index 77b2390280..ba94f2e8c5 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.cc +++ b/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.cc @@ -29,30 +29,34 @@ namespace Gtk RecentChooserDialog::RecentChooserDialog(Gtk::Window& parent, const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(), static_cast(0))) { set_transient_for(parent); } RecentChooserDialog::RecentChooserDialog(const Glib::ustring& title) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(), static_cast(0))) { } RecentChooserDialog::RecentChooserDialog(const Glib::ustring& title, const Glib::RefPtr& recent_manager) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(),"recent-manager",recent_manager->gobj(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(),"recent-manager",recent_manager->gobj(), static_cast(0))) { } RecentChooserDialog::RecentChooserDialog(Gtk::Window& parent, const Glib::ustring& title, const Glib::RefPtr& recent_manager) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(),"recent-manager",recent_manager->gobj(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Dialog(Glib::ConstructParams(recentchooserdialog_class_.init(), "title",title.c_str(),"recent-manager",recent_manager->gobj(), static_cast(0))) { set_transient_for(parent); } diff --git a/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.h b/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.h index cb80a90f24..6d42684334 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.h +++ b/libs/gtkmm2/gtk/gtkmm/recentchooserdialog.h @@ -132,10 +132,13 @@ public: namespace Glib { - /** @relates Gtk::RecentChooserDialog - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentChooserDialog */ Gtk::RecentChooserDialog* wrap(GtkRecentChooserDialog* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.cc b/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.cc index 5664cdc9b8..968cb02c87 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.cc +++ b/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.cc @@ -130,15 +130,17 @@ GType RecentChooserMenu::get_base_type() RecentChooserMenu::RecentChooserMenu() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Menu(Glib::ConstructParams(recentchoosermenu_class_.init())) { } RecentChooserMenu::RecentChooserMenu(const Glib::RefPtr& recent_manager) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Menu(Glib::ConstructParams(recentchoosermenu_class_.init(), "recent_manager", Glib::unwrap(recent_manager), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Menu(Glib::ConstructParams(recentchoosermenu_class_.init(), "recent_manager", Glib::unwrap(recent_manager), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.h b/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.h index 7d455cb3ee..e7f8b98bcc 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.h +++ b/libs/gtkmm2/gtk/gtkmm/recentchoosermenu.h @@ -119,8 +119,21 @@ public: explicit RecentChooserMenu(const Glib::RefPtr& recent_manager); + /** Sets whether a number should be added to the items of @a menu . The + * numbers are shown to provide a unique character for a mnemonic to + * be used inside ten menu item's label. Only the first the items + * get a number to avoid clashes. + * + * @newin2p10 + * @param show_numbers Whether to show numbers. + */ void set_show_numbers(bool show_numbers = true); + /** Return value: true if numbers should be shown. + * @return true if numbers should be shown. + * + * @newin2p10. + */ bool get_show_numbers() const; @@ -131,10 +144,13 @@ public: namespace Glib { - /** @relates Gtk::RecentChooserMenu - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentChooserMenu */ Gtk::RecentChooserMenu* wrap(GtkRecentChooserMenu* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.cc b/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.cc index 1f8cf7e837..a77512fc83 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.cc +++ b/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.cc @@ -130,15 +130,17 @@ GType RecentChooserWidget::get_base_type() RecentChooserWidget::RecentChooserWidget() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::VBox(Glib::ConstructParams(recentchooserwidget_class_.init())) { } RecentChooserWidget::RecentChooserWidget(const Glib::RefPtr& recent_manager) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::VBox(Glib::ConstructParams(recentchooserwidget_class_.init(), "recent_manager", Glib::unwrap(recent_manager), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::VBox(Glib::ConstructParams(recentchooserwidget_class_.init(), "recent_manager", Glib::unwrap(recent_manager), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.h b/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.h index 3e3f77a0ba..3a4a97d7a1 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.h +++ b/libs/gtkmm2/gtk/gtkmm/recentchooserwidget.h @@ -125,10 +125,13 @@ public: namespace Glib { - /** @relates Gtk::RecentChooserWidget - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentChooserWidget */ Gtk::RecentChooserWidget* wrap(GtkRecentChooserWidget* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/recentfilter.cc b/libs/gtkmm2/gtk/gtkmm/recentfilter.cc index 661fe3a257..9f06a25ec8 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentfilter.cc +++ b/libs/gtkmm2/gtk/gtkmm/recentfilter.cc @@ -202,7 +202,8 @@ GType RecentFilter::get_base_type() RecentFilter::RecentFilter() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Object(Glib::ConstructParams(recentfilter_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/recentfilter.h b/libs/gtkmm2/gtk/gtkmm/recentfilter.h index 6f45077370..dcac34ca8b 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentfilter.h +++ b/libs/gtkmm2/gtk/gtkmm/recentfilter.h @@ -193,21 +193,69 @@ public: RecentFilter(); + /** Sets the human-readable name of the filter; this is the string + * that will be displayed in the recently used resources selector + * user interface if there is a selectable list of filters. + * + * @newin2p10 + * @param name Then human readable name of @a filter . + */ void set_name(const Glib::ustring& name); + /** Gets the human-readable name for the filter. + * See gtk_recent_filter_set_name(). + * @return The name of the filter, or 0. The returned string + * is owned by the filter object and should not be freed. + * + * @newin2p10. + */ Glib::ustring get_name() const; + /** Adds a rule that allows resources based on their registered MIME type. + * + * @newin2p10 + * @param mime_type A MIME type. + */ void add_mime_type(const Glib::ustring& mime_type); + /** Adds a rule that allows resources based on a pattern matching their + * display name. + * + * @newin2p10 + * @param pattern A file pattern. + */ void add_pattern(const Glib::ustring& pattern); + /** Adds a rule allowing image files in the formats supported + * by GdkPixbuf. + * + * @newin2p10 + */ void add_pixbuf_formats(); + /** Adds a rule that allows resources based on the name of the application + * that has registered them. + * + * @newin2p10 + * @param application An application name. + */ void add_application(const Glib::ustring& application); + /** Adds a rule that allows resources based on the name of the group + * to which they belong + * + * @newin2p10 + * @param group A group name. + */ void add_group(const Glib::ustring& group); + /** Adds a rule that allows resources based on their age - that is, the number + * of days elapsed since they were last modified. + * + * @newin2p10 + * @param days Number of days. + */ void add_age(int days); /** A RecentFilter::Info class is used to pass information @@ -243,6 +291,17 @@ public: void add_custom(RecentFilterFlags needed, const SlotCustom& slot); + /** Gets the fields that need to be filled in for the structure + * passed to gtk_recent_filter_filter() + * + * This function will not typically be used by applications; it + * is intended principally for use in the implementation of + * Gtk::RecentChooser. + * @return Bitfield of flags indicating needed fields when + * calling gtk_recent_filter_filter() + * + * @newin2p10. + */ RecentFilterFlags get_needed() const; // Method is used by class RecentChooser implementors. @@ -257,10 +316,13 @@ public: namespace Glib { - /** @relates Gtk::RecentFilter - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentFilter */ Gtk::RecentFilter* wrap(GtkRecentFilter* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/recentinfo.h b/libs/gtkmm2/gtk/gtkmm/recentinfo.h index 0ba088a6a3..c8279a61f6 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentinfo.h +++ b/libs/gtkmm2/gtk/gtkmm/recentinfo.h @@ -83,55 +83,190 @@ public: operator bool() const; + /** Gets the URI of the resource. + * @return The URI of the resource. The returned string is + * owned by the recent manager, and should not be freed. + * + * @newin2p10. + */ Glib::ustring get_uri() const; + /** Gets the name of the resource. If none has been defined, the basename + * of the resource is obtained. + * @return The display name of the resource. The returned string + * is owned by the recent manager, and should not be freed. + * + * @newin2p10. + */ Glib::ustring get_display_name() const; + /** Gets the (short) description of the resource. + * @return The description of the resource. The returned string + * is owned by the recent manager, and should not be freed. + * + * @newin2p10. + */ Glib::ustring get_description() const; + /** Gets the MIME type of the resource. + * @return The MIME type of the resource. The returned string + * is owned by the recent manager, and should not be freed. + * + * @newin2p10. + */ Glib::ustring get_mime_type() const; + /** Gets the timestamp (seconds from system's Epoch) when the resource + * was added to the recently used resources list. + * @return The number of seconds elapsed from system's Epoch when + * the resource was added to the list, or -1 on failure. + * + * @newin2p10. + */ time_t get_added() const; + /** Gets the timestamp (seconds from system's Epoch) when the resource + * was last modified. + * @return The number of seconds elapsed from system's Epoch when + * the resource was last modified, or -1 on failure. + * + * @newin2p10. + */ time_t get_modified() const; + /** Gets the timestamp (seconds from system's Epoch) when the resource + * was last visited. + * @return The number of seconds elapsed from system's Epoch when + * the resource was last visited, or -1 on failure. + * + * @newin2p10. + */ time_t get_visited() const; + /** Gets the value of the "private" flag. Resources in the recently used + * list that have this flag set to true should only be displayed by the + * applications that have registered them. + * @return true if the private flag was found, false otherwise. + * + * @newin2p10. + */ bool get_private_hint() const; + /** Gets the data regarding the application that has registered the resource + * pointed by @a info . + * + * If the command line contains any escape characters defined inside the + * storage specification, they will be expanded. + * @param app_name The name of the application that has registered this item. + * @param app_exec Return location for the string containing the command line. + * @param count Return location for the number of times this item was registered. + * @param time Return location for the timestamp this item was last registered + * for this application. + * @return true if an application with @a app_name has registered this + * resource inside the recently used list, or false otherwise. You should + * free the returned command line using Glib::free(). + * + * @newin2p10. + */ bool get_application_info(const Glib::ustring& app_name, Glib::StringArrayHandle& app_exec, guint& count, time_t& time) const; Glib::StringArrayHandle get_applications() const; //_WRAP_METHOD(Glib::StringArrayHandle get_applications(unsigned& length) const, gtk_recent_info_get_applications) + /** Gets the name of the last application that have registered the + * recently used resource represented by @a info . + * @return An application name. Use Glib::free() to free it. + * + * @newin2p10. + */ Glib::ustring last_application() const; + /** Checks whether an application registered this resource using @a app_name . + * @param app_name A string containing an application name. + * @return true if an application with name @a app_name was found, + * false otherwise. + * + * @newin2p10. + */ bool has_application(const Glib::ustring& app_name) const; Glib::StringArrayHandle get_groups() const; //_WRAP_METHOD(Glib::StringArrayHandle get_groups(unsigned& length) const, gtk_recent_info_get_groups) + /** Checks whether @a group_name appears inside the groups registered for the + * recently used item @a info . + * @param group_name Name of a group. + * @return true if the group was found. + * + * @newin2p10. + */ bool has_group(const Glib::ustring& group) const; + /** Retrieves the icon of size @a size associated to the resource MIME type. + * @param size The size of the icon in pixels. + * @return A Gdk::Pixbuf containing the icon, or 0. + * + * @newin2p10. + */ Glib::RefPtr get_icon(int size); + /** Retrieves the icon of size @a size associated to the resource MIME type. + * @param size The size of the icon in pixels. + * @return A Gdk::Pixbuf containing the icon, or 0. + * + * @newin2p10. + */ Glib::RefPtr get_icon(int size) const; + /** Computes a valid UTF-8 string that can be used as the name of the item in a + * menu or list. For example, calling this function on an item that refers to + * "file:///foo/bar.txt" will yield "bar.txt". + * @return A newly-allocated string in UTF-8 encoding; free it with + * Glib::free(). + * + * @newin2p10. + */ Glib::ustring get_short_name() const; + /** Gets a displayable version of the resource's URI. If the resource + * is local, it returns a local path; if the resource is not local, + * it returns the UTF-8 encoded content of gtk_recent_info_get_uri(). + * @return A UTF-8 string containing the resource's URI or 0 + * + * @newin2p10. + */ Glib::ustring get_uri_display() const; + /** Gets the number of days elapsed since the last update of the resource + * pointed by @a info . + * @return A positive integer containing the number of days elapsed + * since the time this resource was last modified. + * + * @newin2p10. + */ int get_age() const; + /** Checks whether the resource is local or not by looking at the + * scheme of its URI. + * @return true if the resource is local. + * + * @newin2p10. + */ bool is_local() const; + /** Checks whether the resource pointed by @a info still exists. At + * the moment this check is done only on resources pointing to local files. + * @return true if the resource exists + * + * @newin2p10. + */ bool exists() const; @@ -172,10 +307,13 @@ inline bool operator!=(const RecentInfo& lhs, const RecentInfo& rhs) namespace Glib { - /** @relates Gtk::RecentInfo - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentInfo */ Glib::RefPtr wrap(GtkRecentInfo* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/recentmanager.cc b/libs/gtkmm2/gtk/gtkmm/recentmanager.cc index 5709b36495..eede99759a 100644 --- a/libs/gtkmm2/gtk/gtkmm/recentmanager.cc +++ b/libs/gtkmm2/gtk/gtkmm/recentmanager.cc @@ -30,6 +30,28 @@ namespace Gtk //Allow the generated code to work without the prefix: typedef RecentManager::ListHandle_RecentInfos ListHandle_RecentInfos; +bool RecentManager::add_item(const Glib::ustring& uri, const Data& data) +{ + GtkRecentData c_data; + gboolean result; + + // I wonder whether these should be const in the GTK+ API. armin. + c_data.display_name = data.display_name.empty() ? NULL : const_cast(data.display_name.c_str()); + c_data.description = const_cast(data.description.c_str()); + c_data.mime_type = const_cast(data.mime_type.c_str()); + c_data.app_name = const_cast(data.app_name.c_str()); + c_data.app_exec = const_cast(data.app_exec.c_str()); + c_data.groups = static_cast(g_malloc((data.groups.size() + 1) * sizeof(gchar))); + for(unsigned int i = 0; i < data.groups.size(); ++ i) + c_data.groups[i] = const_cast(data.groups[i].c_str()); + c_data.groups[data.groups.size()] = NULL; + c_data.is_private = data.is_private; + + result = gtk_recent_manager_add_full(gobj(), uri.c_str(), &c_data); + g_free(c_data.groups); + return result == TRUE; +} + } //namespace Gtk namespace @@ -139,7 +161,7 @@ void RecentManager_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void RecentManager_Class::changed_callback(GtkRecentManager* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -147,32 +169,35 @@ void RecentManager_Class::changed_callback(GtkRecentManager* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->changed) - (*base->changed)(self); - } + // Call the original underlying C function: + if(base && base->changed) + (*base->changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -220,7 +245,8 @@ GType RecentManager::get_base_type() RecentManager::RecentManager() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(recentmanager_class_.init())) { } @@ -276,11 +302,6 @@ bool RecentManager::add_item(const Glib::ustring& uri, std::auto_ptr create(); + /** Gets a unique instance of Gtk::RecentManager, that you can share + * in your application without caring about memory management. The + * returned instance will be freed when you application terminates. + * @return A unique Gtk::RecentManager. Do not ref or unref it. + * + * @newin2p10. + */ static Glib::RefPtr get_default(); + /** Gets the recent manager object associated with @a screen ; if this + * function has not previously been called for the given screen, + * a new recent manager object will be created and associated with + * the screen. Recent manager objects are fairly expensive to create, + * so using this function is usually a better choice than calling + * new() and setting the screen yourself; by using + * this function a single recent manager object will be shared between + * users. + * @param screen A Gdk::Screen. + * @return A unique Gtk::RecentManager associated with the given + * screen. This recent manager is associated to the with the screen + * and can be used as long as the screen is open. Do not ref or + * unref it. + * + * Deprecated: 2.12: This function has been deprecated and should + * not be used in newly written code. Calling this function is + * equivalent to calling get_default(). + * + * @newin2p10. + */ static Glib::RefPtr get_for_screen(const Glib::RefPtr& screen); /** Meta-data passed to add_item(). You should @@ -204,24 +231,69 @@ public: Glib::ustring app_name; Glib::ustring app_exec; - - Glib::StringArrayHandle groups; + + std::vector groups; bool is_private; }; - - void set_screen(const Glib::RefPtr& screen); + /** Sets the screen for a recent manager; the screen is used to + * track the user's currently configured recently used documents + * storage. + * + * @newin2p10 + * + * Deprecated: 2.12: This function has been deprecated and should + * not be used in newly written code. Calling this function has + * no effect. + * @param screen A Gdk::Screen. + */ + void set_screen(const Glib::RefPtr& screen); + + /** Adds a new resource into the recently used resources list. This function + * will try and guess some of the meta-data associated to a URI. If you + * know some of meta-data about the document yourself, set the desired + * fields of a RecentManager::Data structure and pass it to add_item(). + */ + + /** Adds a new resource, pointed by @a uri , into the recently used + * resources list. + * + * This function automatically retrieving some of the needed + * metadata and setting other metadata to common default values; it + * then feeds the data to add_full(). + * + * See add_full() if you want to explicitely + * define the metadata for the resource pointed by @a uri . + * @param uri A valid URI. + * @return true if the new item was successfully added + * to the recently used resources list + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED bool add_item(const Glib::ustring& uri); #else bool add_item(const Glib::ustring& uri, std::auto_ptr& error); #endif //GLIBMM_EXCEPTIONS_ENABLED - + + /** Adds a new resource into the recently used resources list, taking + * meta data from the given Data instead of guessing it from the URI. + */ bool add_item(const Glib::ustring& uri, const Data& recent_data); + + /** Removes a resource pointed by @a uri from the recently used resources + * list handled by a recent manager. + * @param uri The URI of the item you wish to remove. + * @param error Return location for a G::Error, or 0. + * @return true if the item pointed by @a uri has been successfully + * removed by the recently used resources list, and false otherwise. + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED bool remove_item(const Glib::ustring& uri); #else @@ -229,6 +301,17 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Searches for a URI inside the recently used resources list, and + * Return value: a Gtk::RecentInfo structure containing information + * @param uri A URI. + * @param error A return location for a G::Error, or 0. + * @return A Gtk::RecentInfo structure containing information + * about the resource pointed by @a uri , or 0 if the URI was + * not registered in the recently used resources list. Free with + * gtk_recent_info_unref(). + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr lookup_item(const Glib::ustring& uri); #else @@ -236,6 +319,17 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Searches for a URI inside the recently used resources list, and + * Return value: a Gtk::RecentInfo structure containing information + * @param uri A URI. + * @param error A return location for a G::Error, or 0. + * @return A Gtk::RecentInfo structure containing information + * about the resource pointed by @a uri , or 0 if the URI was + * not registered in the recently used resources list. Free with + * gtk_recent_info_unref(). + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr lookup_item(const Glib::ustring& uri) const; #else @@ -243,8 +337,27 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Checks whether there is a recently used resource registered + * with @a uri inside the recent manager. + * @param uri A URI. + * @return true if the resource was found, false otherwise. + * + * @newin2p10. + */ bool has_item(const Glib::ustring& uri) const; + /** Changes the location of a recently used resource from @a uri to @a new_uri . + * + * Please note that this function will not affect the resource pointed + * by the URIs, but only the URI used in the recently used resources list. + * @param uri The URI of a recently used resource. + * @param new_uri The new URI of the recently used resource, or 0 to + * remove the item pointed by @a uri in the list. + * @param error A return location for a G::Error, or 0. + * @return true on success. + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED bool move_item(const Glib::ustring& uri, const Glib::ustring& new_uri); #else @@ -252,16 +365,43 @@ public: #endif //GLIBMM_EXCEPTIONS_ENABLED + /** Sets the maximum number of item that the get_items() + * function should return. If @a limit is set to -1, then return all the + * items. + * + * @newin2p10 + * @param limit The maximum number of items to return, or -1. + */ void set_limit(int limit); + /** Gets the maximum number of items that the get_items() + * function should return. + * @return The number of items to return, or -1 for every item. + * + * @newin2p10. + */ int get_limit() const; typedef Glib::ListHandle ListHandle_RecentInfos; + /** Gets the list of recently used resources. + * @return A list of newly allocated Gtk::RecentInfo objects. Use + * gtk_recent_info_unref() on each item inside the list, and then + * free the list itself using Glib::list_free(). + * + * @newin2p10. + */ ListHandle_RecentInfos get_items() const; + /** Purges every item from the recently used resources list. + * @param error A return location for a G::Error, or 0. + * @return The number of items that have been removed from the + * recently used resources list. + * + * @newin2p10. + */ #ifdef GLIBMM_EXCEPTIONS_ENABLED int purge_items(); #else @@ -273,11 +413,9 @@ public: typedef sigc::slot SlotChanged; /** The "changed" signal is emitted when an item in the recently used resources list is changed. - */ - -/** + * * @par Prototype: - * void %changed() + * void on_my_%changed() */ Glib::SignalProxy0< void > signal_changed(); @@ -295,7 +433,7 @@ public: #ifdef GLIBMM_PROPERTIES_ENABLED -/** The maximum number of items to be returned by gtk_recent_manager_get_items. +/** The maximum number of items to be returned by gtk_recent_manager_get_items(). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -305,7 +443,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** The maximum number of items to be returned by gtk_recent_manager_get_items. +/** The maximum number of items to be returned by gtk_recent_manager_get_items(). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -350,10 +488,13 @@ protected: namespace Glib { - /** @relates Gtk::RecentManager - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::RecentManager */ Glib::RefPtr wrap(GtkRecentManager* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/ruler.cc b/libs/gtkmm2/gtk/gtkmm/ruler.cc index f104c64455..b3119286db 100644 --- a/libs/gtkmm2/gtk/gtkmm/ruler.cc +++ b/libs/gtkmm2/gtk/gtkmm/ruler.cc @@ -106,7 +106,7 @@ void Ruler_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void Ruler_Class::draw_ticks_vfunc_callback(GtkRuler* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -114,36 +114,40 @@ void Ruler_Class::draw_ticks_vfunc_callback(GtkRuler* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_ticks_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_ticks_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_ticks) + (*base->draw_ticks)(self); - // Call the original underlying C function: - if(base && base->draw_ticks) - (*base->draw_ticks)(self); - } } void Ruler_Class::draw_pos_vfunc_callback(GtkRuler* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -151,32 +155,36 @@ void Ruler_Class::draw_pos_vfunc_callback(GtkRuler* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_pos_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_pos_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_pos) + (*base->draw_pos)(self); - // Call the original underlying C function: - if(base && base->draw_pos) - (*base->draw_pos)(self); - } } #endif //GLIBMM_VFUNCS_ENABLED @@ -225,7 +233,8 @@ GType Ruler::get_base_type() Ruler::Ruler() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(ruler_class_.init())) { } @@ -451,7 +460,8 @@ GType VRuler::get_base_type() VRuler::VRuler() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Ruler(Glib::ConstructParams(vruler_class_.init())) { } @@ -562,7 +572,8 @@ GType HRuler::get_base_type() HRuler::HRuler() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Ruler(Glib::ConstructParams(hruler_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/ruler.h b/libs/gtkmm2/gtk/gtkmm/ruler.h index 3afec185d1..a701912d48 100644 --- a/libs/gtkmm2/gtk/gtkmm/ruler.h +++ b/libs/gtkmm2/gtk/gtkmm/ruler.h @@ -415,10 +415,13 @@ public: namespace Glib { - /** @relates Gtk::Ruler - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Ruler */ Gtk::Ruler* wrap(GtkRuler* object, bool take_copy = false); } //namespace Glib @@ -426,10 +429,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VRuler - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VRuler */ Gtk::VRuler* wrap(GtkVRuler* object, bool take_copy = false); } //namespace Glib @@ -437,10 +443,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HRuler - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HRuler */ Gtk::HRuler* wrap(GtkHRuler* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/scale.cc b/libs/gtkmm2/gtk/gtkmm/scale.cc index e3ca69c1f1..ef05482f06 100644 --- a/libs/gtkmm2/gtk/gtkmm/scale.cc +++ b/libs/gtkmm2/gtk/gtkmm/scale.cc @@ -54,8 +54,9 @@ int Scale::calc_digits_(double step) const VScale::VScale(double min, double max, double step) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scale(Glib::ConstructParams(vscale_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scale(Glib::ConstructParams(vscale_class_.init())) { Adjustment* adjustment = manage(new Adjustment(min, min, max, step, 10 * step, step)); // The adjustment will be destroyed along with the object @@ -66,16 +67,18 @@ VScale::VScale(double min, double max, double step) VScale::VScale(Adjustment& adjustment) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scale(Glib::ConstructParams(vscale_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scale(Glib::ConstructParams(vscale_class_.init())) { set_adjustment(adjustment); } VScale::VScale() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scale(Glib::ConstructParams(vscale_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scale(Glib::ConstructParams(vscale_class_.init())) { Adjustment* adjustment = manage(new Adjustment(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); @@ -86,8 +89,9 @@ VScale::VScale() HScale::HScale(double min, double max, double step) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scale(Glib::ConstructParams(hscale_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scale(Glib::ConstructParams(hscale_class_.init())) { Adjustment* adjustment = manage(new Adjustment(min, min, max, step, 10 * step, step)); // The adjustment will be destroyed along with the object @@ -98,8 +102,9 @@ HScale::HScale(double min, double max, double step) HScale::HScale() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scale(Glib::ConstructParams(hscale_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scale(Glib::ConstructParams(hscale_class_.init())) { Adjustment* adjustment = manage(new Adjustment(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); @@ -109,8 +114,9 @@ HScale::HScale() HScale::HScale(Adjustment& adjustment) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scale(Glib::ConstructParams(hscale_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scale(Glib::ConstructParams(hscale_class_.init())) { set_adjustment(adjustment); } @@ -243,7 +249,7 @@ void Scale_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void Scale_Class::draw_value_vfunc_callback(GtkScale* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -251,39 +257,43 @@ void Scale_Class::draw_value_vfunc_callback(GtkScale* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_value_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_value_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_value) + (*base->draw_value)(self); - // Call the original underlying C function: - if(base && base->draw_value) - (*base->draw_value)(self); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED gchar* Scale_Class::format_value_callback(GtkScale* self, gdouble p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -291,34 +301,36 @@ gchar* Scale_Class::format_value_callback(GtkScale* self, gdouble p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return (strlen(obj->on_format_value(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return (strlen(obj->on_format_value(p0 ).c_str()) ? g_strdup(obj->on_format_value(p0 ).c_str()) : 0); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->format_value) - return (*base->format_value)(self, p0); - } + // Call the original underlying C function: + if(base && base->format_value) + return (*base->format_value)(self, p0); typedef gchar* RType; return RType(); @@ -367,7 +379,8 @@ GType Scale::get_base_type() Scale::Scale() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Range(Glib::ConstructParams(scale_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/scale.h b/libs/gtkmm2/gtk/gtkmm/scale.h index 3313552d20..c0bb36a1cd 100644 --- a/libs/gtkmm2/gtk/gtkmm/scale.h +++ b/libs/gtkmm2/gtk/gtkmm/scale.h @@ -171,31 +171,33 @@ public: PositionType get_value_pos() const; - /** Gets the Pango::Layout used to display the scale. The returned object - * is owned by the scale so does not need to be freed by the caller. - * @return The Pango::Layout for this scale, or 0 if the draw_value property - * is false. + /** Gets the Pango::Layout used to display the scale. + * The returned object is owned by the scale so does + * not need to be freed by the caller. + * @return The Pango::Layout for this scale, or 0 + * if the Gtk::Scale:draw-value property is false. * * @newin2p4. */ Glib::RefPtr get_layout(); - /** Gets the Pango::Layout used to display the scale. The returned object - * is owned by the scale so does not need to be freed by the caller. - * @return The Pango::Layout for this scale, or 0 if the draw_value property - * is false. + /** Gets the Pango::Layout used to display the scale. + * The returned object is owned by the scale so does + * not need to be freed by the caller. + * @return The Pango::Layout for this scale, or 0 + * if the Gtk::Scale:draw-value property is false. * * @newin2p4. */ Glib::RefPtr get_layout() const; - /** Obtains the coordinates where the scale will draw the Pango::Layout - * representing the text in the scale. Remember + /** Obtains the coordinates where the scale will draw the + * Pango::Layout representing the text in the scale. Remember * when using the Pango::Layout function you need to convert to * and from pixels using PANGO_PIXELS() or Pango::SCALE. * - * If the draw_value property is false, the return values are - * undefined. + * If the Gtk::Scale:draw-value property is false, the return + * values are undefined. * * @newin2p4 * @param x Location to store X offset of layout, or 0. @@ -209,11 +211,9 @@ public: * This can be used to connect a custom function for determining how the * value is formatted. The function (or function object) is given a the value * as a double and should return the representation of it as a Glib::ustring. - */ - -/** + * * @par Prototype: - * Glib::ustring %format_value(double value) + * Glib::ustring on_my_%format_value(double value) */ Glib::SignalProxy1< Glib::ustring,double > signal_format_value(); @@ -469,10 +469,13 @@ public: namespace Glib { - /** @relates Gtk::Scale - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Scale */ Gtk::Scale* wrap(GtkScale* object, bool take_copy = false); } //namespace Glib @@ -480,10 +483,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VScale - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VScale */ Gtk::VScale* wrap(GtkVScale* object, bool take_copy = false); } //namespace Glib @@ -491,10 +497,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HScale - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HScale */ Gtk::HScale* wrap(GtkHScale* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/scalebutton.cc b/libs/gtkmm2/gtk/gtkmm/scalebutton.cc new file mode 100644 index 0000000000..bb28c84d0a --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/scalebutton.cc @@ -0,0 +1,325 @@ +// Generated by gtkmmproc -- DO NOT MODIFY! + + +#include +#include + +// -*- c++ -*- +/* $Id: scalebutton.ccg,v 1.2 2003/10/18 15:35:31 murrayc Exp $ */ + +/* + * + * Copyright 2007 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +namespace Gtk +{ + + +} // namespace Gtk + + +namespace +{ + + +static void ScaleButton_signal_value_changed_callback(GtkScaleButton* self, gdouble p0,void* data) +{ + using namespace Gtk; + typedef sigc::slot< void,double > SlotType; + + // Do not try to call a signal on a disassociated wrapper. + if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + (*static_cast(slot))(p0 +); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } +} + +static const Glib::SignalProxyInfo ScaleButton_signal_value_changed_info = +{ + "value_changed", + (GCallback) &ScaleButton_signal_value_changed_callback, + (GCallback) &ScaleButton_signal_value_changed_callback +}; + + +} // anonymous namespace + + +namespace Glib +{ + +Gtk::ScaleButton* wrap(GtkScaleButton* object, bool take_copy) +{ + return dynamic_cast (Glib::wrap_auto ((GObject*)(object), take_copy)); +} + +} /* namespace Glib */ + +namespace Gtk +{ + + +/* The *_Class implementation: */ + +const Glib::Class& ScaleButton_Class::init() +{ + if(!gtype_) // create the GType if necessary + { + // Glib::Class has to know the class init function to clone custom types. + class_init_func_ = &ScaleButton_Class::class_init_function; + + // This is actually just optimized away, apparently with no harm. + // Make sure that the parent type has been created. + //CppClassParent::CppObjectType::get_type(); + + // Create the wrapper type, with the same class/instance size as the base type. + register_derived_type(gtk_scale_button_get_type()); + + // Add derived versions of interfaces, if the C type implements any interfaces: + } + + return *this; +} + +void ScaleButton_Class::class_init_function(void* g_class, void* class_data) +{ + BaseClassType *const klass = static_cast(g_class); + CppClassParent::class_init_function(klass, class_data); + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + klass->value_changed = &value_changed_callback; +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +} + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +void ScaleButton_Class::value_changed_callback(GtkScaleButton* self, gdouble p0) +{ + Glib::ObjectBase *const obj_base = static_cast( + Glib::ObjectBase::_get_current_wrapper((GObject*)self)); + + // Non-gtkmmproc-generated custom classes implicitly call the default + // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc- + // generated classes can use this optimisation, which avoids the unnecessary + // parameter conversions if there is no possibility of the virtual function + // being overridden: + if(obj_base && obj_base->is_derived_()) + { + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_value_changed(p0 +); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } + } + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->value_changed) + (*base->value_changed)(self, p0); +} +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + +Glib::ObjectBase* ScaleButton_Class::wrap_new(GObject* o) +{ + return manage(new ScaleButton((GtkScaleButton*)(o))); + +} + + +/* The implementation: */ + +ScaleButton::ScaleButton(const Glib::ConstructParams& construct_params) +: + Gtk::Button(construct_params) +{ + } + +ScaleButton::ScaleButton(GtkScaleButton* castitem) +: + Gtk::Button((GtkButton*)(castitem)) +{ + } + +ScaleButton::~ScaleButton() +{ + destroy_(); +} + +ScaleButton::CppClassType ScaleButton::scalebutton_class_; // initialize static member + +GType ScaleButton::get_type() +{ + return scalebutton_class_.init().get_type(); +} + +GType ScaleButton::get_base_type() +{ + return gtk_scale_button_get_type(); +} + + +ScaleButton::ScaleButton(IconSize size, double min, double max, double step, const Glib::StringArrayHandle& icons) +: + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Button(Glib::ConstructParams(scalebutton_class_.init(), "size", static_cast(int(size)), "min", min, "max", max, "step", step, "icons", const_cast((icons).data()), static_cast(0))) +{ + } + +void ScaleButton::set_icons(const Glib::StringArrayHandle& icons) +{ +gtk_scale_button_set_icons(gobj(), const_cast((icons).data())); +} + +double ScaleButton::get_value() const +{ + return gtk_scale_button_get_value(const_cast(gobj())); +} + +void ScaleButton::set_value(double value) +{ +gtk_scale_button_set_value(gobj(), value); +} + +Gtk::Adjustment* ScaleButton::get_adjustment() +{ + + Gtk::Adjustment* retvalue = Glib::wrap(gtk_scale_button_get_adjustment(gobj())); + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; + +} + +Gtk::Adjustment* ScaleButton::get_adjustment() const +{ + return const_cast(this)->get_adjustment(); +} + +void ScaleButton::set_adjustment(Gtk::Adjustment& adjustment) +{ +gtk_scale_button_set_adjustment(gobj(), (adjustment).gobj()); +} + + +Glib::SignalProxy1< void,double > ScaleButton::signal_value_changed() +{ + return Glib::SignalProxy1< void,double >(this, &ScaleButton_signal_value_changed_info); +} + + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy ScaleButton::property_value() +{ + return Glib::PropertyProxy(this, "value"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly ScaleButton::property_value() const +{ + return Glib::PropertyProxy_ReadOnly(this, "value"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy ScaleButton::property_size() +{ + return Glib::PropertyProxy(this, "size"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly ScaleButton::property_size() const +{ + return Glib::PropertyProxy_ReadOnly(this, "size"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy ScaleButton::property_adjustment() +{ + return Glib::PropertyProxy(this, "adjustment"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly ScaleButton::property_adjustment() const +{ + return Glib::PropertyProxy_ReadOnly(this, "adjustment"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + + +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED +void Gtk::ScaleButton::on_value_changed(double value) +{ + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class). + ); + + if(base && base->value_changed) + (*base->value_changed)(gobj(),value); +} +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + +} // namespace Gtk + + diff --git a/libs/gtkmm2/gtk/gtkmm/scalebutton.h b/libs/gtkmm2/gtk/gtkmm/scalebutton.h new file mode 100644 index 0000000000..00214e225f --- /dev/null +++ b/libs/gtkmm2/gtk/gtkmm/scalebutton.h @@ -0,0 +1,264 @@ +// -*- c++ -*- +// Generated by gtkmmproc -- DO NOT MODIFY! +#ifndef _GTKMM_SCALEBUTTON_H +#define _GTKMM_SCALEBUTTON_H + + +#include + +/* $Id: scalebutton.hg,v 1.5 2005/11/30 14:10:49 murrayc Exp $ */ + +/* scalebutton.h + * + * Copyright (C) 2007 The gtkmm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include + + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +typedef struct _GtkScaleButton GtkScaleButton; +typedef struct _GtkScaleButtonClass GtkScaleButtonClass; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + +namespace Gtk +{ class ScaleButton_Class; } // namespace Gtk +namespace Gtk +{ + +/** A button which pops up a scale widget. + * + * This kind of widget is commonly used for volume controls in multimedia + * applications, and there is a Gtk::VolumeButton subclass that is tailored + * for this use case. + * + * @ingroup Widgets + * @newin2p12 + */ + +class ScaleButton : public Button +{ + public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + typedef ScaleButton CppObjectType; + typedef ScaleButton_Class CppClassType; + typedef GtkScaleButton BaseObjectType; + typedef GtkScaleButtonClass BaseClassType; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + + virtual ~ScaleButton(); + +#ifndef DOXYGEN_SHOULD_SKIP_THIS + +private: + friend class ScaleButton_Class; + static CppClassType scalebutton_class_; + + // noncopyable + ScaleButton(const ScaleButton&); + ScaleButton& operator=(const ScaleButton&); + +protected: + explicit ScaleButton(const Glib::ConstructParams& construct_params); + explicit ScaleButton(GtkScaleButton* castitem); + +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +public: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + static GType get_type() G_GNUC_CONST; + static GType get_base_type() G_GNUC_CONST; +#endif + + ///Provides access to the underlying C GtkObject. + GtkScaleButton* gobj() { return reinterpret_cast(gobject_); } + + ///Provides access to the underlying C GtkObject. + const GtkScaleButton* gobj() const { return reinterpret_cast(gobject_); } + + +public: + //C++ methods used to invoke GTK+ virtual functions: +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + +protected: + //GTK+ Virtual Functions (override these to change behaviour): +#ifdef GLIBMM_VFUNCS_ENABLED +#endif //GLIBMM_VFUNCS_ENABLED + + //Default Signal Handlers:: +#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + virtual void on_value_changed(double value); +#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED + + +private: + +public: + + explicit ScaleButton(IconSize size, double min, double max, double step, const Glib::StringArrayHandle& icons); + + + /** Sets the icons to be used by the scale button. + * For details, see the Gtk::ScaleButton:icons property. + * + * Since 2.12 + * @param icons A 0-terminated array of icon names. + */ + void set_icons(const Glib::StringArrayHandle& icons); + + /** Gets the current value of the scale button. + * @return Current value of the scale button + * + * @newin2p12. + */ + double get_value() const; + + /** Sets the current value of the scale; if the value is outside + * the minimum or maximum range values, it will be clamped to fit + * inside them. The scale button emits the Gtk::ScaleButton::value-changed + * signal if the value changes. + * + * @newin2p12 + * @param value New value of the scale button. + */ + void set_value(double value); + + /** Gets the Gtk::Adjustment associated with the Gtk::ScaleButton's scale. + * See Gtk::Range::get_adjustment() for details. + * @return The adjustment associated with the scale + * + * @newin2p12. + */ + Gtk::Adjustment* get_adjustment(); + + /** Gets the Gtk::Adjustment associated with the Gtk::ScaleButton's scale. + * See Gtk::Range::get_adjustment() for details. + * @return The adjustment associated with the scale + * + * @newin2p12. + */ + Gtk::Adjustment* get_adjustment() const; + + /** Sets the Gtk::Adjustment to be used as a model + * for the Gtk::ScaleButton's scale. + * See Gtk::Range::set_adjustment() for details. + * + * @newin2p12 + * @param adjustment A Gtk::Adjustment. + */ + void set_adjustment(Gtk::Adjustment& adjustment); + + + /** + * @par Prototype: + * void on_my_%value_changed(double value) + */ + + Glib::SignalProxy1< void,double > signal_value_changed(); + + + //Ignore key-binding signals: + + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The value of the scale. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_value() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The value of the scale. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_value() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The icon size. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_size() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The icon size. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_size() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** The GtkAdjustment that contains the current value of this scale button object. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_adjustment() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** The GtkAdjustment that contains the current value of this scale button object. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_adjustment() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + +}; + + +} // namespace Gtk + + +namespace Glib +{ + /** A Glib::wrap() method for this object. + * + * @param object The C instance. + * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. + * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ScaleButton + */ + Gtk::ScaleButton* wrap(GtkScaleButton* object, bool take_copy = false); +} //namespace Glib + + +#endif /* _GTKMM_SCALEBUTTON_H */ + diff --git a/libs/gtkmm2/gtk/gtkmm/scrollbar.cc b/libs/gtkmm2/gtk/gtkmm/scrollbar.cc index 5650494b98..b7a917eafc 100644 --- a/libs/gtkmm2/gtk/gtkmm/scrollbar.cc +++ b/libs/gtkmm2/gtk/gtkmm/scrollbar.cc @@ -37,16 +37,18 @@ namespace Gtk VScrollbar::VScrollbar(Adjustment& adjustment) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scrollbar(Glib::ConstructParams(vscrollbar_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scrollbar(Glib::ConstructParams(vscrollbar_class_.init())) { set_adjustment(adjustment); } VScrollbar::VScrollbar() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scrollbar(Glib::ConstructParams(vscrollbar_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scrollbar(Glib::ConstructParams(vscrollbar_class_.init())) { Adjustment* adjustment = manage(new Adjustment(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); @@ -57,8 +59,9 @@ VScrollbar::VScrollbar() HScrollbar::HScrollbar() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scrollbar(Glib::ConstructParams(hscrollbar_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scrollbar(Glib::ConstructParams(hscrollbar_class_.init())) { Adjustment* adjustment = manage(new Adjustment(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); @@ -68,8 +71,9 @@ HScrollbar::HScrollbar() HScrollbar::HScrollbar(Adjustment& adjustment) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Scrollbar(Glib::ConstructParams(hscrollbar_class_.init(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Scrollbar(Glib::ConstructParams(hscrollbar_class_.init())) { set_adjustment(adjustment); } diff --git a/libs/gtkmm2/gtk/gtkmm/scrollbar.h b/libs/gtkmm2/gtk/gtkmm/scrollbar.h index e18a0243a0..fa8a7b9850 100644 --- a/libs/gtkmm2/gtk/gtkmm/scrollbar.h +++ b/libs/gtkmm2/gtk/gtkmm/scrollbar.h @@ -297,10 +297,13 @@ public: namespace Glib { - /** @relates Gtk::Scrollbar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Scrollbar */ Gtk::Scrollbar* wrap(GtkScrollbar* object, bool take_copy = false); } //namespace Glib @@ -308,10 +311,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VScrollbar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VScrollbar */ Gtk::VScrollbar* wrap(GtkVScrollbar* object, bool take_copy = false); } //namespace Glib @@ -319,10 +325,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HScrollbar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HScrollbar */ Gtk::HScrollbar* wrap(GtkHScrollbar* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc index 8319f9d821..7033003bde 100644 --- a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc +++ b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.cc @@ -156,15 +156,17 @@ GType ScrolledWindow::get_base_type() ScrolledWindow::ScrolledWindow() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Bin(Glib::ConstructParams(scrolledwindow_class_.init())) { } ScrolledWindow::ScrolledWindow(Adjustment& hadjustment, Adjustment& vadjustment) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Bin(Glib::ConstructParams(scrolledwindow_class_.init(), "hadjustment", (hadjustment).gobj(), "vadjustment", (vadjustment).gobj(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Bin(Glib::ConstructParams(scrolledwindow_class_.init(), "hadjustment", (hadjustment).gobj(), "vadjustment", (vadjustment).gobj(), static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h index fdd7860ffa..fafa8b55ce 100644 --- a/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h +++ b/libs/gtkmm2/gtk/gtkmm/scrolledwindow.h @@ -155,13 +155,36 @@ public: void get_policy(PolicyType& hscrollbar_policy, PolicyType& vscrollbar_policy) const; + /** Sets the placement of the contents with respect to the scrollbars + * for the scrolled window. + * The default is Gtk::CORNER_TOP_LEFT, meaning the child is + * in the top left, with the scrollbars underneath and to the right. + * Other values in Gtk::CornerType are Gtk::CORNER_TOP_RIGHT, + * Gtk::CORNER_BOTTOM_LEFT, and Gtk::CORNER_BOTTOM_RIGHT. + * + * See also get_placement() and + * unset_placement(). + * @param window_placement Position of the child window. + */ void set_placement(CornerType window_placement); + /** Unsets the placement of the contents with respect to the scrollbars + * for the scrolled window. If no window placement is set for a scrolled + * window, it obeys the "gtk-scrolled-window-placement" XSETTING. + * + * See also set_placement() and + * get_placement(). + * + * @newin2p10 + */ void unset_placement(); - /** Gets the placement of the scrollbars for the scrolled window. See - * set_placement(). + /** Gets the placement of the contents with respect to the scrollbars + * for the scrolled window. See set_placement(). * @return The current placement value. + * + * See also set_placement() and + * unset_placement(). */ CornerType get_placement() const; @@ -182,7 +205,7 @@ public: virtual void add(Gtk::Widget& widget); - /** Returns the vertical scrollbar of @a scrolled_window . + /** Returns: the vertical scrollbar of the scrolled window, or * @return The vertical scrollbar of the scrolled window, or * 0 if it does not have one. * @@ -190,7 +213,7 @@ public: */ VScrollbar* get_vscrollbar(); - /** Returns the vertical scrollbar of @a scrolled_window . + /** Returns: the vertical scrollbar of the scrolled window, or * @return The vertical scrollbar of the scrolled window, or * 0 if it does not have one. * @@ -199,7 +222,7 @@ public: const VScrollbar* get_vscrollbar() const; - /** Returns the horizontal scrollbar of @a scrolled_window . + /** Returns: the horizontal scrollbar of the scrolled window, or * @return The horizontal scrollbar of the scrolled window, or * 0 if it does not have one. * @@ -207,7 +230,7 @@ public: */ HScrollbar* get_hscrollbar(); - /** Returns the horizontal scrollbar of @a scrolled_window . + /** Returns: the horizontal scrollbar of the scrolled window, or * @return The horizontal scrollbar of the scrolled window, or * 0 if it does not have one. * @@ -349,10 +372,13 @@ public: namespace Glib { - /** @relates Gtk::ScrolledWindow - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::ScrolledWindow */ Gtk::ScrolledWindow* wrap(GtkScrolledWindow* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/selectiondata.cc b/libs/gtkmm2/gtk/gtkmm/selectiondata.cc index f550cedbb9..db83bb4f2d 100644 --- a/libs/gtkmm2/gtk/gtkmm/selectiondata.cc +++ b/libs/gtkmm2/gtk/gtkmm/selectiondata.cc @@ -76,7 +76,7 @@ std::string SelectionData::get_target() const gdk_atom_name(const_cast(gobj())->target)); } -Glib::StringArrayHandle SelectionData::get_targets() const +Gdk::ArrayHandle_AtomString SelectionData::get_targets() const { GdkAtom* targets = 0; int n_targets = 0; @@ -84,25 +84,11 @@ Glib::StringArrayHandle SelectionData::get_targets() const if(!gtk_selection_data_get_targets(const_cast(gobj()), &targets, &n_targets)) n_targets = 0; // it's set to -1 otherwise - //Build a C++ list containing the target names: - std::list listTargets; - for(int i = 0; i < n_targets; n_targets++) - { - //Convert the atom to a string: - gchar* const atom_name = gdk_atom_name(targets[i]); - - Glib::ustring target; - if(atom_name) - target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. - - listTargets.push_back(target); - } - - g_free(targets); - - return listTargets; + //Note that we free the GdkAtom* array, but we don't need to free its items: + return Gdk::ArrayHandle_AtomString(targets, n_targets, Glib::OWNERSHIP_SHALLOW); } + std::string SelectionData::get_data_type() const { return Glib::convert_return_gchar_ptr_to_stdstring( diff --git a/libs/gtkmm2/gtk/gtkmm/selectiondata.h b/libs/gtkmm2/gtk/gtkmm/selectiondata.h index b3192a24c4..57bdd87a00 100644 --- a/libs/gtkmm2/gtk/gtkmm/selectiondata.h +++ b/libs/gtkmm2/gtk/gtkmm/selectiondata.h @@ -182,7 +182,7 @@ public: std::string get_target() const; /// See also Gtk::Clipboard::request_targets() - Glib::StringArrayHandle get_targets() const; + Gdk::ArrayHandle_AtomString get_targets() const; /** Returns the ID of the selection. @@ -198,6 +198,14 @@ public: Glib::RefPtr get_display() const; + /** Given a Gtk::SelectionData object holding a list of targets, + * determines if any of the targets in @a targets can be used to + * provide a list or URIs. + * @return true if @a selection_data holds a list of targets, + * and a suitable target for text is included, otherwise false. + * + * @newin2p10. + */ bool targets_include_uri() const; /** Given a Gtk::SelectionData object holding a list of targets, @@ -208,6 +216,16 @@ public: */ bool targets_include_text() const; + /** Given a Gtk::SelectionData object holding a list of targets, + * determines if any of the targets in @a targets can be used to + * provide rich text. + * @param buffer A Gtk::TextBuffer. + * @return true if @a selection_data holds a list of targets, + * and a suitable target for rich text is included, + * otherwise false. + * + * @newin2p10. + */ bool targets_include_rich_text(const Glib::RefPtr& buffer) const; /** Given a Gtk::SelectionData object holding a list of targets, @@ -243,10 +261,13 @@ inline void swap(SelectionData& lhs, SelectionData& rhs) namespace Glib { -/** @relates Gtk::SelectionData - * @param object The C instance +/** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::SelectionData */ Gtk::SelectionData wrap(GtkSelectionData* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/separator.cc b/libs/gtkmm2/gtk/gtkmm/separator.cc index 808bd68eb5..d02b99bf6b 100644 --- a/libs/gtkmm2/gtk/gtkmm/separator.cc +++ b/libs/gtkmm2/gtk/gtkmm/separator.cc @@ -131,7 +131,8 @@ GType Separator::get_base_type() Separator::Separator() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Widget(Glib::ConstructParams(separator_class_.init())) { } @@ -242,7 +243,8 @@ GType VSeparator::get_base_type() VSeparator::VSeparator() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Separator(Glib::ConstructParams(vseparator_class_.init())) { } @@ -353,7 +355,8 @@ GType HSeparator::get_base_type() HSeparator::HSeparator() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Separator(Glib::ConstructParams(hseparator_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/separator.h b/libs/gtkmm2/gtk/gtkmm/separator.h index 11475c8514..0c4611eb3d 100644 --- a/libs/gtkmm2/gtk/gtkmm/separator.h +++ b/libs/gtkmm2/gtk/gtkmm/separator.h @@ -276,10 +276,13 @@ public: namespace Glib { - /** @relates Gtk::Separator - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Separator */ Gtk::Separator* wrap(GtkSeparator* object, bool take_copy = false); } //namespace Glib @@ -287,10 +290,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::VSeparator - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::VSeparator */ Gtk::VSeparator* wrap(GtkVSeparator* object, bool take_copy = false); } //namespace Glib @@ -298,10 +304,13 @@ namespace Glib namespace Glib { - /** @relates Gtk::HSeparator - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::HSeparator */ Gtk::HSeparator* wrap(GtkHSeparator* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc index a11e043625..1478ab2a78 100644 --- a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc +++ b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.cc @@ -129,7 +129,8 @@ GType SeparatorMenuItem::get_base_type() SeparatorMenuItem::SeparatorMenuItem() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::MenuItem(Glib::ConstructParams(separatormenuitem_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h index 9d36c664d0..5ff3afa7b5 100644 --- a/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h +++ b/libs/gtkmm2/gtk/gtkmm/separatormenuitem.h @@ -117,10 +117,13 @@ public: namespace Glib { - /** @relates Gtk::SeparatorMenuItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::SeparatorMenuItem */ Gtk::SeparatorMenuItem* wrap(GtkSeparatorMenuItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc index 8c03d4e827..d7102765f6 100644 --- a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc +++ b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.cc @@ -135,7 +135,8 @@ GType SeparatorToolItem::get_base_type() SeparatorToolItem::SeparatorToolItem() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::ToolItem(Glib::ConstructParams(separatortoolitem_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h index 6e4739594f..055d4fdfa9 100644 --- a/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h +++ b/libs/gtkmm2/gtk/gtkmm/separatortoolitem.h @@ -121,10 +121,13 @@ public: namespace Glib { - /** @relates Gtk::SeparatorToolItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::SeparatorToolItem */ Gtk::SeparatorToolItem* wrap(GtkSeparatorToolItem* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/settings.cc b/libs/gtkmm2/gtk/gtkmm/settings.cc index 717110285b..37f1742567 100644 --- a/libs/gtkmm2/gtk/gtkmm/settings.cc +++ b/libs/gtkmm2/gtk/gtkmm/settings.cc @@ -300,6 +300,20 @@ Glib::PropertyProxy_ReadOnly Settings::property_gtk_font_name() c } #endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_modules() +{ + return Glib::PropertyProxy(this, "gtk-modules"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_modules() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-modules"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Settings::property_gtk_xft_antialias() { @@ -370,6 +384,328 @@ Glib::PropertyProxy_ReadOnly Settings::property_gtk_xft_dpi() const } #endif //GLIBMM_PROPERTIES_ENABLED +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_cursor_theme_name() +{ + return Glib::PropertyProxy(this, "gtk-cursor-theme-name"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_cursor_theme_name() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-cursor-theme-name"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_cursor_theme_size() +{ + return Glib::PropertyProxy(this, "gtk-cursor-theme-size"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_cursor_theme_size() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-cursor-theme-size"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_alternative_button_order() +{ + return Glib::PropertyProxy(this, "gtk-alternative-button-order"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_alternative_button_order() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-alternative-button-order"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_alternative_sort_arrows() +{ + return Glib::PropertyProxy(this, "gtk-alternative-sort-arrows"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_alternative_sort_arrows() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-alternative-sort-arrows"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_show_input_method_menu() +{ + return Glib::PropertyProxy(this, "gtk-show-input-method-menu"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_show_input_method_menu() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-show-input-method-menu"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_show_unicode_menu() +{ + return Glib::PropertyProxy(this, "gtk-show-unicode-menu"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_show_unicode_menu() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-show-unicode-menu"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_timeout_initial() +{ + return Glib::PropertyProxy(this, "gtk-timeout-initial"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_timeout_initial() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-timeout-initial"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_timeout_repeat() +{ + return Glib::PropertyProxy(this, "gtk-timeout-repeat"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_timeout_repeat() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-timeout-repeat"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_timeout_expand() +{ + return Glib::PropertyProxy(this, "gtk-timeout-expand"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_timeout_expand() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-timeout-expand"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_color_scheme() +{ + return Glib::PropertyProxy(this, "gtk-color-scheme"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_color_scheme() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-color-scheme"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_enable_animations() +{ + return Glib::PropertyProxy(this, "gtk-enable-animations"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_enable_animations() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-enable-animations"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_touchscreen_mode() +{ + return Glib::PropertyProxy(this, "gtk-touchscreen-mode"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_touchscreen_mode() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-touchscreen-mode"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_tooltip_timeout() +{ + return Glib::PropertyProxy(this, "gtk-tooltip-timeout"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_tooltip_timeout() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-tooltip-timeout"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_tooltip_browse_timeout() +{ + return Glib::PropertyProxy(this, "gtk-tooltip-browse-timeout"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_tooltip_browse_timeout() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-tooltip-browse-timeout"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_tooltip_browse_mode_timeout() +{ + return Glib::PropertyProxy(this, "gtk-tooltip-browse-mode-timeout"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_tooltip_browse_mode_timeout() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-tooltip-browse-mode-timeout"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_keynav_cursor_only() +{ + return Glib::PropertyProxy(this, "gtk-keynav-cursor-only"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_keynav_cursor_only() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-keynav-cursor-only"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_keynav_wrap_around() +{ + return Glib::PropertyProxy(this, "gtk-keynav-wrap-around"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_keynav_wrap_around() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-keynav-wrap-around"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_error_bell() +{ + return Glib::PropertyProxy(this, "gtk-error-bell"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_error_bell() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-error-bell"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_file_chooser_backend() +{ + return Glib::PropertyProxy(this, "gtk-file-chooser-backend"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_file_chooser_backend() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-file-chooser-backend"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_print_backends() +{ + return Glib::PropertyProxy(this, "gtk-print-backends"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_print_backends() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-print-backends"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_print_preview_command() +{ + return Glib::PropertyProxy(this, "gtk-print-preview-command"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_print_preview_command() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-print-preview-command"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_enable_mnemonics() +{ + return Glib::PropertyProxy(this, "gtk-enable-mnemonics"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_enable_mnemonics() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-enable-mnemonics"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy Settings::property_gtk_enable_accels() +{ + return Glib::PropertyProxy(this, "gtk-enable-accels"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +Glib::PropertyProxy_ReadOnly Settings::property_gtk_enable_accels() const +{ + return Glib::PropertyProxy_ReadOnly(this, "gtk-enable-accels"); +} +#endif //GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy Settings::property_gtk_toolbar_style() { diff --git a/libs/gtkmm2/gtk/gtkmm/settings.h b/libs/gtkmm2/gtk/gtkmm/settings.h index 836c3d846b..7ccda3e91d 100644 --- a/libs/gtkmm2/gtk/gtkmm/settings.h +++ b/libs/gtkmm2/gtk/gtkmm/settings.h @@ -42,6 +42,9 @@ namespace Gtk namespace Gtk { +/** Sharing settings between applications. + * + */ class Settings : public Glib::Object { @@ -310,6 +313,27 @@ public: Glib::PropertyProxy_ReadOnly property_gtk_font_name() const; #endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED +/** List of currently active GTK modules. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_modules() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** List of currently active GTK modules. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_modules() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + +//#ifdef GDK_WINDOWING_X11 #ifdef GLIBMM_PROPERTIES_ENABLED /** Whether to antialias Xft fonts; 0=no * @@ -410,6 +434,470 @@ public: Glib::PropertyProxy_ReadOnly property_gtk_xft_dpi() const; #endif //#GLIBMM_PROPERTIES_ENABLED + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Name of the cursor theme to use + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_cursor_theme_name() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Name of the cursor theme to use + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_cursor_theme_name() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Size to use for cursors + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_cursor_theme_size() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Size to use for cursors + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_cursor_theme_size() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + +//#endif + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether buttons in dialogs should use the alternative button order. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_alternative_button_order() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether buttons in dialogs should use the alternative button order. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_alternative_button_order() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the direction of the sort indicators in list and tree views is inverted compared to the default (where down means ascending). + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_alternative_sort_arrows() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the direction of the sort indicators in list and tree views is inverted compared to the default (where down means ascending). + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_alternative_sort_arrows() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the context menus of entries and text views should offer to change the input method. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_show_input_method_menu() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the context menus of entries and text views should offer to change the input method. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_show_input_method_menu() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the context menus of entries and text views should offer to insert control characters. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_show_unicode_menu() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether the context menus of entries and text views should offer to insert control characters. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_show_unicode_menu() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Starting value for timeouts + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_timeout_initial() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Starting value for timeouts + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_timeout_initial() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Repeat value for timeouts + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_timeout_repeat() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Repeat value for timeouts + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_timeout_repeat() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Expand value for timeouts + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_timeout_expand() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Expand value for timeouts + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_timeout_expand() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** A palette of named colors for use in themes. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_color_scheme() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** A palette of named colors for use in themes. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_color_scheme() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to enable toolkit-wide animations. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_enable_animations() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to enable toolkit-wide animations. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_enable_animations() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** When TRUE + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_touchscreen_mode() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** When TRUE + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_touchscreen_mode() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Timeout before tooltip is shown. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_tooltip_timeout() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Timeout before tooltip is shown. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_tooltip_timeout() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Timeout before tooltip is shown when browse mode is enabled. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_tooltip_browse_timeout() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Timeout before tooltip is shown when browse mode is enabled. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_tooltip_browse_timeout() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Timeout after which browse mode is disabled. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_tooltip_browse_mode_timeout() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Timeout after which browse mode is disabled. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_tooltip_browse_mode_timeout() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** When TRUE + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_keynav_cursor_only() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** When TRUE + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_keynav_cursor_only() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to wrap around when keyboard-navigating widgets. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_keynav_wrap_around() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether to wrap around when keyboard-navigating widgets. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_keynav_wrap_around() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** When TRUE + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_error_bell() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** When TRUE + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_error_bell() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + //gtkmmproc error: gtk-color-hash : property defs lookup failed. + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Name of the GtkFileChooser backend to use by default. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_file_chooser_backend() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Name of the GtkFileChooser backend to use by default. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_file_chooser_backend() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** List of the GtkPrintBackend backends to use by default. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_print_backends() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** List of the GtkPrintBackend backends to use by default. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_print_backends() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Command to run when displaying a print preview. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_print_preview_command() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Command to run when displaying a print preview. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_print_preview_command() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether labels should have mnemonics. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_enable_mnemonics() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether labels should have mnemonics. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_enable_mnemonics() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + #ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether menu items should have accelerators. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy property_gtk_enable_accels() ; +#endif //#GLIBMM_PROPERTIES_ENABLED + +#ifdef GLIBMM_PROPERTIES_ENABLED +/** Whether menu items should have accelerators. + * + * You rarely need to use properties because there are get_ and set_ methods for almost all of them. + * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when + * the value of the property changes. + */ + Glib::PropertyProxy_ReadOnly property_gtk_enable_accels() const; +#endif //#GLIBMM_PROPERTIES_ENABLED + + //gtkmmproc error: gtk-recent-files-limit : property defs lookup failed. + //TODO: Add others added since? // from GtkToolbar #ifdef GLIBMM_PROPERTIES_ENABLED @@ -563,7 +1051,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** List of icon sizes: gtk-menu=16 +/** List of icon sizes (gtk-menu=16,16:gtk-button=20,20...). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -573,7 +1061,7 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED #ifdef GLIBMM_PROPERTIES_ENABLED -/** List of icon sizes: gtk-menu=16 +/** List of icon sizes (gtk-menu=16,16:gtk-button=20,20...). * * You rarely need to use properties because there are get_ and set_ methods for almost all of them. * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when @@ -607,10 +1095,13 @@ protected: namespace Glib { - /** @relates Gtk::Settings - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Settings */ Glib::RefPtr wrap(GtkSettings* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/sizegroup.cc b/libs/gtkmm2/gtk/gtkmm/sizegroup.cc index 94ee095ebb..53fa08d2e4 100644 --- a/libs/gtkmm2/gtk/gtkmm/sizegroup.cc +++ b/libs/gtkmm2/gtk/gtkmm/sizegroup.cc @@ -34,8 +34,9 @@ namespace Gtk SizeGroup::SizeGroup(SizeGroupMode mode) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(sizegroup_class_.init(), "mode",(GtkSizeGroupMode) mode, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(sizegroup_class_.init(), "mode",(GtkSizeGroupMode) mode, static_cast(0))) {} } // namespace Gtk diff --git a/libs/gtkmm2/gtk/gtkmm/sizegroup.h b/libs/gtkmm2/gtk/gtkmm/sizegroup.h index 03d4723f12..dce1f2d940 100644 --- a/libs/gtkmm2/gtk/gtkmm/sizegroup.h +++ b/libs/gtkmm2/gtk/gtkmm/sizegroup.h @@ -165,16 +165,16 @@ public: SizeGroupMode get_mode() const; - /** Sets whether invisible widgets should be ignored when + /** Sets whether unmapped widgets should be ignored when * calculating the size. * * @newin2p8 - * @param ignore_hidden Whether hidden widgets should be ignored + * @param ignore_hidden Whether unmapped widgets should be ignored * when calculating the size. */ void set_ignore_hidden(bool ignore_hidden = true); - /** Returns if invisible widgets are ignored when calculating the size. + /** Returns: true if invisible widgets are ignored. * @return true if invisible widgets are ignored. * * @newin2p8. @@ -187,6 +187,9 @@ public: * and the requisition of the other widgets in the size group. * Whether this applies horizontally, vertically, or in both directions * depends on the mode of the size group. See set_mode(). + * + * When the widget is destroyed or no longer referenced elsewhere, it will + * be removed from the size group. * @param widget The Gtk::Widget to add. */ void add_widget(Widget& widget); @@ -197,8 +200,20 @@ public: void remove_widget(Widget& widget); + /** Return value: a G::SList of widgets. The list is owned by GTK+ + * @return A G::SList of widgets. The list is owned by GTK+ + * and should not be modified. + * + * @newin2p10. + */ Glib::SListHandle get_widgets(); + /** Return value: a G::SList of widgets. The list is owned by GTK+ + * @return A G::SList of widgets. The list is owned by GTK+ + * and should not be modified. + * + * @newin2p10. + */ Glib::SListHandle get_widgets() const; #ifdef GLIBMM_PROPERTIES_ENABLED @@ -266,10 +281,13 @@ protected: namespace Glib { - /** @relates Gtk::SizeGroup - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::SizeGroup */ Glib::RefPtr wrap(GtkSizeGroup* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/socket.cc b/libs/gtkmm2/gtk/gtkmm/socket.cc index b6566cf7f6..e1b2dbd925 100644 --- a/libs/gtkmm2/gtk/gtkmm/socket.cc +++ b/libs/gtkmm2/gtk/gtkmm/socket.cc @@ -160,7 +160,7 @@ void Socket_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Socket_Class::plug_added_callback(GtkSocket* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -168,36 +168,39 @@ void Socket_Class::plug_added_callback(GtkSocket* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_plug_added(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_plug_added(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->plug_added) - (*base->plug_added)(self); - } + // Call the original underlying C function: + if(base && base->plug_added) + (*base->plug_added)(self); } gboolean Socket_Class::plug_removed_callback(GtkSocket* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -205,32 +208,34 @@ gboolean Socket_Class::plug_removed_callback(GtkSocket* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->on_plug_removed()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->on_plug_removed()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->plug_removed) - return (*base->plug_removed)(self); - } + // Call the original underlying C function: + if(base && base->plug_removed) + return (*base->plug_removed)(self); typedef gboolean RType; return RType(); @@ -279,7 +284,8 @@ GType Socket::get_base_type() Socket::Socket() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::Container(Glib::ConstructParams(socket_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/socket.h b/libs/gtkmm2/gtk/gtkmm/socket.h index 259466f16d..7d64610739 100644 --- a/libs/gtkmm2/gtk/gtkmm/socket.h +++ b/libs/gtkmm2/gtk/gtkmm/socket.h @@ -183,17 +183,17 @@ public: Gdk::NativeWindow get_id() const; -/** + /** * @par Prototype: - * void %plug_added() + * void on_my_%plug_added() */ Glib::SignalProxy0< void > signal_plug_added(); -/** + /** * @par Prototype: - * bool %plug_removed() + * bool on_my_%plug_removed() */ Glib::SignalProxy0< bool > signal_plug_removed(); @@ -206,10 +206,13 @@ public: namespace Glib { - /** @relates Gtk::Socket - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Socket */ Gtk::Socket* wrap(GtkSocket* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/spinbutton.cc b/libs/gtkmm2/gtk/gtkmm/spinbutton.cc index 766c34d2df..33d17c62e8 100644 --- a/libs/gtkmm2/gtk/gtkmm/spinbutton.cc +++ b/libs/gtkmm2/gtk/gtkmm/spinbutton.cc @@ -33,8 +33,9 @@ namespace Gtk SpinButton::SpinButton(double climb_rate, guint digits) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Entry(Glib::ConstructParams(spinbutton_class_.init(), "climb_rate",climb_rate,"digits",digits, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Entry(Glib::ConstructParams(spinbutton_class_.init(), "climb_rate",climb_rate,"digits",digits, static_cast(0))) {} void SpinButton::unset_adjustment() @@ -49,7 +50,7 @@ namespace { -static gint SpinButton_signal_input_callback(GtkSpinButton* self, double* p0,void* data) +static gint SpinButton_signal_input_callback(GtkSpinButton* self, gdouble* p0,void* data) { using namespace Gtk; typedef sigc::slot< int,double* > SlotType; @@ -62,7 +63,8 @@ static gint SpinButton_signal_input_callback(GtkSpinButton* self, double* p0,voi { #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) - return (*static_cast(slot))(p0); + return (*static_cast(slot))(p0 +); #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) @@ -76,7 +78,7 @@ static gint SpinButton_signal_input_callback(GtkSpinButton* self, double* p0,voi return RType(); } -static gint SpinButton_signal_input_notify_callback(GtkSpinButton* self, double* p0, void* data) +static gint SpinButton_signal_input_notify_callback(GtkSpinButton* self, gdouble* p0, void* data) { using namespace Gtk; typedef sigc::slot< void,double* > SlotType; @@ -89,7 +91,8 @@ static gint SpinButton_signal_input_notify_callback(GtkSpinButton* self, double* { #endif //GLIBMM_EXCEPTIONS_ENABLED if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) - (*static_cast(slot))(p0); + (*static_cast(slot))(p0 +); #ifdef GLIBMM_EXCEPTIONS_ENABLED } catch(...) @@ -284,9 +287,9 @@ void SpinButton_Class::class_init_function(void* g_class, void* class_data) #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED -gint SpinButton_Class::input_callback(GtkSpinButton* self, double* p0) +gint SpinButton_Class::input_callback(GtkSpinButton* self, gdouble* p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -294,39 +297,42 @@ gint SpinButton_Class::input_callback(GtkSpinButton* self, double* p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return obj->on_input(p0); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return obj->on_input(p0 +); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->input) - return (*base->input)(self, p0); - } + // Call the original underlying C function: + if(base && base->input) + return (*base->input)(self, p0); typedef gint RType; return RType(); } gboolean SpinButton_Class::output_callback(GtkSpinButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -334,39 +340,41 @@ gboolean SpinButton_Class::output_callback(GtkSpinButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->on_output()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->on_output()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->output) - return (*base->output)(self); - } + // Call the original underlying C function: + if(base && base->output) + return (*base->output)(self); typedef gboolean RType; return RType(); } void SpinButton_Class::value_changed_callback(GtkSpinButton* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -374,32 +382,35 @@ void SpinButton_Class::value_changed_callback(GtkSpinButton* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_value_changed(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_value_changed(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->value_changed) - (*base->value_changed)(self); - } + // Call the original underlying C function: + if(base && base->value_changed) + (*base->value_changed)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -445,8 +456,9 @@ GType SpinButton::get_base_type() SpinButton::SpinButton(Adjustment& adjustment, double climb_rate, guint digits) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Gtk::Entry(Glib::ConstructParams(spinbutton_class_.init(), "adjustment", (adjustment).gobj(), "climb_rate", climb_rate, "digits", digits, (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Gtk::Entry(Glib::ConstructParams(spinbutton_class_.init(), "adjustment", (adjustment).gobj(), "climb_rate", climb_rate, "digits", digits, static_cast(0))) { } diff --git a/libs/gtkmm2/gtk/gtkmm/spinbutton.h b/libs/gtkmm2/gtk/gtkmm/spinbutton.h index 7544668d64..e5d9f3285b 100644 --- a/libs/gtkmm2/gtk/gtkmm/spinbutton.h +++ b/libs/gtkmm2/gtk/gtkmm/spinbutton.h @@ -288,8 +288,7 @@ public: */ void set_numeric(bool numeric = true); - /** Returns whether non-numeric text can be typed into the spin button. - * See set_numeric(). + /** Return value: true if only numeric text can be entered * @return true if only numeric text can be entered. */ bool get_numeric() const; @@ -309,9 +308,7 @@ public: */ void set_wrap(bool wrap = true); - /** Returns whether the spin button's value wraps around to the - * opposite limit when the upper or lower limit of the range is - * exceeded. See set_wrap(). + /** Return value: true if the spin button wraps around * @return true if the spin button wraps around. */ bool get_wrap() const; @@ -323,8 +320,7 @@ public: */ void set_snap_to_ticks(bool snap_to_ticks = true); - /** Returns whether the values are corrected to the nearest step. See - * set_snap_to_ticks(). + /** Return value: true if values are snapped to the nearest step. * @return true if values are snapped to the nearest step. */ bool get_snap_to_ticks() const; @@ -340,11 +336,9 @@ public: * @li false: No conversion done, continue with default handler. * @li true: Conversion successful, don't call default handler. * @li Gtk::INPUT_ERROR: Conversion failed, don't call default handler. - */ - -/** + * * @par Prototype: - * int %input(double* new_value) + * int on_my_%input(double* new_value) */ Glib::SignalProxy1< int,double* > signal_input(); @@ -355,27 +349,25 @@ public: * @return * @li false: No conversion done, continue with default handler. * @li true: Conversion successful, don't call default handler. - */ - -/** + * * @par Prototype: - * bool %output() + * bool on_my_%output() */ Glib::SignalProxy0< bool > signal_output(); -/** + /** * @par Prototype: - * bool %wrapped() + * bool on_my_%wrapped() */ Glib::SignalProxy0< bool > signal_wrapped(); -/** + /** * @par Prototype: - * void %value_changed() + * void on_my_%value_changed() */ Glib::SignalProxy0< void > signal_value_changed(); @@ -552,10 +544,13 @@ public: namespace Glib { - /** @relates Gtk::SpinButton - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::SpinButton */ Gtk::SpinButton* wrap(GtkSpinButton* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/statusbar.cc b/libs/gtkmm2/gtk/gtkmm/statusbar.cc index b53aec1645..182592c0b3 100644 --- a/libs/gtkmm2/gtk/gtkmm/statusbar.cc +++ b/libs/gtkmm2/gtk/gtkmm/statusbar.cc @@ -173,7 +173,7 @@ void Statusbar_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Statusbar_Class::text_pushed_callback(GtkStatusbar* self, guint p0, const gchar* p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -181,37 +181,40 @@ void Statusbar_Class::text_pushed_callback(GtkStatusbar* self, guint p0, const g // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_text_pushed(p0, Glib::convert_const_gchar_ptr_to_ustring(p1) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_text_pushed(p0, Glib::convert_const_gchar_ptr_to_ustring(p1) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->text_pushed) - (*base->text_pushed)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->text_pushed) + (*base->text_pushed)(self, p0, p1); } void Statusbar_Class::text_popped_callback(GtkStatusbar* self, guint p0, const gchar* p1) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -219,33 +222,36 @@ void Statusbar_Class::text_popped_callback(GtkStatusbar* self, guint p0, const g // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_text_popped(p0, Glib::convert_const_gchar_ptr_to_ustring(p1) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_text_popped(p0, Glib::convert_const_gchar_ptr_to_ustring(p1) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->text_popped) - (*base->text_popped)(self, p0, p1); - } + // Call the original underlying C function: + if(base && base->text_popped) + (*base->text_popped)(self, p0, p1); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -291,7 +297,8 @@ GType Statusbar::get_base_type() Statusbar::Statusbar() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Gtk::HBox(Glib::ConstructParams(statusbar_class_.init())) { } diff --git a/libs/gtkmm2/gtk/gtkmm/statusbar.h b/libs/gtkmm2/gtk/gtkmm/statusbar.h index a1eff80471..eddecce1a2 100644 --- a/libs/gtkmm2/gtk/gtkmm/statusbar.h +++ b/libs/gtkmm2/gtk/gtkmm/statusbar.h @@ -118,28 +118,48 @@ public: Statusbar(); + /** Returns: an integer id + * @param context_description Textual description of what context + * the new message is being used in. + * @return An integer id. + */ guint get_context_id(const Glib::ustring& context_description); guint push(const Glib::ustring& text, guint context_id = 0); + /** Removes the first message in the Gtk::StatusBar's stack + * with the given context id. + * + * Note that this may not change the displayed message, if + * the message at the top of the stack has a different + * context id. + * @param context_id A context identifier. + */ void pop(guint context_id = 0); void remove_message(guint message_id, guint context_id = 0); + /** Sets whether the statusbar has a resize grip. + * true by default. + * @param setting true to have a resize grip. + */ void set_has_resize_grip(bool setting = true); + /** Returns: true if the statusbar has a resize grip. + * @return true if the statusbar has a resize grip. + */ bool get_has_resize_grip() const; -/** + /** * @par Prototype: - * void %text_pushed(guint context_id, const Glib::ustring& text) + * void on_my_%text_pushed(guint context_id, const Glib::ustring& text) */ Glib::SignalProxy2< void,guint,const Glib::ustring& > signal_text_pushed(); -/** + /** * @par Prototype: - * void %text_popped(guint context_id, const Glib::ustring& text) + * void on_my_%text_popped(guint context_id, const Glib::ustring& text) */ Glib::SignalProxy2< void,guint,const Glib::ustring& > signal_text_popped(); @@ -173,10 +193,13 @@ public: namespace Glib { - /** @relates Gtk::Statusbar - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::Statusbar */ Gtk::Statusbar* wrap(GtkStatusbar* object, bool take_copy = false); } //namespace Glib diff --git a/libs/gtkmm2/gtk/gtkmm/statusicon.cc b/libs/gtkmm2/gtk/gtkmm/statusicon.cc index a02cf92ed8..a8fd0fd84d 100644 --- a/libs/gtkmm2/gtk/gtkmm/statusicon.cc +++ b/libs/gtkmm2/gtk/gtkmm/statusicon.cc @@ -51,6 +51,13 @@ bool StatusIcon::get_geometry(Glib::RefPtr& screen, Gdk::Rectangle& return result; } +void StatusIcon::popup_menu_at_position(Menu& menu, guint button, guint32 activate_time) +{ + gtk_menu_popup(menu.gobj(), NULL, NULL, + gtk_status_icon_position_menu, gobj() /* user_data, passed to gtk_status_icon_position_menu()/ */, + button, activate_time); +} + } // namespace Gtk @@ -123,6 +130,46 @@ static const Glib::SignalProxyInfo StatusIcon_signal_size_changed_info = }; +static const Glib::SignalProxyInfo StatusIcon_signal_activate_info = +{ + "activate", + (GCallback) &Glib::SignalProxyNormal::slot0_void_callback, + (GCallback) &Glib::SignalProxyNormal::slot0_void_callback +}; + + +static void StatusIcon_signal_popup_menu_callback(GtkStatusIcon* self, guint p0,guint32 p1,void* data) +{ + using namespace Gtk; + typedef sigc::slot< void,guint,guint32 > SlotType; + + // Do not try to call a signal on a disassociated wrapper. + if(Glib::ObjectBase::_get_current_wrapper((GObject*) self)) + { + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data)) + (*static_cast(slot))(p0, p1); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED + } +} + +static const Glib::SignalProxyInfo StatusIcon_signal_popup_menu_info = +{ + "popup_menu", + (GCallback) &StatusIcon_signal_popup_menu_callback, + (GCallback) &StatusIcon_signal_popup_menu_callback +}; + + } // anonymous namespace @@ -183,7 +230,7 @@ void StatusIcon_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED gboolean StatusIcon_Class::size_changed_callback(GtkStatusIcon* self, gint p0) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -191,33 +238,35 @@ gboolean StatusIcon_Class::size_changed_callback(GtkStatusIcon* self, gint p0) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return static_cast(obj->on_size_changed(p0 + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return static_cast(obj->on_size_changed(p0 )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->size_changed) - return (*base->size_changed)(self, p0); - } + // Call the original underlying C function: + if(base && base->size_changed) + return (*base->size_changed)(self, p0); typedef gboolean RType; return RType(); @@ -268,29 +317,33 @@ GType StatusIcon::get_base_type() StatusIcon::StatusIcon() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(statusicon_class_.init())) { } StatusIcon::StatusIcon(const Glib::RefPtr& pixbuf) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(statusicon_class_.init(), "pixbuf", Glib::unwrap(pixbuf), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(statusicon_class_.init(), "pixbuf", Glib::unwrap(pixbuf), static_cast(0))) { } StatusIcon::StatusIcon(const StockID& stock) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(statusicon_class_.init(), "stock", (stock).get_c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(statusicon_class_.init(), "stock", (stock).get_c_str(), static_cast(0))) { } StatusIcon::StatusIcon(const Glib::ustring& icon_name) : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. - Glib::Object(Glib::ConstructParams(statusicon_class_.init(), "icon_name", icon_name.c_str(), (char*) 0)) + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), + Glib::Object(Glib::ConstructParams(statusicon_class_.init(), "icon_name", icon_name.c_str(), static_cast(0))) { } @@ -356,6 +409,26 @@ int StatusIcon::get_size() const return gtk_status_icon_get_size(const_cast(gobj())); } +void StatusIcon::set_screen(const Glib::RefPtr& screen) +{ +gtk_status_icon_set_screen(gobj(), Glib::unwrap(screen)); +} + +Glib::RefPtr StatusIcon::get_screen() +{ + + Glib::RefPtr retvalue = Glib::wrap(gtk_status_icon_get_screen(gobj())); + if(retvalue) + retvalue->reference(); //The function does not do a ref for us. + return retvalue; + +} + +Glib::RefPtr StatusIcon::get_screen() const +{ + return const_cast(this)->get_screen(); +} + void StatusIcon::set_tooltip(const Glib::ustring& tooltip_text) { gtk_status_icon_set_tooltip(gobj(), tooltip_text.c_str()); @@ -393,6 +466,18 @@ Glib::SignalProxy1< bool,int > StatusIcon::signal_size_changed() } +Glib::SignalProxy0< void > StatusIcon::signal_activate() +{ + return Glib::SignalProxy0< void >(this, &StatusIcon_signal_activate_info); +} + + +Glib::SignalProxy2< void,guint,guint32 > StatusIcon::signal_popup_menu() +{ + return Glib::SignalProxy2< void,guint,guint32 >(this, &StatusIcon_signal_popup_menu_info); +} + + #ifdef GLIBMM_PROPERTIES_ENABLED Glib::PropertyProxy< Glib::RefPtr > StatusIcon::property_pixbuf() { diff --git a/libs/gtkmm2/gtk/gtkmm/statusicon.h b/libs/gtkmm2/gtk/gtkmm/statusicon.h index c3842c053d..014e19c35d 100644 --- a/libs/gtkmm2/gtk/gtkmm/statusicon.h +++ b/libs/gtkmm2/gtk/gtkmm/statusicon.h @@ -28,6 +28,7 @@ #include //For ImageType. #include +#include #include #include #include @@ -139,45 +140,203 @@ public: static Glib::RefPtr create_from_file(const std::string& filename); + /** Makes @a status_icon display @a pixbuf . + * See new_from_pixbuf() for details. + * + * @newin2p10 + * @param pixbuf A Gdk::Pixbuf or 0. + */ void set(const Glib::RefPtr& pixbuf); + /** Makes @a status_icon display the file @a filename . + * See new_from_file() for details. + * + * @newin2p10 + * @param filename A filename. + */ void set_from_file(const Glib::ustring& filename); + /** Makes @a status_icon display the stock icon with the id @a stock_id . + * See new_from_stock() for details. + * + * @newin2p10 + * @param stock_id A stock icon id. + */ void set(const StockID& stock_id); + /** Makes @a status_icon display the icon named @a icon_name from the + * current icon theme. + * See new_from_icon_name() for details. + * + * @newin2p10 + * @param icon_name An icon name. + */ void set(const Glib::ustring& icon_name); + /** Gets the type of representation being used by the Gtk::StatusIcon + * to store image data. If the Gtk::StatusIcon has no image data, + * the return value will be Gtk::IMAGE_EMPTY. + * @return The image representation being used + * + * @newin2p10. + */ ImageType get_storage_type() const; + /** Gets the Gdk::Pixbuf being displayed by the Gtk::StatusIcon. + * The storage type of the status icon must be Gtk::IMAGE_EMPTY or + * Gtk::IMAGE_PIXBUF (see get_storage_type()). + * The caller of this function does not own a reference to the + * returned pixbuf. + * @return The displayed pixbuf, or 0 if the image is empty. + * + * @newin2p10. + */ Glib::RefPtr get_pixbuf(); + /** Gets the Gdk::Pixbuf being displayed by the Gtk::StatusIcon. + * The storage type of the status icon must be Gtk::IMAGE_EMPTY or + * Gtk::IMAGE_PIXBUF (see get_storage_type()). + * The caller of this function does not own a reference to the + * returned pixbuf. + * @return The displayed pixbuf, or 0 if the image is empty. + * + * @newin2p10. + */ Glib::RefPtr get_pixbuf() const; + /** Gets the id of the stock icon being displayed by the Gtk::StatusIcon. + * The storage type of the status icon must be Gtk::IMAGE_EMPTY or + * Gtk::IMAGE_STOCK (see get_storage_type()). + * The returned string is owned by the Gtk::StatusIcon and should not + * be freed or modified. + * @return Stock id of the displayed stock icon, + * or 0 if the image is empty. + * + * @newin2p10. + */ StockID get_stock() const; + /** Gets the name of the icon being displayed by the Gtk::StatusIcon. + * The storage type of the status icon must be Gtk::IMAGE_EMPTY or + * Gtk::IMAGE_ICON_NAME (see get_storage_type()). + * The returned string is owned by the Gtk::StatusIcon and should not + * be freed or modified. + * @return Name of the displayed icon, or 0 if the image is empty. + * + * @newin2p10. + */ Glib::ustring get_icon_name() const; + /** Gets the size in pixels that is available for the image. + * Stock icons and named icons adapt their size automatically + * if the size of the notification area changes. For other + * storage types, the size-changed signal can be used to + * react to size changes. + * + * Note that the returned size is only meaningful while the + * status icon is embedded (see is_embedded()). + * @return The size that is available for the image + * + * @newin2p10. + */ int get_size() const; + /** Sets the Gdk::Screen where @a status_icon is displayed; if + * the icon is already mapped, it will be unmapped, and + * then remapped on the new screen. + * + * @newin2p12 + * @param screen A Gdk::Screen. + */ + void set_screen(const Glib::RefPtr& screen); + + /** Return value: a Gdk::Screen. + * @return A Gdk::Screen. + * + * @newin2p12. + */ + Glib::RefPtr get_screen(); + + /** Return value: a Gdk::Screen. + * @return A Gdk::Screen. + * + * @newin2p12. + */ + Glib::RefPtr get_screen() const; + + + /** Sets the tooltip of the status icon. + * + * @newin2p10 + * @param tooltip_text The tooltip text, or 0. + */ void set_tooltip(const Glib::ustring& tooltip_text); + /** Shows or hides a status icon. + * + * @newin2p10 + * @param visible true to show the status icon, false to hide it. + */ void set_visible(bool visible = true); + /** Return value: true if the status icon is visible + * @return true if the status icon is visible + * + * @newin2p10. + */ bool get_visible() const; + /** Makes the status icon start or stop blinking. + * Note that blinking user interface elements may be problematic + * for some users, and thus may be turned off, in which case + * this setting has no effect. + * + * @newin2p10 + * @param blinking true to turn blinking on, false to turn it off. + */ void set_blinking(bool blinking = true); + /** Return value: true if the icon is blinking + * @return true if the icon is blinking + * + * @newin2p10. + */ bool get_blinking() const; + /** Return value: true if the status icon is embedded in + * @return true if the status icon is embedded in + * a notification area. + * + * @newin2p10. + */ bool is_embedded() const; + /** Displays a menu aligned to the status icon, and makes it available for selection. + * Applications can use this function to display context-sensitive menus. + * + * This is equivalent to the gtk_status_icon_position_menu() helper callback in GTK+, + * which can be provided to gtk_menu_popup(). + * + * See Gtk::Menu::popup() for more details. + * + * @param menu The menu to popup for the status icon. + * @param button The mouse button which was pressed to initiate the event. + * @param activate_time The time at which the activation event occurred. + * + * @newin2p12 + */ + void popup_menu_at_position(Menu& menu, guint button, guint32 activate_time); + + //Note that gtk_status_icon_position_menu() is meant to be used as a helpful callback when calling gtk_menu_popup(). + //We make it easier by just providing a popup method that uses it. + //In gtk_status_icon_get_geometry(), any of the parameters may be NULL, //but we don't need 6 different overloads, with different parameters. @@ -186,7 +345,7 @@ public: /** Obtains information about the location of the status icon * on screen. This information can be used to e.g. position * popups like notification bubbles. - * See gtk_status_icon_position_menu() for a more convenient + * See popup_menu_at_position() for a more convenient * alternative for positioning menus. * * Note that some platforms do not allow GTK+ to provide @@ -317,15 +476,38 @@ public: #endif //#GLIBMM_PROPERTIES_ENABLED -/** + /** * @par Prototype: - * bool %size_changed(int size) + * bool on_my_%size_changed(int size) */ Glib::SignalProxy1< bool,int > signal_size_changed(); - //Keybinding signal. - //Keybinding signal. + + //TODO: Remove no_default_handler when we can break ABI. + /* These are keybinding signals, which should usually not be wrapped, + unless there is explicit documentation saying that the should be + used by applications. We have asked repeatedly for clarification about these + particular signals, but received no clear answer. + We have decided to take the risk, because they really do seem to be necessary, + for responding to status icon activation and requests to show their popup menu. + murrayc. + */ + + /** + * @par Prototype: + * void on_my_%activate() + */ + + Glib::SignalProxy0< void > signal_activate(); + + + /** + * @par Prototype: + * void on_my_%popup_menu(guint button, guint32 activate_time) + */ + + Glib::SignalProxy2< void,guint,guint32 > signal_popup_menu(); public: @@ -353,10 +535,13 @@ protected: namespace Glib { - /** @relates Gtk::StatusIcon - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::StatusIcon */ Glib::RefPtr wrap(GtkStatusIcon* object, bool take_copy = false); } diff --git a/libs/gtkmm2/gtk/gtkmm/stock.cc b/libs/gtkmm2/gtk/gtkmm/stock.cc index 26ba2305a5..fc703f7fdb 100644 --- a/libs/gtkmm2/gtk/gtkmm/stock.cc +++ b/libs/gtkmm2/gtk/gtkmm/stock.cc @@ -56,6 +56,7 @@ const Gtk::BuiltinStockID COPY = { GTK_STOCK_COPY }; const Gtk::BuiltinStockID CUT = { GTK_STOCK_CUT }; const Gtk::BuiltinStockID DELETE = { GTK_STOCK_DELETE }; const Gtk::BuiltinStockID DIRECTORY = { GTK_STOCK_DIRECTORY }; +const Gtk::BuiltinStockID DISCARD = { GTK_STOCK_DISCARD }; const Gtk::BuiltinStockID DISCONNECT = { GTK_STOCK_DISCONNECT }; const Gtk::BuiltinStockID EDIT = { GTK_STOCK_EDIT }; const Gtk::BuiltinStockID EXECUTE = { GTK_STOCK_EXECUTE }; @@ -112,6 +113,7 @@ const Gtk::BuiltinStockID REMOVE = { GTK_STOCK_REMOVE }; const Gtk::BuiltinStockID REVERT_TO_SAVED = { GTK_STOCK_REVERT_TO_SAVED }; const Gtk::BuiltinStockID SAVE = { GTK_STOCK_SAVE }; const Gtk::BuiltinStockID SAVE_AS = { GTK_STOCK_SAVE_AS }; +const Gtk::BuiltinStockID SELECT_ALL = { GTK_STOCK_SELECT_ALL }; const Gtk::BuiltinStockID SELECT_COLOR = { GTK_STOCK_SELECT_COLOR }; const Gtk::BuiltinStockID SELECT_FONT = { GTK_STOCK_SELECT_FONT }; const Gtk::BuiltinStockID SORT_ASCENDING = { GTK_STOCK_SORT_ASCENDING }; diff --git a/libs/gtkmm2/gtk/gtkmm/stock.h b/libs/gtkmm2/gtk/gtkmm/stock.h index 28d312b45e..1da234e809 100644 --- a/libs/gtkmm2/gtk/gtkmm/stock.h +++ b/libs/gtkmm2/gtk/gtkmm/stock.h @@ -79,6 +79,7 @@ extern GTKMM_API const Gtk::BuiltinStockID COPY; /*!< @image html st extern GTKMM_API const Gtk::BuiltinStockID CUT; /*!< @image html stock_cut_24.png */ extern GTKMM_API const Gtk::BuiltinStockID DELETE; /*!< @image html stock_trash_24.png */ extern GTKMM_API const Gtk::BuiltinStockID DIRECTORY; /*!< @image html stock_directory_24.png */ +extern GTKMM_API const Gtk::BuiltinStockID DISCARD; /*!< @image html stock_discard_24.png */ extern GTKMM_API const Gtk::BuiltinStockID DISCONNECT; /*!< @image html stock_disconnect_24.png */ extern GTKMM_API const Gtk::BuiltinStockID EDIT; /*!< @image html stock_edit_24.png */ extern GTKMM_API const Gtk::BuiltinStockID EXECUTE; /*!< @image html stock_exec_24.png */ @@ -123,6 +124,10 @@ extern GTKMM_API const Gtk::BuiltinStockID NEW; /*!< @image html st extern GTKMM_API const Gtk::BuiltinStockID NO; /*!< @image html stock_no_20.png */ extern GTKMM_API const Gtk::BuiltinStockID OK; /*!< @image html stock_ok_20.png */ extern GTKMM_API const Gtk::BuiltinStockID OPEN; /*!< @image html stock_open_24.png */ +extern GTKMM_API const Gtk::BuiltinStockID ORIENTATION_PORTRAIT; /*!< @image html stock_orientation_portrait_24.png */ +extern GTKMM_API const Gtk::BuiltinStockID ORIENTATION_LANDSCAPE; /*!< @image html stock_orientation_landscape_24.png */ +extern GTKMM_API const Gtk::BuiltinStockID ORIENTATION_REVERSE_LANDSCAPE; /*!< @image html stock_orientation_reverse_landscape_24.png */ +extern GTKMM_API const Gtk::BuiltinStockID ORIENTATION_REVERSE_PORTRAIT; /*!< @image html stock_orientation_reverse_portrait_24.png */ extern GTKMM_API const Gtk::BuiltinStockID PASTE; /*!< @image html stock_paste_24.png */ extern GTKMM_API const Gtk::BuiltinStockID PREFERENCES; /*!< @image html stock_preferences_24.png */ extern GTKMM_API const Gtk::BuiltinStockID PRINT; /*!< @image html stock_print_24.png */ @@ -135,6 +140,7 @@ extern GTKMM_API const Gtk::BuiltinStockID REMOVE; /*!< @image html st extern GTKMM_API const Gtk::BuiltinStockID REVERT_TO_SAVED; /*!< @image html stock_revert_24.png */ extern GTKMM_API const Gtk::BuiltinStockID SAVE; /*!< @image html stock_save_24.png */ extern GTKMM_API const Gtk::BuiltinStockID SAVE_AS; /*!< @image html stock_save_as_24.png */ +extern GTKMM_API const Gtk::BuiltinStockID SELECT_ALL; /*!< @image html stock_selectall_24.png */ extern GTKMM_API const Gtk::BuiltinStockID SELECT_COLOR; /*!< @image html stock_colorselector_24.png */ extern GTKMM_API const Gtk::BuiltinStockID SELECT_FONT; /*!< @image html stock_font_24.png */ extern GTKMM_API const Gtk::BuiltinStockID SORT_ASCENDING; /*!< @image html stock_sort_ascending_24.png */ diff --git a/libs/gtkmm2/gtk/gtkmm/stockitem.h b/libs/gtkmm2/gtk/gtkmm/stockitem.h index d674f99ced..63bbcc8f5b 100644 --- a/libs/gtkmm2/gtk/gtkmm/stockitem.h +++ b/libs/gtkmm2/gtk/gtkmm/stockitem.h @@ -91,10 +91,13 @@ public: namespace Glib { - /** @relates Gtk::StockItem - * @param object The C instance + /** A Glib::wrap() method for this object. + * + * @param object The C instance. * @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref. * @result A C++ instance that wraps this C instance. + * + * @relates Gtk::StockItem */ Gtk::StockItem wrap(GtkStockItem* object, bool take_copy = false); diff --git a/libs/gtkmm2/gtk/gtkmm/style.cc b/libs/gtkmm2/gtk/gtkmm/style.cc index a6cc2a2cb5..cabace367f 100644 --- a/libs/gtkmm2/gtk/gtkmm/style.cc +++ b/libs/gtkmm2/gtk/gtkmm/style.cc @@ -346,7 +346,7 @@ void Style_Class::class_init_function(void* g_class, void* class_data) #ifdef GLIBMM_VFUNCS_ENABLED void Style_Class::realize_vfunc_callback(GtkStyle* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -354,36 +354,40 @@ void Style_Class::realize_vfunc_callback(GtkStyle* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->realize_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->realize_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->realize) + (*base->realize)(self); - // Call the original underlying C function: - if(base && base->realize) - (*base->realize)(self); - } } void Style_Class::unrealize_vfunc_callback(GtkStyle* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -391,36 +395,40 @@ void Style_Class::unrealize_vfunc_callback(GtkStyle* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->unrealize_vfunc(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->unrealize_vfunc(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->unrealize) + (*base->unrealize)(self); - // Call the original underlying C function: - if(base && base->unrealize) - (*base->unrealize)(self); - } } void Style_Class::copy_vfunc_callback(GtkStyle* self, GtkStyle* src) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -428,37 +436,41 @@ void Style_Class::copy_vfunc_callback(GtkStyle* self, GtkStyle* src) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->copy_vfunc(Glib::wrap(src, true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->copy_vfunc(Glib::wrap(src, true) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->copy) + (*base->copy)(self, src); - // Call the original underlying C function: - if(base && base->copy) - (*base->copy)(self, src); - } } GtkStyle* Style_Class::clone_vfunc_callback(GtkStyle* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -466,39 +478,42 @@ GtkStyle* Style_Class::clone_vfunc_callback(GtkStyle* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->clone_vfunc()); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->clone_vfunc()); + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->clone) + return (*base->clone)(self); - // Call the original underlying C function: - if(base && base->clone) - return (*base->clone)(self); - } typedef GtkStyle* RType; return RType(); } void Style_Class::init_from_rc_vfunc_callback(GtkStyle* self, GtkRcStyle* rc_style) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -506,37 +521,41 @@ void Style_Class::init_from_rc_vfunc_callback(GtkStyle* self, GtkRcStyle* rc_sty // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->init_from_rc_vfunc(Glib::wrap(rc_style) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->init_from_rc_vfunc(Glib::wrap(rc_style) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->init_from_rc) + (*base->init_from_rc)(self, rc_style); - // Call the original underlying C function: - if(base && base->init_from_rc) - (*base->init_from_rc)(self, rc_style); - } } void Style_Class::set_background_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -544,38 +563,42 @@ void Style_Class::set_background_vfunc_callback(GtkStyle* self, GdkWindow* windo // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->set_background_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->set_background_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->set_background) + (*base->set_background)(self, window, state_type); - // Call the original underlying C function: - if(base && base->set_background) - (*base->set_background)(self, window, state_type); - } } GdkPixbuf* Style_Class::render_icon_vfunc_callback(GtkStyle* self, const GtkIconSource* source, GtkTextDirection direction, GtkStateType state, GtkIconSize size, GtkWidget* widget, const gchar* detail) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -583,45 +606,48 @@ GdkPixbuf* Style_Class::render_icon_vfunc_callback(GtkStyle* self, const GtkIcon // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - return Glib::unwrap(obj->render_icon_vfunc(Glib::wrap(const_cast(source), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + return Glib::unwrap(obj->render_icon_vfunc(Glib::wrap(const_cast(source), true) , ((TextDirection)(direction)) , ((Gtk::StateType)(state)) , IconSize(static_cast(size)) , Glib::wrap(widget) , Glib::convert_const_gchar_ptr_to_ustring(detail) )); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->render_icon) + return (*base->render_icon)(self, source, direction, state, size, widget, detail); - // Call the original underlying C function: - if(base && base->render_icon) - return (*base->render_icon)(self, source, direction, state, size, widget, detail); - } typedef GdkPixbuf* RType; return RType(); } void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x1, gint x2, gint y) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -629,14 +655,17 @@ void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, G // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_hline_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_hline_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , Glib::wrap(area) , Glib::wrap(widget) @@ -645,28 +674,29 @@ void Style_Class::draw_hline_vfunc_callback(GtkStyle* self, GdkWindow* window, G , x2 , y ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_hline) + (*base->draw_hline)(self, window, state_type, area, widget, detail, x1, x2, y); - // Call the original underlying C function: - if(base && base->draw_hline) - (*base->draw_hline)(self, window, state_type, area, widget, detail, x1, x2, y); - } } void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint y1, gint y2, gint x) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -674,14 +704,17 @@ void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, G // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_vline_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_vline_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , Glib::wrap(area) , Glib::wrap(widget) @@ -690,28 +723,29 @@ void Style_Class::draw_vline_vfunc_callback(GtkStyle* self, GdkWindow* window, G , y2 , x ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_vline) + (*base->draw_vline)(self, window, state_type, area, widget, detail, y1, y2, x); - // Call the original underlying C function: - if(base && base->draw_vline) - (*base->draw_vline)(self, window, state_type, area, widget, detail, y1, y2, x); - } } void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -719,14 +753,17 @@ void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_shadow_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_shadow_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -737,28 +774,29 @@ void Style_Class::draw_shadow_vfunc_callback(GtkStyle* self, GdkWindow* window, , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_shadow) + (*base->draw_shadow)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_shadow) - (*base->draw_shadow)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GdkPoint* point, gint npoints, gboolean fill) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -766,14 +804,17 @@ void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_polygon_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_polygon_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -782,28 +823,29 @@ void Style_Class::draw_polygon_vfunc_callback(GtkStyle* self, GdkWindow* window, , point, npoints , fill ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_polygon) + (*base->draw_polygon)(self, window, state_type, shadow_type, area, widget, detail, point, npoints, fill); - // Call the original underlying C function: - if(base && base->draw_polygon) - (*base->draw_polygon)(self, window, state_type, shadow_type, area, widget, detail, point, npoints, fill); - } } void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GtkArrowType arrow_type, gboolean fill, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -811,14 +853,17 @@ void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, G // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_arrow_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_arrow_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -831,28 +876,29 @@ void Style_Class::draw_arrow_vfunc_callback(GtkStyle* self, GdkWindow* window, G , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_arrow) + (*base->draw_arrow)(self, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_arrow) - (*base->draw_arrow)(self, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height); - } } void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -860,14 +906,17 @@ void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_diamond_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_diamond_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -878,28 +927,29 @@ void Style_Class::draw_diamond_vfunc_callback(GtkStyle* self, GdkWindow* window, , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_diamond) + (*base->draw_diamond)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_diamond) - (*base->draw_diamond)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, const gchar* string) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -907,14 +957,17 @@ void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_string_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_string_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , Glib::wrap(area) , Glib::wrap(widget) @@ -923,28 +976,29 @@ void Style_Class::draw_string_vfunc_callback(GtkStyle* self, GdkWindow* window, , y , Glib::convert_const_gchar_ptr_to_ustring(string) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_string) + (*base->draw_string)(self, window, state_type, area, widget, detail, x, y, string); - // Call the original underlying C function: - if(base && base->draw_string) - (*base->draw_string)(self, window, state_type, area, widget, detail, x, y, string); - } } void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -952,14 +1006,17 @@ void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_box_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_box_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -970,28 +1027,29 @@ void Style_Class::draw_box_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_box) + (*base->draw_box)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_box) - (*base->draw_box)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -999,14 +1057,17 @@ void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_flat_box_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_flat_box_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1017,28 +1078,29 @@ void Style_Class::draw_flat_box_vfunc_callback(GtkStyle* self, GdkWindow* window , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_flat_box) + (*base->draw_flat_box)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_flat_box) - (*base->draw_flat_box)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1046,14 +1108,17 @@ void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, G // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_check_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_check_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1064,28 +1129,29 @@ void Style_Class::draw_check_vfunc_callback(GtkStyle* self, GdkWindow* window, G , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_check) + (*base->draw_check)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_check) - (*base->draw_check)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1093,14 +1159,17 @@ void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_option_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_option_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1111,28 +1180,29 @@ void Style_Class::draw_option_vfunc_callback(GtkStyle* self, GdkWindow* window, , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_option) + (*base->draw_option)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_option) - (*base->draw_option)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1140,14 +1210,17 @@ void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_tab_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_tab_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1158,28 +1231,29 @@ void Style_Class::draw_tab_vfunc_callback(GtkStyle* self, GdkWindow* window, Gtk , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_tab) + (*base->draw_tab)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_tab) - (*base->draw_tab)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1187,14 +1261,17 @@ void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* wind // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_shadow_gap_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_shadow_gap_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1208,28 +1285,29 @@ void Style_Class::draw_shadow_gap_vfunc_callback(GtkStyle* self, GdkWindow* wind , gap_x , gap_width ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_shadow_gap) + (*base->draw_shadow_gap)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); - // Call the original underlying C function: - if(base && base->draw_shadow_gap) - (*base->draw_shadow_gap)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); - } } void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side, gint gap_x, gint gap_width) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1237,14 +1315,17 @@ void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_box_gap_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_box_gap_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1258,28 +1339,29 @@ void Style_Class::draw_box_gap_vfunc_callback(GtkStyle* self, GdkWindow* window, , gap_x , gap_width ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_box_gap) + (*base->draw_box_gap)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); - // Call the original underlying C function: - if(base && base->draw_box_gap) - (*base->draw_box_gap)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width); - } } void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkPositionType gap_side) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1287,14 +1369,17 @@ void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* windo // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_extension_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_extension_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1306,28 +1391,29 @@ void Style_Class::draw_extension_vfunc_callback(GtkStyle* self, GdkWindow* windo , height , ((PositionType)(gap_side)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_extension) + (*base->draw_extension)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side); - // Call the original underlying C function: - if(base && base->draw_extension) - (*base->draw_extension)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side); - } } void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1335,14 +1421,17 @@ void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, G // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_focus_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_focus_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , Glib::wrap(area) , Glib::wrap(widget) @@ -1352,28 +1441,29 @@ void Style_Class::draw_focus_vfunc_callback(GtkStyle* self, GdkWindow* window, G , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_focus) + (*base->draw_focus)(self, window, state_type, area, widget, detail, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_focus) - (*base->draw_focus)(self, window, state_type, area, widget, detail, x, y, width, height); - } } void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkOrientation orientation) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1381,14 +1471,17 @@ void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_slider_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_slider_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1400,28 +1493,29 @@ void Style_Class::draw_slider_vfunc_callback(GtkStyle* self, GdkWindow* window, , height , ((Orientation)(orientation)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_slider) + (*base->draw_slider)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); - // Call the original underlying C function: - if(base && base->draw_slider) - (*base->draw_slider)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); - } } void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GtkShadowType shadow_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, gint width, gint height, GtkOrientation orientation) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1429,14 +1523,17 @@ void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_handle_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_handle_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , ((ShadowType)(shadow_type)) , Glib::wrap(area) @@ -1448,28 +1545,29 @@ void Style_Class::draw_handle_vfunc_callback(GtkStyle* self, GdkWindow* window, , height , ((Orientation)(orientation)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_handle) + (*base->draw_handle)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); - // Call the original underlying C function: - if(base && base->draw_handle) - (*base->draw_handle)(self, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation); - } } void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, GtkExpanderStyle expander_style) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1477,14 +1575,17 @@ void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_expander_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_expander_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , Glib::wrap(area) , Glib::wrap(widget) @@ -1493,28 +1594,29 @@ void Style_Class::draw_expander_vfunc_callback(GtkStyle* self, GdkWindow* window , y , ((ExpanderStyle)(expander_style)) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_expander) + (*base->draw_expander)(self, window, state_type, area, widget, detail, x, y, expander_style); - // Call the original underlying C function: - if(base && base->draw_expander) - (*base->draw_expander)(self, window, state_type, area, widget, detail, x, y, expander_style); - } } void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, gboolean use_text, GdkRectangle* area, GtkWidget* widget, const gchar* detail, gint x, gint y, PangoLayout* layout) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1522,14 +1624,17 @@ void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window, // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_layout_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_layout_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , use_text , Glib::wrap(area) @@ -1539,28 +1644,29 @@ void Style_Class::draw_layout_vfunc_callback(GtkStyle* self, GdkWindow* window, , y , Glib::wrap(layout) ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_layout) + (*base->draw_layout)(self, window, state_type, use_text, area, widget, detail, x, y, layout); - // Call the original underlying C function: - if(base && base->draw_layout) - (*base->draw_layout)(self, window, state_type, use_text, area, widget, detail, x, y, layout); - } } void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* window, GtkStateType state_type, GdkRectangle* area, GtkWidget* widget, const gchar* detail, GdkWindowEdge edge, gint x, gint y, gint width, gint height) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1568,14 +1674,17 @@ void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* win // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->draw_resize_grip_vfunc(Glib::wrap((GdkWindowObject*)(window), true) + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->draw_resize_grip_vfunc(Glib::wrap((GdkWindowObject*)(window), true) , ((Gtk::StateType)(state_type)) , Glib::wrap(area) , Glib::wrap(widget) @@ -1586,31 +1695,32 @@ void Style_Class::draw_resize_grip_vfunc_callback(GtkStyle* self, GdkWindow* win , width , height ); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( - g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). - ); + + BaseClassType *const base = static_cast( + g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). + ); + + // Call the original underlying C function: + if(base && base->draw_resize_grip) + (*base->draw_resize_grip)(self, window, state_type, area, widget, detail, edge, x, y, width, height); - // Call the original underlying C function: - if(base && base->draw_resize_grip) - (*base->draw_resize_grip)(self, window, state_type, area, widget, detail, edge, x, y, width, height); - } } #endif //GLIBMM_VFUNCS_ENABLED #ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED void Style_Class::realize_callback(GtkStyle* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1618,36 +1728,39 @@ void Style_Class::realize_callback(GtkStyle* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_realize(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_realize(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->realize) - (*base->realize)(self); - } + // Call the original underlying C function: + if(base && base->realize) + (*base->realize)(self); } void Style_Class::unrealize_callback(GtkStyle* self) { - CppObjectType *const obj = dynamic_cast( + Glib::ObjectBase *const obj_base = static_cast( Glib::ObjectBase::_get_current_wrapper((GObject*)self)); // Non-gtkmmproc-generated custom classes implicitly call the default @@ -1655,32 +1768,35 @@ void Style_Class::unrealize_callback(GtkStyle* self) // generated classes can use this optimisation, which avoids the unnecessary // parameter conversions if there is no possibility of the virtual function // being overridden: - if(obj && obj->is_derived_()) + if(obj_base && obj_base->is_derived_()) { - #ifdef GLIBMM_EXCEPTIONS_ENABLED - try // Trap C++ exceptions which would normally be lost because this is a C callback. + CppObjectType *const obj = dynamic_cast(obj_base); + if(obj) // This can be NULL during destruction. { - #endif //GLIBMM_EXCEPTIONS_ENABLED - // Call the virtual member method, which derived classes might override. - obj->on_unrealize(); - #ifdef GLIBMM_EXCEPTIONS_ENABLED + #ifdef GLIBMM_EXCEPTIONS_ENABLED + try // Trap C++ exceptions which would normally be lost because this is a C callback. + { + #endif //GLIBMM_EXCEPTIONS_ENABLED + // Call the virtual member method, which derived classes might override. + obj->on_unrealize(); + return; + #ifdef GLIBMM_EXCEPTIONS_ENABLED + } + catch(...) + { + Glib::exception_handlers_invoke(); + } + #endif //GLIBMM_EXCEPTIONS_ENABLED } - catch(...) - { - Glib::exception_handlers_invoke(); - } - #endif //GLIBMM_EXCEPTIONS_ENABLED } - else - { - BaseClassType *const base = static_cast( + + BaseClassType *const base = static_cast( g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class). ); - // Call the original underlying C function: - if(base && base->unrealize) - (*base->unrealize)(self); - } + // Call the original underlying C function: + if(base && base->unrealize) + (*base->unrealize)(self); } #endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED @@ -1728,7 +1844,8 @@ GType Style::get_base_type() Style::Style() : - Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations. + // Mark this class as non-derived to allow C++ vfuncs to be skipped. + Glib::ObjectBase(0), Glib::Object(Glib::ConstructParams(style_class_.init())) { } @@ -1987,6 +2104,16 @@ Glib::RefPtr